commit 7e53e02d385f7e333c35387bb23a3c61c3be3853 Author: Simone Rota <sip@crux.nu> Date: Mon Nov 27 07:08:19 2006 +0100 bftpd: updated to 1.6 Useless update, the only change in upstream is the addition of Polish docs. diff --git a/bftpd/.md5sum b/bftpd/.md5sum index 43173d9..f1c1664 100644 --- a/bftpd/.md5sum +++ b/bftpd/.md5sum @@ -1,4 +1,4 @@ -e1376d3d7827aae9f1383ec870d8fdd1 bftpd-1.5-config.patch -45e7fb165aa729eb8ff401e847c07cde bftpd-1.5-destdir.patch -52930d87091ea68184bf575ba37f11b1 bftpd-1.5.tar.gz +e1376d3d7827aae9f1383ec870d8fdd1 bftpd-1.6-config.patch +45e7fb165aa729eb8ff401e847c07cde bftpd-1.6-destdir.patch +203ebbe285857a4b001d4a9872cffce4 bftpd-1.6.tar.gz 594cb67d469eedb55b268c9922a0dfcd ftpd diff --git a/bftpd/Pkgfile b/bftpd/Pkgfile index 2add30a..09715b9 100644 --- a/bftpd/Pkgfile +++ b/bftpd/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Simone Rota, sip at crux dot nu name=bftpd -version=1.5 +version=1.6 release=1 source=(http://bftpd.sourceforge.net/downloads/src/bftpd-$version.tar.gz \ bftpd-$version-config.patch bftpd-$version-destdir.patch ftpd) diff --git a/bftpd/bftpd-1.5-config.patch b/bftpd/bftpd-1.5-config.patch deleted file mode 100644 index 1ab590b..0000000 --- a/bftpd/bftpd-1.5-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-1.5-destdir.patch b/bftpd/bftpd-1.5-destdir.patch deleted file mode 100644 index 75b2b87..0000000 --- a/bftpd/bftpd-1.5-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 diff --git a/bftpd/bftpd-1.6-config.patch b/bftpd/bftpd-1.6-config.patch new file mode 100644 index 0000000..1ab590b --- /dev/null +++ b/bftpd/bftpd-1.6-config.patch @@ -0,0 +1,62 @@ +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-1.6-destdir.patch b/bftpd/bftpd-1.6-destdir.patch new file mode 100644 index 0000000..75b2b87 --- /dev/null +++ b/bftpd/bftpd-1.6-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