diff options
author | jylefort <jylefort@FreeBSD.org> | 2005-05-25 07:35:19 +0000 |
---|---|---|
committer | jylefort <jylefort@FreeBSD.org> | 2005-05-25 07:35:19 +0000 |
commit | 1298778d0389612a5c2d64e71a65a43209cf5b4a (patch) | |
tree | 715b8a0e1f0bdb8aba237705d808169b6f28bfad /ftp/pftpd | |
parent | 6c22d81eed2746b5bcc0ced6eeafe2bc9369384a (diff) | |
download | FreeBSD-ports-1298778d0389612a5c2d64e71a65a43209cf5b4a.zip FreeBSD-ports-1298778d0389612a5c2d64e71a65a43209cf5b4a.tar.gz |
- Update to 1.0.1
- Add a mirror site, since the primary site is temporarily unreachable
- Remove RESTRICTED, as the license now allows redistribution
PR: ports/81411
Submitted by: Johan van Selst <johans@stack.nl>
Diffstat (limited to 'ftp/pftpd')
-rw-r--r-- | ftp/pftpd/Makefile | 16 | ||||
-rw-r--r-- | ftp/pftpd/distinfo | 4 | ||||
-rw-r--r-- | ftp/pftpd/files/patch-Makefile.in | 10 | ||||
-rw-r--r-- | ftp/pftpd/files/patch-plib-support.c | 33 | ||||
-rw-r--r-- | ftp/pftpd/files/patch-plib_dirlist.c | 12 | ||||
-rw-r--r-- | ftp/pftpd/files/patch-src_rpa.c | 38 |
6 files changed, 82 insertions, 31 deletions
diff --git a/ftp/pftpd/Makefile b/ftp/pftpd/Makefile index bd149fe..f67361a 100644 --- a/ftp/pftpd/Makefile +++ b/ftp/pftpd/Makefile @@ -6,24 +6,24 @@ # PORTNAME= pftpd -PORTVERSION= 0.42 +PORTVERSION= 1.0.1 CATEGORIES= ftp -MASTER_SITES= ftp://ftp.lysator.liu.se/pub/unix/pftpd/ +MASTER_SITES= ftp://ftp.lysator.liu.se/pub/unix/pftpd/ \ + ftp://ftp.ifm.liu.se/pub/unix/pftpd/ MAINTAINER= ports@FreeBSD.org COMMENT= Multithreaded anonymous FTP daemon -BROKEN= Unfetchable - GNU_CONFIGURE= yes USE_REINPLACE= yes -RESTRICTED= License problem - MAN1= pftpd.1 rpad.1 PLIST_FILES= sbin/pftpd -.include <bsd.port.pre.mk> +post-extract: +.for f in ${MAN1} + @${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/doc/${f} +.endfor post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ @@ -33,4 +33,4 @@ post-patch: post-install: @${CAT} ${WRKSRC}/ISSUES -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/pftpd/distinfo b/ftp/pftpd/distinfo index ebd183f..8f7dcbc 100644 --- a/ftp/pftpd/distinfo +++ b/ftp/pftpd/distinfo @@ -1,2 +1,2 @@ -MD5 (pftpd-0.42.tar.gz) = 0c810bc09435e520dabd408e000b7962 -SIZE (pftpd-0.42.tar.gz) = 196314 +MD5 (pftpd-1.0.1.tar.gz) = 1ca94acbfeeb6f9ed3f9116b3e14fd94 +SIZE (pftpd-1.0.1.tar.gz) = 270830 diff --git a/ftp/pftpd/files/patch-Makefile.in b/ftp/pftpd/files/patch-Makefile.in index 7bcdb18..d392c89 100644 --- a/ftp/pftpd/files/patch-Makefile.in +++ b/ftp/pftpd/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- src/Makefile.in.orig Wed May 15 10:48:26 2002 -+++ src/Makefile.in Wed May 15 10:48:34 2002 -@@ -32,7 +32,7 @@ +--- src/Makefile.in.orig Thu Jan 9 14:27:48 2003 ++++ src/Makefile.in Mon May 23 18:23:31 2005 +@@ -40,7 +40,7 @@ all: $(PROGRAMS) pftpd: $(OBJS) $(LIBPLIB) - $(CC) $(CFLAGS) -o $@ $(OBJS) $(KOBJ) $(LIBPLIB) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(KOBJ) $(LIBPLIB) $(LDFLAGS) -lcompat - rpad: rpad.o $(LIBPLIB) - $(CC) $(CFLAGS) -o $@ rpad.o $(LIBPLIB) $(LDFLAGS) + rpad: rpad.o socket.o $(LIBPLIB) + $(CC) $(CFLAGS) -o $@ rpad.o socket.o $(LIBPLIB) $(LDFLAGS) diff --git a/ftp/pftpd/files/patch-plib-support.c b/ftp/pftpd/files/patch-plib-support.c index 73aa197..4d2023a 100644 --- a/ftp/pftpd/files/patch-plib-support.c +++ b/ftp/pftpd/files/patch-plib-support.c @@ -1,17 +1,18 @@ ---- plib/support.c.orig Thu May 2 05:01:54 2002 -+++ plib/support.c Sat May 18 02:11:58 2002 -@@ -369,11 +369,13 @@ - return code; - - #else -+ pthread_once_t grp_once; -+ pthread_mutex_t grp_lock; - struct group *gp; - int i, len; +--- plib/support.c.orig Thu Jan 9 14:25:01 2003 ++++ plib/support.c Mon May 23 20:46:01 2005 +@@ -145,6 +145,15 @@ + pthread_mutex_init(&pwd_lock, NULL); + } - -- pthread_once(&grp_once, grp_lock_init); -+ pthread_once(&grp_once, NULL); - pthread_mutex_lock(&grp_lock); - - gp = getgrgid(gid); ++static pthread_mutex_t grp_lock; ++static pthread_once_t grp_once = PTHREAD_ONCE_INIT; ++ ++static void ++grp_lock_init(void) ++{ ++ pthread_mutex_init(&grp_lock, NULL); ++} ++ + static char * + strcopy(const char *str, char **buf, size_t *avail) + { diff --git a/ftp/pftpd/files/patch-plib_dirlist.c b/ftp/pftpd/files/patch-plib_dirlist.c new file mode 100644 index 0000000..f770c9c --- /dev/null +++ b/ftp/pftpd/files/patch-plib_dirlist.c @@ -0,0 +1,12 @@ +--- plib/dirlist.c.orig Tue Feb 1 10:43:35 2005 ++++ plib/dirlist.c Mon May 23 18:35:47 2005 +@@ -80,7 +80,9 @@ + len = strlen(name); + dp = a_malloc(sizeof(*dp)+len, "struct dirent"); + dp->d_ino = ino; ++#ifdef linux + dp->d_off = 0; ++#endif /* linux */ + dp->d_reclen = len; + strcpy(dp->d_name, name); + diff --git a/ftp/pftpd/files/patch-src_rpa.c b/ftp/pftpd/files/patch-src_rpa.c new file mode 100644 index 0000000..8a1013a --- /dev/null +++ b/ftp/pftpd/files/patch-src_rpa.c @@ -0,0 +1,38 @@ +--- src/rpa.c.orig Tue Feb 1 12:57:33 2005 ++++ src/rpa.c Mon May 23 18:35:47 2005 +@@ -27,7 +27,7 @@ + #endif + + #include <sys/uio.h> +-#include <stropts.h> ++#include <sys/un.h> + + #ifdef HAVE_UNISTD_H + #include <unistd.h> +@@ -196,7 +196,7 @@ + goto Fail; + } + +- memset(&usb, 0, sizeof(sun)); ++ memset(&usb, 0, sizeof(usb)); + usb.sun_family = AF_UNIX; + strcpy(usb.sun_path, path); + +@@ -210,7 +210,7 @@ + + s_snprintf(path, sizeof(path), "%s/%s/unix", PATH_RPAD_DIR, rp->service); + +- memset(&usb, 0, sizeof(sun)); ++ memset(&usb, 0, sizeof(usb)); + usb.sun_family = AF_UNIX; + strcpy(usb.sun_path, path); + +@@ -399,8 +399,6 @@ + msg.msg_iov = iov; + msg.msg_iovlen = 1; + msg.msg_name = NULL; +- msg.msg_accrights = (void *) &rfd; +- msg.msg_accrightslen = sizeof(rfd); + + rfd = -1; + rcode = -1; |