bftpd: 2.3 -> 2.9 fixes bug 584

5 files changed, 13 insertions, 92 deletions

diff --git a/bftpd/.footprint b/bftpd/.footprint
index 34ad87d03..4868eb64d 100644
--- a/bftpd/.footprint
+++ b/bftpd/.footprint
@@ -11,6 +11,6 @@ drwxr-xr-x	root/root	usr/sbin/
 lrwxrwxrwx	root/root	usr/sbin/in.ftpd -> bftpd
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
--rw-r--r--	root/root	var/log/bftpd (EMPTY)
+-rw-r--r--	root/root	var/log/bftpd.log (EMPTY)
 drwxr-xr-x	root/root	var/run/
--rw-r--r--	root/root	var/run/bftpdutmp (EMPTY)
+drwxr-xr-x	root/root	var/run/bftpd/
diff --git a/bftpd/.md5sum b/bftpd/.md5sum
index bf12631df..e0215b1fa 100644
--- a/bftpd/.md5sum
+++ b/bftpd/.md5sum
@@ -1,4 +1,2 @@
-4ab1eb33135fa5eaaf050e6d3dd0b319  bftpd-2.3.tar.gz
-e1376d3d7827aae9f1383ec870d8fdd1  bftpd-config.patch
-45e7fb165aa729eb8ff401e847c07cde  bftpd-destdir.patch
+45f40a6d47d9075eec2a09071dbe176b  bftpd-2.9.tar.gz
 594cb67d469eedb55b268c9922a0dfcd  ftpd
diff --git a/bftpd/Pkgfile b/bftpd/Pkgfile
index bdaa68942..be3b4cd17 100644
--- a/bftpd/Pkgfile
+++ b/bftpd/Pkgfile
@@ -4,20 +4,22 @@
 # Packager: Simone Rota, sip at crux dot nu
 
 name=bftpd
-version=2.3
+version=2.9
 release=1
 source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
-	bftpd-config.patch bftpd-destdir.patch ftpd)
+	ftpd)
 
 build () {
 	cd $name
-	patch -p1 -i ../bftpd-config.patch
-	patch -p1 -i ../bftpd-destdir.patch
-	./configure --prefix=/usr --enable-libz
+
+	./configure \
+		--prefix=/usr \
+		--enable-libz
+
 	make
-	mkdir -p $PKG/usr/sbin $PKG/usr/man/man8 $PKG/etc $PKG/etc/rc.d
+	install -d $PKG/usr/sbin $PKG/usr/man/man8 $PKG/etc $PKG/etc/rc.d
 	make DESTDIR=$PKG install
-	install -D -m 755 ../ftpd $PKG/etc/rc.d/ftpd
-	chmod 600 $PKG/etc/bftpd.conf
+	install -D -m 0755 $SRC/ftpd $PKG/etc/rc.d/ftpd
+	chmod 0600 $PKG/etc/bftpd.conf
 	ln -sf bftpd $PKG/usr/sbin/in.ftpd
 }
diff --git a/bftpd/bftpd-config.patch b/bftpd/bftpd-config.patch
deleted file mode 100644
index 1ab590b27..000000000
--- a/bftpd/bftpd-config.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur bftpd-1.3.orig/bftpd.conf bftpd-1.3/bftpd.conf
---- bftpd-1.3.orig/bftpd.conf	2006-03-10 01:53:52.000000000 +0100
-+++ bftpd-1.3/bftpd.conf	2006-03-30 20:23:32.000000000 +0200
-@@ -1,5 +1,6 @@
--#Configuration file for bftpd.
--#The given values are only examples, modify this file for your own needs.
-+#
-+# /etc/bftpd.conf: bftpd(8) configuration
-+#
- 
- global {
- 
-@@ -53,7 +54,7 @@
-   #Note that the directory in which the file resides must already exist.
-   #Set the option to "" if you do not want that. This is discouraged for normal
-   #use, but can be helpful if you want to create a boot floppy or something.
--  PATH_BFTPDUTMP="/var/run/bftpd/bftpdutmp"
-+  PATH_BFTPDUTMP="/var/run/bftpdutmp"
- 
-   #This option controls the buffer size while transferring files.
-   #If you are on a very fast network (fast meaning 100 Mbit/s or more),
-@@ -86,11 +87,11 @@
-   ALLOW_FXP="no"
- 
-   #After how many seconds of idle time should a user be kicked from the server?
--  CONTROL_TIMEOUT="300"
-+  CONTROL_TIMEOUT="0"
- 
-   #After how many seconds of idle time should a user be kicked from the server
-   #during a file transfer?
--  DATA_TIMEOUT="30"
-+  DATA_TIMEOUT="60"
- 
-   #Use Ratio if you want the client to send a file before he can get a file.
-   #Usage: RATIO=send/receive or RATIO=none. Example: RATIO=2/1 lets the client
-@@ -106,7 +107,7 @@
- 
-   #Name of the log file. Say "syslog" to log into syslog.
-   #Say "" for no logging.
--  LOGFILE="/var/log/bftpd.log"
-+  LOGFILE="/var/log/bftpd"
- 
-   #Use %v for version, %h for the server FQDN and %i for the server IP address.
-   # Note: If you use the "%h" option and you do an inital CHROOT, then
-@@ -205,7 +206,7 @@
- 
- user ftp {
-   #Any password fits.
--  ANONYMOUS_USER="yes"
-+  ANONYMOUS_USER="no"
- }
- 
- user anonymous {
-@@ -214,7 +215,5 @@
- }
- 
- user root {
--  DENY_LOGIN="Root login not allowed."
-+  DENY_LOGIN="root login not allowed."
- }
--
--
diff --git a/bftpd/bftpd-destdir.patch b/bftpd/bftpd-destdir.patch
deleted file mode 100644
index 75b2b874f..000000000
--- a/bftpd/bftpd-destdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur bftpd-1.3.orig/Makefile.in bftpd-1.3/Makefile.in
---- bftpd-1.3.orig/Makefile.in	2006-03-26 21:58:51.000000000 +0200
-+++ bftpd-1.3/Makefile.in	2006-03-30 20:12:52.000000000 +0200
-@@ -30,10 +30,9 @@
- 	$(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8
- 	[ -f $(DESTDIR)/etc/bftpd.conf ] || \
- 		$(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc
--	touch /var/log/bftpd.log
--	chmod 644 /var/log/bftpd.log
--	mkdir -p /var/run/bftpd
--	chmod 755 /var/run/bftpd
-+	mkdir -p $(DESTDIR)/var/{log,run}
-+	touch $(DESTDIR)/var/{log/bftpd,run/bftpdutmp}
-+	chmod 644 $(DESTDIR)/var/{log/bftpd,run/bftpdutmp}
- 
- clean distclean:
- 	rm -f *~ $(OBJS) bftpd mksources.finished