ports/81411: ftp/pftpd: update to version 1.0.1 and unbreak
Johan van Selst
johans at stack.nl
Mon May 23 18:58:53 UTC 2005
Here is a better patch that also assures compilation on 4.x
This introduces:
files/patch-doc_Makefile.in
files/patch-plib_dirlist.c
files/patch-src_rpa.c
diff -uNr pftpd/Makefile pftpd/Makefile
--- pftpd/Makefile Sun May 22 03:32:39 2005
+++ pftpd/Makefile Mon May 23 20:54:04 2005
@@ -6,19 +6,16 @@
#
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 at 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
diff -uNr pftpd/distinfo pftpd/distinfo
--- pftpd/distinfo Thu Apr 1 03:35:38 2004
+++ pftpd/distinfo Mon May 23 20:34:05 2005
@@ -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 -uNr pftpd/files/patch-Makefile.in pftpd/files/patch-Makefile.in
--- pftpd/files/patch-Makefile.in Wed May 15 15:15:04 2002
+++ pftpd/files/patch-Makefile.in Mon May 23 20:34:05 2005
@@ -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 -uNr pftpd/files/patch-doc_Makefile.in pftpd/files/patch-doc_Makefile.in
--- pftpd/files/patch-doc_Makefile.in Thu Jan 1 01:00:00 1970
+++ pftpd/files/patch-doc_Makefile.in Mon May 23 20:52:10 2005
@@ -0,0 +1,19 @@
+--- doc/Makefile.in.orig Mon May 23 20:51:57 2005
++++ doc/Makefile.in Mon May 23 20:51:43 2005
+@@ -17,11 +17,11 @@ all: man
+
+ man: $(MANPAGES)
+
+-pftpd.1: pftpd.sgml
+- $(SGML2MAN) pftpd.sgml
+-
+-rpad.1: rpad.sgml
+- $(SGML2MAN) rpad.sgml
++#pftpd.1: pftpd.sgml
++# $(SGML2MAN) pftpd.sgml
++#
++#rpad.1: rpad.sgml
++# $(SGML2MAN) rpad.sgml
+
+
+ # Installing
diff -uNr pftpd/files/patch-plib-support.c pftpd/files/patch-plib-support.c
--- pftpd/files/patch-plib-support.c Sat May 18 08:13:57 2002
+++ pftpd/files/patch-plib-support.c Mon May 23 20:46:18 2005
@@ -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 -uNr pftpd/files/patch-plib_dirlist.c pftpd/files/patch-plib_dirlist.c
--- pftpd/files/patch-plib_dirlist.c Thu Jan 1 01:00:00 1970
+++ pftpd/files/patch-plib_dirlist.c Mon May 23 20:34:05 2005
@@ -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 -uNr pftpd/files/patch-src_rpa.c pftpd/files/patch-src_rpa.c
--- pftpd/files/patch-src_rpa.c Thu Jan 1 01:00:00 1970
+++ pftpd/files/patch-src_rpa.c Mon May 23 20:34:05 2005
@@ -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;
More information about the freebsd-ports-bugs
mailing list