diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1997-01-30 17:00:56 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1997-01-30 17:00:56 +0000 |
| commit | 624195f0764367c99cc3c640d7fcda1f86a322e4 (patch) | |
| tree | 453a32509d088cc39a5467b701a4ef68bbd788da /ftp/wu-ftpd+ipv6/files/patch-ab | |
| parent | a2310bfff12e0a7862e86428194028429716f4cb (diff) | |
Upgrade to Academ 2.4.2-beta-12 as recommended by AUSCERT security
advisory.
P.S. this version is much improved comparing to what we have previously,
f.e. it already contains most of our fixes.
Notes
Notes:
svn path=/head/; revision=5473
Diffstat (limited to 'ftp/wu-ftpd+ipv6/files/patch-ab')
| -rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ab | 138 |
1 files changed, 87 insertions, 51 deletions
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ab b/ftp/wu-ftpd+ipv6/files/patch-ab index e8ea68abc559..7c29fc242065 100644 --- a/ftp/wu-ftpd+ipv6/files/patch-ab +++ b/ftp/wu-ftpd+ipv6/files/patch-ab @@ -1,51 +1,87 @@ ---- Makefile.orig Fri Apr 1 11:03:58 1994 -+++ Makefile Sat Nov 30 17:31:22 1996 -@@ -1,25 +1,32 @@ --BINDIR= /usr/local/bin --ETCDIR= /usr/local/etc --MANDIR= /usr/local/man -+BINDIR= ${PREFIX}/bin -+LIBEXECDIR= ${PREFIX}/libexec -+ETCDIR= ${PREFIX}/etc -+MANDIR= ${PREFIX}/man - MANEXT= 8 - - all: -+ /bin/sh build fb2 - @ echo 'Use the "build" command (shell script) to make ftpd.' - @ echo 'You can say "build help" for details on how it works.' - - install: bin/ftpd bin/ftpcount bin/ftpshut -- -mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old -+ -mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old - @echo Installing binaries. -- install -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd -- install -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut -- install -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount -- install -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho -+ install -c -o bin -g bin -m 755 bin/ftpd ${LIBEXECDIR}/ftpd -+ install -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut -+ install -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount -+ install -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho -+ install -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig -+ @echo Installing basic configuration -+ install -c -o root -g bin -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example -+ install -c -o root -g bin -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example -+ install -c -o root -g bin -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example - @echo Installing manpages. -- install -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8 -- install -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1 -- install -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1 -- install -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8 -- install -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5 -- install -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5 -- install -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5 -- install -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5 -+ install -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8 -+ install -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1 -+ install -c -o bin -g bin -m 644 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1 -+ install -c -o bin -g bin -m 644 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8 -+ install -c -o bin -g bin -m 644 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5 -+ install -c -o bin -g bin -m 644 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5 -+ install -c -o bin -g bin -m 644 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5 -+ install -c -o bin -g bin -m 644 doc/xferlog.5 ${MANDIR}/man5/xferlog.5 +*** makefiles/Makefile.fbs.bak Thu Jan 16 19:57:40 1997 +--- makefiles/Makefile.fbs Thu Jan 30 17:06:29 1997 +*************** +*** 1,7 **** +! PREFIX= /usr/local + BINDIR= ${PREFIX}/bin + ETCDIR= ${PREFIX}/etc + MANDIR= ${PREFIX}/man + MANEXT= 8 + INSTALL= install + +--- 1,8 ---- +! PREFIX?= /usr/local + BINDIR= ${PREFIX}/bin + ETCDIR= ${PREFIX}/etc + MANDIR= ${PREFIX}/man ++ LIBEXECDIR= ${PREFIX}/libexec + MANEXT= 8 + INSTALL= install + +*************** +*** 10,41 **** + @ echo 'You can say "build help" for details on how it works.' + + install: bin/ftpd bin/ftpcount bin/ftpshut +! -mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old + @echo installing binaries. +! ${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho + install -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig + @echo NOT Installing basic configuration +! # install -c -o root -g bin -m 755 doc/examples/ftpaccess ${ETCDIR}/ftpaccess +! # install -c -o root -g bin -m 755 doc/examples/ftpusers ${ETCDIR}/ftpusers +! # install -c -o root -g bin -m 755 doc/examples/ftpconversions ${ETCDIR}/ftpconversions + @echo installing manpages. +! ${INSTALL} -c -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8 +! ${INSTALL} -c -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1 +! ${INSTALL} -c -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1 +! ${INSTALL} -c -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8 +! ${INSTALL} -c -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5 +! ${INSTALL} -c -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5 +! ${INSTALL} -c -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5 +! ${INSTALL} -c -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5 +! @echo Compressing manpages +! gzip -f -9 ${MANDIR}/man8/ftpd.8 +! gzip -f -9 ${MANDIR}/man1/ftpcount.1 +! gzip -f -9 ${MANDIR}/man1/ftpwho.1 +! gzip -f -9 ${MANDIR}/man8/ftpshut.8 +! gzip -f -9 ${MANDIR}/man5/ftpaccess.5 +! gzip -f -9 ${MANDIR}/man5/ftphosts.5 +! gzip -f -9 ${MANDIR}/man5/ftpconversions.5 +! gzip -f -9 ${MANDIR}/man5/xferlog.5 +--- 11,42 ---- + @ echo 'You can say "build help" for details on how it works.' + + install: bin/ftpd bin/ftpcount bin/ftpshut +! -mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old + @echo installing binaries. +! ${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${LIBEXECDIR}/ftpd + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho + install -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig + @echo NOT Installing basic configuration +! install -c -o root -g bin -m 755 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example +! install -c -o root -g bin -m 755 doc/examples/ftpusers ${ETCDIR}/ftpusers.example +! install -c -o root -g bin -m 755 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example + @echo installing manpages. +! ${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8 +! ${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1 +! ${INSTALL} -c -o bin -g bin -m 644 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1 +! ${INSTALL} -c -o bin -g bin -m 644 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8 +! ${INSTALL} -c -o bin -g bin -m 644 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5 +! ${INSTALL} -c -o bin -g bin -m 644 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5 +! ${INSTALL} -c -o bin -g bin -m 644 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5 +! ${INSTALL} -c -o bin -g bin -m 644 doc/xferlog.5 ${MANDIR}/man5/xferlog.5 +! # @echo Compressing manpages +! # gzip -f -9 ${MANDIR}/man8/ftpd.8 +! # gzip -f -9 ${MANDIR}/man1/ftpcount.1 +! # gzip -f -9 ${MANDIR}/man1/ftpwho.1 +! # gzip -f -9 ${MANDIR}/man8/ftpshut.8 +! # gzip -f -9 ${MANDIR}/man5/ftpaccess.5 +! # gzip -f -9 ${MANDIR}/man5/ftphosts.5 +! # gzip -f -9 ${MANDIR}/man5/ftpconversions.5 +! # gzip -f -9 ${MANDIR}/man5/xferlog.5 |