summaryrefslogtreecommitdiffstats
path: root/ftp
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1995-08-08 11:06:34 +0000
committerasami <asami@FreeBSD.org>1995-08-08 11:06:34 +0000
commit7623c6ace12a9db307d7e881717a36f78fd3eb8e (patch)
tree1863e19c8490ec71e4963bb0b43e7c4242b618c5 /ftp
parent077a042303356b3acf401b5c59ada22341c3aa4e (diff)
downloadFreeBSD-ports-7623c6ace12a9db307d7e881717a36f78fd3eb8e.zip
FreeBSD-ports-7623c6ace12a9db307d7e881717a36f78fd3eb8e.tar.gz
Correct a few pathname problems. In particular, put ftpd in libexec,
not etc. Submitted by: Tom Samplonius <tom@misery.sdf.com>
Diffstat (limited to 'ftp')
-rw-r--r--ftp/wu-ftpd+ipv6/files/patch-ab7
-rw-r--r--ftp/wu-ftpd+ipv6/files/patch-ac49
-rw-r--r--ftp/wu-ftpd+ipv6/pkg-plist3
-rw-r--r--ftp/wu-ftpd/files/patch-ab7
-rw-r--r--ftp/wu-ftpd/files/patch-ac49
-rw-r--r--ftp/wu-ftpd/pkg-plist3
6 files changed, 62 insertions, 56 deletions
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ab b/ftp/wu-ftpd+ipv6/files/patch-ab
index fe0cb6d..3167be4 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ab
+++ b/ftp/wu-ftpd+ipv6/files/patch-ab
@@ -1,5 +1,5 @@
*** Makefile.orig Fri Apr 1 11:03:58 1994
---- Makefile Wed Jan 25 14:58:44 1995
+--- Makefile Sun Aug 6 21:35:01 1995
***************
*** 1,25 ****
! BINDIR= /usr/local/bin
@@ -27,8 +27,9 @@
! 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
---- 1,35 ----
+--- 1,36 ----
! BINDIR= ${PREFIX}/bin
+! LIBEXECDIR= ${PREFIX}/libexec
! ETCDIR= ${PREFIX}/etc
! MANDIR= ${PREFIX}/man
MANEXT= 8
@@ -41,7 +42,7 @@
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/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
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ac b/ftp/wu-ftpd+ipv6/files/patch-ac
index 8f9f98a..971dbb4 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ac
+++ b/ftp/wu-ftpd+ipv6/files/patch-ac
@@ -1,47 +1,50 @@
-*** src/pathnames.h.orig Wed Apr 13 22:46:48 1994
---- src/pathnames.h Tue Oct 18 18:26:26 1994
+*** src/pathnames.h.orig Wed Apr 13 13:46:48 1994
+--- src/pathnames.h Sun Aug 6 21:45:38 1995
***************
-*** 29,41 ****
+*** 29,46 ****
*
* @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */
! #define _PATH_FTPUSERS "/etc/ftpusers"
-! #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
+ #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
#define _PATH_EXECPATH "/bin/ftp-exec"
! #define _PATH_PIDNAMES "/usr/local/daemon/ftpd/ftp.pids-%s"
-! #define _PATH_CVT "/usr/local/etc/ftpconversions"
+ #define _PATH_CVT "/usr/local/etc/ftpconversions"
! #define _PATH_XFERLOG "/usr/adm/xferlog"
! #define _PATH_PRIVATE "/etc/ftpgroups"
#ifndef _PATH_UTMP
- #define _PATH_UTMP "/etc/utmp"
---- 29,41 ----
+! #define _PATH_UTMP "/etc/utmp"
+! #define _PATH_WTMP "/usr/adm/wtmp"
+! #define _PATH_LASTLOG "/usr/adm/lastlog"
+ #endif
+
+ #define _PATH_BSHELL "/bin/sh"
+--- 29,46 ----
*
* @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */
-! #define _PATH_FTPUSERS "!!PREFIX!!/etc/ftpusers"
-! #define _PATH_FTPACCESS "!!PREFIX!!/etc/ftpaccess"
+! #define _PATH_FTPUSERS "/usr/local/etc/ftpusers"
+ #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
#define _PATH_EXECPATH "/bin/ftp-exec"
-! #define _PATH_PIDNAMES "!!PREFIX!!/daemon/ftpd/ftp.pids-%s"
-! #define _PATH_CVT "!!PREFIX!!/etc/ftpconversions"
+! #define _PATH_PIDNAMES "/var/run/ftp.pids-%s"
+ #define _PATH_CVT "/usr/local/etc/ftpconversions"
! #define _PATH_XFERLOG "/var/log/xferlog"
-! #define _PATH_PRIVATE "!!PREFIX!!/etc/ftpgroups"
+! #define _PATH_PRIVATE "/usr/local/etc/ftpgroups"
#ifndef _PATH_UTMP
- #define _PATH_UTMP "/etc/utmp"
-***************
-*** 47,52 ****
- #define _PATH_DEVNULL "/dev/null"
-
- #ifdef HOST_ACCESS
-! #define _PATH_FTPHOSTS "/usr/local/etc/ftphosts"
+! #define _PATH_UTMP "/var/run/utmp"
+! #define _PATH_WTMP "/var/log/wtmp"
+! #define _PATH_LASTLOG "/var/log/lastlog"
#endif
---- 47,53 ----
- #define _PATH_DEVNULL "/dev/null"
+ #define _PATH_BSHELL "/bin/sh"
+***************
+*** 48,52 ****
+--- 48,53 ----
#ifdef HOST_ACCESS
-! #define _PATH_FTPHOSTS "!!PREFIX!!/etc/ftphosts"
-! #else
+ #define _PATH_FTPHOSTS "/usr/local/etc/ftphosts"
++ #else
#endif
diff --git a/ftp/wu-ftpd+ipv6/pkg-plist b/ftp/wu-ftpd+ipv6/pkg-plist
index 067ff00..e0352b9 100644
--- a/ftp/wu-ftpd+ipv6/pkg-plist
+++ b/ftp/wu-ftpd+ipv6/pkg-plist
@@ -1,5 +1,4 @@
-@cwd /usr/local
-etc/ftpd
+libexec/ftpd
man/man1/ftpcount.1.gz
man/man1/ftpwho.1.gz
man/man5/ftpaccess.5.gz
diff --git a/ftp/wu-ftpd/files/patch-ab b/ftp/wu-ftpd/files/patch-ab
index fe0cb6d..3167be4 100644
--- a/ftp/wu-ftpd/files/patch-ab
+++ b/ftp/wu-ftpd/files/patch-ab
@@ -1,5 +1,5 @@
*** Makefile.orig Fri Apr 1 11:03:58 1994
---- Makefile Wed Jan 25 14:58:44 1995
+--- Makefile Sun Aug 6 21:35:01 1995
***************
*** 1,25 ****
! BINDIR= /usr/local/bin
@@ -27,8 +27,9 @@
! 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
---- 1,35 ----
+--- 1,36 ----
! BINDIR= ${PREFIX}/bin
+! LIBEXECDIR= ${PREFIX}/libexec
! ETCDIR= ${PREFIX}/etc
! MANDIR= ${PREFIX}/man
MANEXT= 8
@@ -41,7 +42,7 @@
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/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
diff --git a/ftp/wu-ftpd/files/patch-ac b/ftp/wu-ftpd/files/patch-ac
index 8f9f98a..971dbb4 100644
--- a/ftp/wu-ftpd/files/patch-ac
+++ b/ftp/wu-ftpd/files/patch-ac
@@ -1,47 +1,50 @@
-*** src/pathnames.h.orig Wed Apr 13 22:46:48 1994
---- src/pathnames.h Tue Oct 18 18:26:26 1994
+*** src/pathnames.h.orig Wed Apr 13 13:46:48 1994
+--- src/pathnames.h Sun Aug 6 21:45:38 1995
***************
-*** 29,41 ****
+*** 29,46 ****
*
* @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */
! #define _PATH_FTPUSERS "/etc/ftpusers"
-! #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
+ #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
#define _PATH_EXECPATH "/bin/ftp-exec"
! #define _PATH_PIDNAMES "/usr/local/daemon/ftpd/ftp.pids-%s"
-! #define _PATH_CVT "/usr/local/etc/ftpconversions"
+ #define _PATH_CVT "/usr/local/etc/ftpconversions"
! #define _PATH_XFERLOG "/usr/adm/xferlog"
! #define _PATH_PRIVATE "/etc/ftpgroups"
#ifndef _PATH_UTMP
- #define _PATH_UTMP "/etc/utmp"
---- 29,41 ----
+! #define _PATH_UTMP "/etc/utmp"
+! #define _PATH_WTMP "/usr/adm/wtmp"
+! #define _PATH_LASTLOG "/usr/adm/lastlog"
+ #endif
+
+ #define _PATH_BSHELL "/bin/sh"
+--- 29,46 ----
*
* @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */
-! #define _PATH_FTPUSERS "!!PREFIX!!/etc/ftpusers"
-! #define _PATH_FTPACCESS "!!PREFIX!!/etc/ftpaccess"
+! #define _PATH_FTPUSERS "/usr/local/etc/ftpusers"
+ #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
#define _PATH_EXECPATH "/bin/ftp-exec"
-! #define _PATH_PIDNAMES "!!PREFIX!!/daemon/ftpd/ftp.pids-%s"
-! #define _PATH_CVT "!!PREFIX!!/etc/ftpconversions"
+! #define _PATH_PIDNAMES "/var/run/ftp.pids-%s"
+ #define _PATH_CVT "/usr/local/etc/ftpconversions"
! #define _PATH_XFERLOG "/var/log/xferlog"
-! #define _PATH_PRIVATE "!!PREFIX!!/etc/ftpgroups"
+! #define _PATH_PRIVATE "/usr/local/etc/ftpgroups"
#ifndef _PATH_UTMP
- #define _PATH_UTMP "/etc/utmp"
-***************
-*** 47,52 ****
- #define _PATH_DEVNULL "/dev/null"
-
- #ifdef HOST_ACCESS
-! #define _PATH_FTPHOSTS "/usr/local/etc/ftphosts"
+! #define _PATH_UTMP "/var/run/utmp"
+! #define _PATH_WTMP "/var/log/wtmp"
+! #define _PATH_LASTLOG "/var/log/lastlog"
#endif
---- 47,53 ----
- #define _PATH_DEVNULL "/dev/null"
+ #define _PATH_BSHELL "/bin/sh"
+***************
+*** 48,52 ****
+--- 48,53 ----
#ifdef HOST_ACCESS
-! #define _PATH_FTPHOSTS "!!PREFIX!!/etc/ftphosts"
-! #else
+ #define _PATH_FTPHOSTS "/usr/local/etc/ftphosts"
++ #else
#endif
diff --git a/ftp/wu-ftpd/pkg-plist b/ftp/wu-ftpd/pkg-plist
index 067ff00..e0352b9 100644
--- a/ftp/wu-ftpd/pkg-plist
+++ b/ftp/wu-ftpd/pkg-plist
@@ -1,5 +1,4 @@
-@cwd /usr/local
-etc/ftpd
+libexec/ftpd
man/man1/ftpcount.1.gz
man/man1/ftpwho.1.gz
man/man5/ftpaccess.5.gz
OpenPOWER on IntegriCloud