Index: head/ftp/wu-ftpd/Makefile =================================================================== --- head/ftp/wu-ftpd/Makefile (revision 48639) +++ head/ftp/wu-ftpd/Makefile (revision 48640) @@ -1,35 +1,35 @@ # New ports collection makefile for: wu-ftpd # Date created: 18 Oct 1994 # Whom: torstenb # # $FreeBSD$ # # REMINDER: to use ftpaccess(5) you need to specify -a in command line, # it is changed from previous versions PORTNAME= wu-ftpd PORTVERSION= 2.6.1 -PORTREVISION= 5 +PORTREVISION= 6 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 MAN1= ftpcount.1 ftpwho.1 MAN5= ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5 MAN8= ftpd.8 ftpshut.8 ftprestart.8 privatepw.8 post-patch: @${CP} ${WRKSRC}/config.h.noac ${WRKSRC}/config.h @${CP} ${WRKSRC}/src/pathnames.h.noac ${WRKSRC}/src/pathnames.h do-build: cd ${WRKSRC} && ./build fbs .include Property changes on: head/ftp/wu-ftpd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.39 \ No newline at end of property +1.40 \ No newline at end of property Index: head/ftp/wu-ftpd/files/patch-af =================================================================== --- head/ftp/wu-ftpd/files/patch-af (nonexistent) +++ head/ftp/wu-ftpd/files/patch-af (revision 48640) @@ -0,0 +1,29 @@ +--- support/strcasestr.c.orig Sat Jul 1 22:36:29 2000 ++++ support/strcasestr.c Wed Oct 10 07:18:17 2001 +@@ -24,22 +24,24 @@ + $Id: strcasestr.c,v 1.5 2000/07/01 18:36:29 wuftpd Exp $ + + ****************************************************************************/ ++#include + #include + /* + * Find the first occurrence of find in s. + */ +-char *strcasestr(register char *s, register char *find) ++char *strcasestr(const char *s, const char *find) + { + register char c, sc; + register size_t len; + + if ((c = *find++) != 0) { ++ c = tolower((unsigned char)c); + len = strlen(find); + do { + do { + if ((sc = *s++) == 0) + return (NULL); +- } while (sc != c); ++ } while ((char)tolower((unsigned char)sc) != c); + } while (strncasecmp(s, find, len) != 0); + s--; + } Property changes on: head/ftp/wu-ftpd/files/patch-af ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/ftp/wu-ftpd/files/patch-aj =================================================================== --- head/ftp/wu-ftpd/files/patch-aj (nonexistent) +++ head/ftp/wu-ftpd/files/patch-aj (revision 48640) @@ -0,0 +1,8 @@ +--- src/proto.h.bak Sat Jul 1 22:17:39 2000 ++++ src/proto.h Wed Oct 10 07:15:39 2001 +@@ -292,4 +292,4 @@ + /* + ** support/strcasestr.c + */ +-char *strcasestr(register char *s, register char *find); ++char *strcasestr(const char *s, const char *find); Property changes on: head/ftp/wu-ftpd/files/patch-aj ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/ftp/wu-ftpd/files/patch-al =================================================================== --- head/ftp/wu-ftpd/files/patch-al (revision 48639) +++ head/ftp/wu-ftpd/files/patch-al (revision 48640) @@ -1,19 +1,20 @@ -*** support/makefiles/Makefile.fbs.orig Mon Oct 4 22:44:08 1999 ---- support/makefiles/Makefile.fbs Wed Oct 20 20:32:42 1999 -*************** -*** 33,39 **** - LIBC = /usr/lib/libc.a - IFLAGS = - LFLAGS = -! CFLAGS = -O ${IFLAGS} ${LFLAGS} - - SRCS = strcasestr.c authuser.c ftw.c - OBJS = strcasestr.o authuser.o ftw.o ---- 33,39 ---- - LIBC = /usr/lib/libc.a - IFLAGS = - LFLAGS = -! CFLAGS += ${IFLAGS} ${LFLAGS} - - SRCS = strcasestr.c authuser.c ftw.c - OBJS = strcasestr.o authuser.o ftw.o +--- support/makefiles/Makefile.fbs.orig Sat Jul 1 22:22:55 2000 ++++ support/makefiles/Makefile.fbs Wed Oct 10 07:11:36 2001 +@@ -33,7 +33,14 @@ + LIBC = /usr/lib/libc.a + IFLAGS = + LFLAGS = +-CFLAGS = -O ${IFLAGS} ${LFLAGS} ++CFLAGS += ${IFLAGS} ${LFLAGS} + +-SRCS = strcasestr.c authuser.c ftw.c +-OBJS = strcasestr.o authuser.o ftw.o ++SRCS = authuser.c ftw.c ++OBJS = authuser.o ftw.o ++ ++HAVE_STRSTR!= (nm ${LIBC} | grep -q strcasestr) || echo "NO" ++ ++.if ${HAVE_STRSTR} == "NO" ++SRCS += strcasestr.c ++OBJS += strcasestr.o ++.endif Property changes on: head/ftp/wu-ftpd/files/patch-al ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/ftp/wu-ftpd+ipv6/Makefile =================================================================== --- head/ftp/wu-ftpd+ipv6/Makefile (revision 48639) +++ head/ftp/wu-ftpd+ipv6/Makefile (revision 48640) @@ -1,35 +1,35 @@ # New ports collection makefile for: wu-ftpd # Date created: 18 Oct 1994 # Whom: torstenb # # $FreeBSD$ # # REMINDER: to use ftpaccess(5) you need to specify -a in command line, # it is changed from previous versions PORTNAME= wu-ftpd PORTVERSION= 2.6.1 -PORTREVISION= 5 +PORTREVISION= 6 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 MAN1= ftpcount.1 ftpwho.1 MAN5= ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5 MAN8= ftpd.8 ftpshut.8 ftprestart.8 privatepw.8 post-patch: @${CP} ${WRKSRC}/config.h.noac ${WRKSRC}/config.h @${CP} ${WRKSRC}/src/pathnames.h.noac ${WRKSRC}/src/pathnames.h do-build: cd ${WRKSRC} && ./build fbs .include Property changes on: head/ftp/wu-ftpd+ipv6/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.39 \ No newline at end of property +1.40 \ No newline at end of property Index: head/ftp/wu-ftpd+ipv6/files/patch-af =================================================================== --- head/ftp/wu-ftpd+ipv6/files/patch-af (nonexistent) +++ head/ftp/wu-ftpd+ipv6/files/patch-af (revision 48640) @@ -0,0 +1,29 @@ +--- support/strcasestr.c.orig Sat Jul 1 22:36:29 2000 ++++ support/strcasestr.c Wed Oct 10 07:18:17 2001 +@@ -24,22 +24,24 @@ + $Id: strcasestr.c,v 1.5 2000/07/01 18:36:29 wuftpd Exp $ + + ****************************************************************************/ ++#include + #include + /* + * Find the first occurrence of find in s. + */ +-char *strcasestr(register char *s, register char *find) ++char *strcasestr(const char *s, const char *find) + { + register char c, sc; + register size_t len; + + if ((c = *find++) != 0) { ++ c = tolower((unsigned char)c); + len = strlen(find); + do { + do { + if ((sc = *s++) == 0) + return (NULL); +- } while (sc != c); ++ } while ((char)tolower((unsigned char)sc) != c); + } while (strncasecmp(s, find, len) != 0); + s--; + } Property changes on: head/ftp/wu-ftpd+ipv6/files/patch-af ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/ftp/wu-ftpd+ipv6/files/patch-aj =================================================================== --- head/ftp/wu-ftpd+ipv6/files/patch-aj (nonexistent) +++ head/ftp/wu-ftpd+ipv6/files/patch-aj (revision 48640) @@ -0,0 +1,8 @@ +--- src/proto.h.bak Sat Jul 1 22:17:39 2000 ++++ src/proto.h Wed Oct 10 07:15:39 2001 +@@ -292,4 +292,4 @@ + /* + ** support/strcasestr.c + */ +-char *strcasestr(register char *s, register char *find); ++char *strcasestr(const char *s, const char *find); Property changes on: head/ftp/wu-ftpd+ipv6/files/patch-aj ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/ftp/wu-ftpd+ipv6/files/patch-al =================================================================== --- head/ftp/wu-ftpd+ipv6/files/patch-al (revision 48639) +++ head/ftp/wu-ftpd+ipv6/files/patch-al (revision 48640) @@ -1,19 +1,20 @@ -*** support/makefiles/Makefile.fbs.orig Mon Oct 4 22:44:08 1999 ---- support/makefiles/Makefile.fbs Wed Oct 20 20:32:42 1999 -*************** -*** 33,39 **** - LIBC = /usr/lib/libc.a - IFLAGS = - LFLAGS = -! CFLAGS = -O ${IFLAGS} ${LFLAGS} - - SRCS = strcasestr.c authuser.c ftw.c - OBJS = strcasestr.o authuser.o ftw.o ---- 33,39 ---- - LIBC = /usr/lib/libc.a - IFLAGS = - LFLAGS = -! CFLAGS += ${IFLAGS} ${LFLAGS} - - SRCS = strcasestr.c authuser.c ftw.c - OBJS = strcasestr.o authuser.o ftw.o +--- support/makefiles/Makefile.fbs.orig Sat Jul 1 22:22:55 2000 ++++ support/makefiles/Makefile.fbs Wed Oct 10 07:11:36 2001 +@@ -33,7 +33,14 @@ + LIBC = /usr/lib/libc.a + IFLAGS = + LFLAGS = +-CFLAGS = -O ${IFLAGS} ${LFLAGS} ++CFLAGS += ${IFLAGS} ${LFLAGS} + +-SRCS = strcasestr.c authuser.c ftw.c +-OBJS = strcasestr.o authuser.o ftw.o ++SRCS = authuser.c ftw.c ++OBJS = authuser.o ftw.o ++ ++HAVE_STRSTR!= (nm ${LIBC} | grep -q strcasestr) || echo "NO" ++ ++.if ${HAVE_STRSTR} == "NO" ++SRCS += strcasestr.c ++OBJS += strcasestr.o ++.endif Property changes on: head/ftp/wu-ftpd+ipv6/files/patch-al ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property