6 files changed, 104 insertions, 14 deletions

diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index 95ca009264d3..29cd1b976e3f 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	wu-ftpd
 PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
 
diff --git a/ftp/wu-ftpd+ipv6/files/patch-aa b/ftp/wu-ftpd+ipv6/files/patch-aa
index 717e10da331a..9e3e4d9790ad 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-aa
+++ b/ftp/wu-ftpd+ipv6/files/patch-aa
@@ -1,5 +1,5 @@
---- src/ftpd.c	Sat Jul  1 14:17:39 2000
-+++ src/ftpd.c.new	Sat Jul  8 21:48:05 2000
+--- src/ftpd.c.orig	Sun Jul  2 01:17:39 2000
++++ src/ftpd.c	Tue Sep  4 10:36:51 2001
 @@ -1662,9 +1662,9 @@
      /* Display s/key challenge where appropriate. */
  
@@ -21,6 +21,24 @@
  #ifdef LOG_FAILED		/* 27-Apr-93      EHK/BM          */
  		syslog(LOG_INFO, "failed login from %s",
  		       remoteident);
+@@ -6274,7 +6274,7 @@
+ 	if (s) {
+ 	    int i = ntohs(pasv_addr.sin_port);
+ 	    sprintf(s, "PASV port %i assigned to %s", i, remoteident);
+-	    syslog(LOG_DEBUG, s);
++	    syslog(LOG_DEBUG, "%s", s);
+ 	    free(s);
+ 	}
+     }
+@@ -6289,7 +6289,7 @@
+ 	char *s = calloc(128 + strlen(remoteident), sizeof(char));
+ 	if (s) {
+ 	    sprintf(s, "PASV port assignment assigned for %s", remoteident);
+-	    syslog(LOG_DEBUG, s);
++	    syslog(LOG_DEBUG, "%s", s);
+ 	    free(s);
+ 	}
+     }
 @@ -6435,7 +6435,7 @@
  	dirlist = ftpglob(whichfiles);
  	sdirlist = dirlist;	/* save to free later */
@@ -46,3 +64,12 @@
      }
  
      if (dout != NULL) {
+@@ -7274,7 +7272,7 @@
+     int which;
+     struct aclmember *entry = NULL;
+     (void) acl_getclass(class);
+-    while (getaclentry("port-allow", &entry)) {
++    while (getaclentry("pasv-allow", &entry)) {
+ 	if ((ARG0 != NULL) && (strcasecmp(class, ARG0) == 0))
+ 	    for (which = 1; (which < MAXARGS) && (ARG[which] != NULL); which++) {
+ 		if (hostmatch(ARG[which], remoteaddr, NULL))
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ab b/ftp/wu-ftpd+ipv6/files/patch-ab
index 35b3ccb7dc76..20062d577fff 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ab
+++ b/ftp/wu-ftpd+ipv6/files/patch-ab
@@ -1,6 +1,6 @@
---- makefiles/Makefile.fbs.orig	Mon Sep 20 06:21:11 1999
-+++ makefiles/Makefile.fbs	Wed Oct 20 21:40:46 1999
-@@ -24,7 +24,9 @@
+--- makefiles/Makefile.fbs.orig	Sun Jul  2 00:56:26 2000
++++ makefiles/Makefile.fbs	Tue Sep  4 10:34:51 2001
+@@ -24,19 +24,21 @@
  #
  
  DESTDIR=
@@ -10,7 +10,25 @@
 +ETCDIR=         ${DESTDIR}${PREFIX}/etc
  
  BINDIR=		${DESTDIR}${PREFIX}/bin
- BINOWN=		bin
+-BINOWN=		bin
+-BINGRP=		bin
++BINOWN=		root
++BINGRP=		wheel
+ 
+ SBINDIR=	${DESTDIR}${PREFIX}/libexec
+-SBINOWN=	bin
+-SBINGRP=	bin
++SBINOWN=	root
++SBINGRP=	wheel
+ 
+ MANDIR=		${DESTDIR}${PREFIX}/man
+-MANOWN=		bin
+-MANGRP=		bin
++MANOWN=		root
++MANGRP=		wheel
+ 
+ INSTALL=	install
+ 
 @@ -52,14 +54,20 @@
  	@if [ ! -e ${SBINDIR} ]; then \
  		${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index 95ca009264d3..29cd1b976e3f 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	wu-ftpd
 PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
 
diff --git a/ftp/wu-ftpd/files/patch-aa b/ftp/wu-ftpd/files/patch-aa
index 717e10da331a..9e3e4d9790ad 100644
--- a/ftp/wu-ftpd/files/patch-aa
+++ b/ftp/wu-ftpd/files/patch-aa
@@ -1,5 +1,5 @@
---- src/ftpd.c	Sat Jul  1 14:17:39 2000
-+++ src/ftpd.c.new	Sat Jul  8 21:48:05 2000
+--- src/ftpd.c.orig	Sun Jul  2 01:17:39 2000
++++ src/ftpd.c	Tue Sep  4 10:36:51 2001
 @@ -1662,9 +1662,9 @@
      /* Display s/key challenge where appropriate. */
  
@@ -21,6 +21,24 @@
  #ifdef LOG_FAILED		/* 27-Apr-93      EHK/BM          */
  		syslog(LOG_INFO, "failed login from %s",
  		       remoteident);
+@@ -6274,7 +6274,7 @@
+ 	if (s) {
+ 	    int i = ntohs(pasv_addr.sin_port);
+ 	    sprintf(s, "PASV port %i assigned to %s", i, remoteident);
+-	    syslog(LOG_DEBUG, s);
++	    syslog(LOG_DEBUG, "%s", s);
+ 	    free(s);
+ 	}
+     }
+@@ -6289,7 +6289,7 @@
+ 	char *s = calloc(128 + strlen(remoteident), sizeof(char));
+ 	if (s) {
+ 	    sprintf(s, "PASV port assignment assigned for %s", remoteident);
+-	    syslog(LOG_DEBUG, s);
++	    syslog(LOG_DEBUG, "%s", s);
+ 	    free(s);
+ 	}
+     }
 @@ -6435,7 +6435,7 @@
  	dirlist = ftpglob(whichfiles);
  	sdirlist = dirlist;	/* save to free later */
@@ -46,3 +64,12 @@
      }
  
      if (dout != NULL) {
+@@ -7274,7 +7272,7 @@
+     int which;
+     struct aclmember *entry = NULL;
+     (void) acl_getclass(class);
+-    while (getaclentry("port-allow", &entry)) {
++    while (getaclentry("pasv-allow", &entry)) {
+ 	if ((ARG0 != NULL) && (strcasecmp(class, ARG0) == 0))
+ 	    for (which = 1; (which < MAXARGS) && (ARG[which] != NULL); which++) {
+ 		if (hostmatch(ARG[which], remoteaddr, NULL))
diff --git a/ftp/wu-ftpd/files/patch-ab b/ftp/wu-ftpd/files/patch-ab
index 35b3ccb7dc76..20062d577fff 100644
--- a/ftp/wu-ftpd/files/patch-ab
+++ b/ftp/wu-ftpd/files/patch-ab
@@ -1,6 +1,6 @@
---- makefiles/Makefile.fbs.orig	Mon Sep 20 06:21:11 1999
-+++ makefiles/Makefile.fbs	Wed Oct 20 21:40:46 1999
-@@ -24,7 +24,9 @@
+--- makefiles/Makefile.fbs.orig	Sun Jul  2 00:56:26 2000
++++ makefiles/Makefile.fbs	Tue Sep  4 10:34:51 2001
+@@ -24,19 +24,21 @@
  #
  
  DESTDIR=
@@ -10,7 +10,25 @@
 +ETCDIR=         ${DESTDIR}${PREFIX}/etc
  
  BINDIR=		${DESTDIR}${PREFIX}/bin
- BINOWN=		bin
+-BINOWN=		bin
+-BINGRP=		bin
++BINOWN=		root
++BINGRP=		wheel
+ 
+ SBINDIR=	${DESTDIR}${PREFIX}/libexec
+-SBINOWN=	bin
+-SBINGRP=	bin
++SBINOWN=	root
++SBINGRP=	wheel
+ 
+ MANDIR=		${DESTDIR}${PREFIX}/man
+-MANOWN=		bin
+-MANGRP=		bin
++MANOWN=		root
++MANGRP=		wheel
+ 
+ INSTALL=	install
+ 
 @@ -52,14 +54,20 @@
  	@if [ ! -e ${SBINDIR} ]; then \
  		${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \