diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2001-10-02 19:13:35 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2001-10-02 19:13:35 +0000 |
commit | 80a41627b459c956ee454c9981d13ef5de3ae728 (patch) | |
tree | 745e57ccf0ccc3bb0cf9e9897a824f13da84e34d /ftp | |
parent | Use another method of persuading MakeMaker to not install things into (diff) |
Use official patches set
(fix wrong place of pasv-allow fix as result)
Notes
Notes:
svn path=/head/; revision=48358
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/wu-ftpd+ipv6/Makefile | 10 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/distinfo | 5 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-aa | 65 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ac | 2 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ai | 10 | ||||
-rw-r--r-- | ftp/wu-ftpd/Makefile | 10 | ||||
-rw-r--r-- | ftp/wu-ftpd/distinfo | 5 | ||||
-rw-r--r-- | ftp/wu-ftpd/files/patch-aa | 65 | ||||
-rw-r--r-- | ftp/wu-ftpd/files/patch-ac | 2 | ||||
-rw-r--r-- | ftp/wu-ftpd/files/patch-ai | 10 |
10 files changed, 46 insertions, 138 deletions
diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile index 21f6ec8ce91c..e337214c2c96 100644 --- a/ftp/wu-ftpd+ipv6/Makefile +++ b/ftp/wu-ftpd+ipv6/Makefile @@ -9,9 +9,15 @@ PORTNAME= wu-ftpd PORTVERSION= 2.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ftp +DIST_SUBDIR= wu-ftpd MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ +PATCH_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/patches/apply_to_2.6.1/ +PATCHFILES= missing_format_strings.patch \ + nlst-shows-dirs.patch \ + pasv-port-allow-correction.patch +PATCH_DIST_STRIP= -S + -p0 MAINTAINER= ache@FreeBSD.org @@ -19,7 +25,7 @@ MAN1= ftpcount.1 ftpwho.1 MAN5= ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5 MAN8= ftpd.8 ftpshut.8 ftprestart.8 privatepw.8 -pre-patch: +post-patch: @${CP} ${WRKSRC}/config.h.noac ${WRKSRC}/config.h @${CP} ${WRKSRC}/src/pathnames.h.noac ${WRKSRC}/src/pathnames.h diff --git a/ftp/wu-ftpd+ipv6/distinfo b/ftp/wu-ftpd+ipv6/distinfo index 987702e1166a..1397115cb1f5 100644 --- a/ftp/wu-ftpd+ipv6/distinfo +++ b/ftp/wu-ftpd+ipv6/distinfo @@ -1 +1,4 @@ -MD5 (wu-ftpd-2.6.1.tar.gz) = 857ab8504998a753195eb94ac2dc39a4 +MD5 (wu-ftpd/wu-ftpd-2.6.1.tar.gz) = 857ab8504998a753195eb94ac2dc39a4 +MD5 (wu-ftpd/missing_format_strings.patch) = ddf252d05e01931b4f985cdcf6f5f106 +MD5 (wu-ftpd/nlst-shows-dirs.patch) = 58c002ad680fae0d0caba45b2ead30aa +MD5 (wu-ftpd/pasv-port-allow-correction.patch) = 973f82a3cce4cb30ef0adc873d5078fc diff --git a/ftp/wu-ftpd+ipv6/files/patch-aa b/ftp/wu-ftpd+ipv6/files/patch-aa index 176fbbd91f95..8ce2f17afbf2 100644 --- a/ftp/wu-ftpd+ipv6/files/patch-aa +++ b/ftp/wu-ftpd+ipv6/files/patch-aa @@ -1,5 +1,5 @@ ---- src/ftpd.c.orig Sat Jul 1 22:17:39 2000 -+++ src/ftpd.c Sat Sep 29 22:49:41 2001 +--- src/ftpd.c.orig Tue Oct 2 22:21:17 2001 ++++ src/ftpd.c Tue Oct 2 22:21:17 2001 @@ -447,7 +447,6 @@ #ifdef OPIE #include <opie.h> @@ -57,15 +57,6 @@ } #else reply(331, "Password required for %s.", name); -@@ -2572,7 +2568,7 @@ - #ifdef BSD_AUTH - if (ext_auth) { - if ((salt = check_auth(the_user, passwd))) { -- reply(530, salt); -+ reply(530, "%s", salt); - #ifdef LOG_FAILED /* 27-Apr-93 EHK/BM */ - syslog(LOG_INFO, "failed login from %s", - remoteident); @@ -2593,8 +2589,8 @@ if (pw == NULL) salt = "xx"; @@ -95,55 +86,3 @@ #endif /* OPIE */ #ifdef ULTRIX_AUTH if ((numfails = ultrix_check_pass(passwd, xpasswd)) >= 0) { -@@ -6274,7 +6276,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 +6291,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 +6437,7 @@ - dirlist = ftpglob(whichfiles); - sdirlist = dirlist; /* save to free later */ - if (globerr != NULL) { -- reply(550, globerr); -+ reply(550, "%s", globerr); - goto globfree; - } - else if (dirlist == NULL) { -@@ -6486,7 +6488,6 @@ - } - goto globfree; - } -- if ((st.st_mode & S_IFMT) != S_IFDIR) { - if (dout == NULL) { - dout = dataconn("file list", (off_t) - 1, "w"); - if (dout == NULL) -@@ -6509,7 +6510,6 @@ - byte_count_out++; - } - #endif -- } - } - - if (dout != NULL) { -@@ -7274,7 +7274,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-ac b/ftp/wu-ftpd+ipv6/files/patch-ac index 16fb41bc5a7a..99ff3298ce0d 100644 --- a/ftp/wu-ftpd+ipv6/files/patch-ac +++ b/ftp/wu-ftpd+ipv6/files/patch-ac @@ -1,5 +1,5 @@ *** src/pathnames.h.orig Wed Oct 20 20:27:34 1999 ---- src/pathnames.h Wed Oct 20 20:30:19 1999 +--- src/pathnames.h.noac Wed Oct 20 20:30:19 1999 *************** *** 104,113 **** #define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers" diff --git a/ftp/wu-ftpd+ipv6/files/patch-ai b/ftp/wu-ftpd+ipv6/files/patch-ai index 13a3588117c7..8faea955fd18 100644 --- a/ftp/wu-ftpd+ipv6/files/patch-ai +++ b/ftp/wu-ftpd+ipv6/files/patch-ai @@ -1,5 +1,5 @@ ---- config.h.orig Sun Jul 29 23:29:57 2001 -+++ config.h Sun Jul 29 23:30:55 2001 +--- config.h.noac.orig Tue Oct 2 23:07:36 2001 ++++ config.h.noac Tue Oct 2 23:08:15 2001 @@ -109,9 +109,7 @@ * Add OPIE support -- REQUIRES OPIE libraries */ @@ -38,3 +38,9 @@ /* * Define this to completely disable anonymous FTP access. +@@ -387,4 +385,4 @@ + * the NLST command enough to quell complains from Solaris command- + * line FTP client users. + */ +-#undef NLST_SHOWS_DIRS ++#define NLST_SHOWS_DIRS diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile index 21f6ec8ce91c..e337214c2c96 100644 --- a/ftp/wu-ftpd/Makefile +++ b/ftp/wu-ftpd/Makefile @@ -9,9 +9,15 @@ PORTNAME= wu-ftpd PORTVERSION= 2.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ftp +DIST_SUBDIR= wu-ftpd MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ +PATCH_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/patches/apply_to_2.6.1/ +PATCHFILES= missing_format_strings.patch \ + nlst-shows-dirs.patch \ + pasv-port-allow-correction.patch +PATCH_DIST_STRIP= -S + -p0 MAINTAINER= ache@FreeBSD.org @@ -19,7 +25,7 @@ MAN1= ftpcount.1 ftpwho.1 MAN5= ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5 MAN8= ftpd.8 ftpshut.8 ftprestart.8 privatepw.8 -pre-patch: +post-patch: @${CP} ${WRKSRC}/config.h.noac ${WRKSRC}/config.h @${CP} ${WRKSRC}/src/pathnames.h.noac ${WRKSRC}/src/pathnames.h diff --git a/ftp/wu-ftpd/distinfo b/ftp/wu-ftpd/distinfo index 987702e1166a..1397115cb1f5 100644 --- a/ftp/wu-ftpd/distinfo +++ b/ftp/wu-ftpd/distinfo @@ -1 +1,4 @@ -MD5 (wu-ftpd-2.6.1.tar.gz) = 857ab8504998a753195eb94ac2dc39a4 +MD5 (wu-ftpd/wu-ftpd-2.6.1.tar.gz) = 857ab8504998a753195eb94ac2dc39a4 +MD5 (wu-ftpd/missing_format_strings.patch) = ddf252d05e01931b4f985cdcf6f5f106 +MD5 (wu-ftpd/nlst-shows-dirs.patch) = 58c002ad680fae0d0caba45b2ead30aa +MD5 (wu-ftpd/pasv-port-allow-correction.patch) = 973f82a3cce4cb30ef0adc873d5078fc diff --git a/ftp/wu-ftpd/files/patch-aa b/ftp/wu-ftpd/files/patch-aa index 176fbbd91f95..8ce2f17afbf2 100644 --- a/ftp/wu-ftpd/files/patch-aa +++ b/ftp/wu-ftpd/files/patch-aa @@ -1,5 +1,5 @@ ---- src/ftpd.c.orig Sat Jul 1 22:17:39 2000 -+++ src/ftpd.c Sat Sep 29 22:49:41 2001 +--- src/ftpd.c.orig Tue Oct 2 22:21:17 2001 ++++ src/ftpd.c Tue Oct 2 22:21:17 2001 @@ -447,7 +447,6 @@ #ifdef OPIE #include <opie.h> @@ -57,15 +57,6 @@ } #else reply(331, "Password required for %s.", name); -@@ -2572,7 +2568,7 @@ - #ifdef BSD_AUTH - if (ext_auth) { - if ((salt = check_auth(the_user, passwd))) { -- reply(530, salt); -+ reply(530, "%s", salt); - #ifdef LOG_FAILED /* 27-Apr-93 EHK/BM */ - syslog(LOG_INFO, "failed login from %s", - remoteident); @@ -2593,8 +2589,8 @@ if (pw == NULL) salt = "xx"; @@ -95,55 +86,3 @@ #endif /* OPIE */ #ifdef ULTRIX_AUTH if ((numfails = ultrix_check_pass(passwd, xpasswd)) >= 0) { -@@ -6274,7 +6276,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 +6291,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 +6437,7 @@ - dirlist = ftpglob(whichfiles); - sdirlist = dirlist; /* save to free later */ - if (globerr != NULL) { -- reply(550, globerr); -+ reply(550, "%s", globerr); - goto globfree; - } - else if (dirlist == NULL) { -@@ -6486,7 +6488,6 @@ - } - goto globfree; - } -- if ((st.st_mode & S_IFMT) != S_IFDIR) { - if (dout == NULL) { - dout = dataconn("file list", (off_t) - 1, "w"); - if (dout == NULL) -@@ -6509,7 +6510,6 @@ - byte_count_out++; - } - #endif -- } - } - - if (dout != NULL) { -@@ -7274,7 +7274,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-ac b/ftp/wu-ftpd/files/patch-ac index 16fb41bc5a7a..99ff3298ce0d 100644 --- a/ftp/wu-ftpd/files/patch-ac +++ b/ftp/wu-ftpd/files/patch-ac @@ -1,5 +1,5 @@ *** src/pathnames.h.orig Wed Oct 20 20:27:34 1999 ---- src/pathnames.h Wed Oct 20 20:30:19 1999 +--- src/pathnames.h.noac Wed Oct 20 20:30:19 1999 *************** *** 104,113 **** #define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers" diff --git a/ftp/wu-ftpd/files/patch-ai b/ftp/wu-ftpd/files/patch-ai index 13a3588117c7..8faea955fd18 100644 --- a/ftp/wu-ftpd/files/patch-ai +++ b/ftp/wu-ftpd/files/patch-ai @@ -1,5 +1,5 @@ ---- config.h.orig Sun Jul 29 23:29:57 2001 -+++ config.h Sun Jul 29 23:30:55 2001 +--- config.h.noac.orig Tue Oct 2 23:07:36 2001 ++++ config.h.noac Tue Oct 2 23:08:15 2001 @@ -109,9 +109,7 @@ * Add OPIE support -- REQUIRES OPIE libraries */ @@ -38,3 +38,9 @@ /* * Define this to completely disable anonymous FTP access. +@@ -387,4 +385,4 @@ + * the NLST command enough to quell complains from Solaris command- + * line FTP client users. + */ +-#undef NLST_SHOWS_DIRS ++#define NLST_SHOWS_DIRS |