bftpd: updated to 1.3 (thanks to Mark rosenstand)

5 files changed, 44 insertions, 33 deletions

diff --git a/bftpd/.md5sum b/bftpd/.md5sum
index 195e69bf6..d789c6a9c 100644
--- a/bftpd/.md5sum
+++ b/bftpd/.md5sum
@@ -1,3 +1,4 @@
-0c35b6eb9ed83cd309fee096ca92b4d6  bftpd-1.0.24.patch
-74b1c2bad8fe85d78c8fa67cbf135bed  bftpd-1.0.24.tar.gz
-a6a2a3522075a9453413d97e168c9a09  ftpd
+e1376d3d7827aae9f1383ec870d8fdd1  bftpd-1.3-config.patch
+45e7fb165aa729eb8ff401e847c07cde  bftpd-1.3-destdir.patch
+71f43622611615fffc87cbd160cca85e  bftpd-1.3.tar.gz
+594cb67d469eedb55b268c9922a0dfcd  ftpd
diff --git a/bftpd/Pkgfile b/bftpd/Pkgfile
index 5d1fe67bd..b3e6189b1 100644
--- a/bftpd/Pkgfile
+++ b/bftpd/Pkgfile
@@ -3,14 +3,15 @@
 # Maintainer:  Per Lidén <per@fukt.bth.se>
 
 name=bftpd
-version=1.0.24
-release=3
-source=(http://bftpd.sourceforge.net/downloads/src/$name-$version.tar.gz \
-	$name-$version.patch ftpd)
+version=1.3
+release=1
+source=(http://bftpd.sourceforge.net/downloads/src/bftpd-$version.tar.gz \
+	bftpd-$version-config.patch bftpd-$version-destdir.patch ftpd)
 
 build () {
     cd $name-$version
-    patch -p1 < ../$name-$version.patch
+    patch -p1 -i ../bftpd-$version-config.patch
+    patch -p1 -i ../bftpd-$version-destdir.patch
     ./configure --prefix=/usr --enable-libz
     make
     mkdir -p $PKG/usr/sbin $PKG/usr/man/man8 $PKG/etc $PKG/etc/rc.d
diff --git a/bftpd/bftpd-1.0.24.patch b/bftpd/bftpd-1.3-config.patch
index cc987e41a..1ab590b27 100644
--- a/bftpd/bftpd-1.0.24.patch
+++ b/bftpd/bftpd-1.3-config.patch
@@ -1,23 +1,6 @@
-diff -ru bftpd-1.0.24/Makefile.in bftpd-1.0.24-new/Makefile.in
---- bftpd-1.0.24/Makefile.in	2003-05-09 23:47:48.000000000 +0200
-+++ bftpd-1.0.24-new/Makefile.in	2003-05-11 12:20:20.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
-diff -ru bftpd-1.0.24/bftpd.conf bftpd-1.0.24-new/bftpd.conf
---- bftpd-1.0.24/bftpd.conf	2003-05-09 23:47:48.000000000 +0200
-+++ bftpd-1.0.24-new/bftpd.conf	2003-05-11 12:23:14.000000000 +0200
+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.
@@ -36,7 +19,7 @@ diff -ru bftpd-1.0.24/bftpd.conf bftpd-1.0.24-new/bftpd.conf
  
    #This option controls the buffer size while transferring files.
    #If you are on a very fast network (fast meaning 100 Mbit/s or more),
-@@ -70,11 +71,11 @@
+@@ -86,11 +87,11 @@
    ALLOW_FXP="no"
  
    #After how many seconds of idle time should a user be kicked from the server?
@@ -50,7 +33,7 @@ diff -ru bftpd-1.0.24/bftpd.conf bftpd-1.0.24-new/bftpd.conf
  
    #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
-@@ -90,7 +91,7 @@
+@@ -106,7 +107,7 @@
  
    #Name of the log file. Say "syslog" to log into syslog.
    #Say "" for no logging.
@@ -58,8 +41,8 @@ diff -ru bftpd-1.0.24/bftpd.conf bftpd-1.0.24-new/bftpd.conf
 +  LOGFILE="/var/log/bftpd"
  
    #Use %v for version, %h for the server FQDN and %i for the server IP address.
-   HELLO_STRING="bftpd %v at %i ready."
-@@ -171,7 +172,7 @@
+   # Note: If you use the "%h" option and you do an inital CHROOT, then
+@@ -205,7 +206,7 @@
  
  user ftp {
    #Any password fits.
@@ -68,3 +51,12 @@ diff -ru bftpd-1.0.24/bftpd.conf bftpd-1.0.24-new/bftpd.conf
  }
  
  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-1.3-destdir.patch b/bftpd/bftpd-1.3-destdir.patch
new file mode 100644
index 000000000..75b2b874f
--- /dev/null
+++ b/bftpd/bftpd-1.3-destdir.patch
@@ -0,0 +1,17 @@
+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
diff --git a/bftpd/ftpd b/bftpd/ftpd
index 9556ba785..cc22cd7eb 100755
--- a/bftpd/ftpd
+++ b/bftpd/ftpd
@@ -8,7 +8,7 @@ start)
 	/usr/sbin/bftpd -d
 	;;
 stop)
-	killall -q /usr/sbin/bftpd
+	killall -q bftpd
 	;;
 restart)
 	$0 stop