diff -u pure-ftpd-1.0.21/debian/rules pure-ftpd-1.0.21/debian/rules --- pure-ftpd-1.0.21/debian/rules +++ pure-ftpd-1.0.21/debian/rules @@ -9,7 +9,7 @@ export DH_COMPAT=3 cfgflags=--prefix=/usr --mandir='$${prefix}'/share/man --sysconfdir=/etc/pure-ftpd CFLAGS=-DMAX_USER_LENGTH=128U -optflags=--with-everything --with-largefile --with-pam --with-privsep --with-tls +optflags=--with-everything --with-largefile --with-pam --with-privsep --with-rfc2640 --with-tls bin=pure-pw pure-statsdecode pure-pwconvert sbin=pure-authd pure-ftpwho pure-uploadscript pure-quotacheck pure-ftpd pure-mrtginfo diff -u pure-ftpd-1.0.21/debian/control pure-ftpd-1.0.21/debian/control --- pure-ftpd-1.0.21/debian/control +++ pure-ftpd-1.0.21/debian/control @@ -1,7 +1,8 @@ Source: pure-ftpd Section: net Priority: optional -Maintainer: Stefan Hornburg (Racke) +Maintainer: Ubuntu MOTU Developers +Original-Maintainer: Stefan Hornburg (Racke) Build-Depends: debhelper (>= 4.1.16), libpam-dev, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libldap2-dev, libmysqlclient-dev | libmysqlclient15-dev, libpq-dev, libssl-dev, openssl (>= 0.9.6), po-debconf Build-Conflicts: libmysqlclient10-dev Standards-Version: 3.5.2 @@ -22,6 +23,7 @@ Provides: ftp-server Conflicts: ftp-server Replaces: ftp-server +Suggests: netkit-inetd | openbsd-inetd | xinetd Description: Pure-FTPd FTP server Pure-FTPd is a fast, production-quality, standards-conformant FTP server based upon Troll-FTPd. Features include chrooted home directories, diff -u pure-ftpd-1.0.21/debian/pure-ftpd-wrapper pure-ftpd-1.0.21/debian/pure-ftpd-wrapper --- pure-ftpd-1.0.21/debian/pure-ftpd-wrapper +++ pure-ftpd-1.0.21/debian/pure-ftpd-wrapper @@ -91,6 +91,8 @@ 'UserBandwidth' => ['-T %s', \&parse_number_1_2], 'UserRatio' => ['-Q %d:%d', \&parse_number_2], 'VerboseLog' => ['-d'], + 'FsCharset' => ['-8 %s', \&parse_string], + 'ClientCharset' => ['-9 %s', \&parse_string], ); my %authconf = ('ExtAuth' => ['extauth:%s', \&parse_sockname], diff -u pure-ftpd-1.0.21/debian/pure-ftpd.init.d pure-ftpd-1.0.21/debian/pure-ftpd.init.d --- pure-ftpd-1.0.21/debian/pure-ftpd.init.d +++ pure-ftpd-1.0.21/debian/pure-ftpd.init.d @@ -18,6 +18,8 @@ UDDESC="ftp upload handler" WRAPPER=/usr/sbin/pure-ftpd-wrapper +PIDFILE=/var/run/pure-ftpd/pure-ftpd.pid + # try to figure with suffix this script is called, # $0 might be a symlink pointing to this script if [ -h $0 ]; then @@ -50,6 +52,10 @@ set -e +if [ ! -e `dirname $PIDFILE` ];then + mkdir `dirname $PIDFILE` +fi + start_uploadscript() { if [ "$UPLOADSCRIPT" -a "$STANDALONE_OR_INETD" != inetd ] && \ egrep -i '^[ ]*(yes|1|on)[ ]*' /etc/pure-ftpd/conf/CallUploadScript > /dev/null 2>&1 @@ -69,7 +75,7 @@ start) test "$STANDALONE_OR_INETD" = standalone || exit 0 echo -n "Starting $DESC: " - start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile /var/run/pure-ftpd/pure-ftpd.pid \ + start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile "$PIFDILE" \ --exec $WRAPPER -- $SUFFIX start_uploadscript Starting ;; @@ -84,7 +90,7 @@ test "$STANDALONE_OR_INETD" = standalone || exit 0 echo -n "Restarting $DESC: " start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo \ - --pidfile /var/run/pure-ftpd/pure-ftpd.pid + --pidfile "$PIDFILE" start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo --exec $UPLOADDAEMON sleep 1 start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile \ diff -u pure-ftpd-1.0.21/debian/changelog pure-ftpd-1.0.21/debian/changelog --- pure-ftpd-1.0.21/debian/changelog +++ pure-ftpd-1.0.21/debian/changelog @@ -1,3 +1,16 @@ +pure-ftpd (1.0.21-11.2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #239732), remaining changes: + - added --with-rfc2640 to configure options. + - added suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - changed default answer for debconf question to standalone, not inetd. + - create /var/run/ directory if necessary in pure-ftpd.init.d + - adding filesystemencoding and clientencoding options in + debian/pure-ftpd.wrapper + - modified maintainer values to match debian-maintainer-field spec. + + -- Thierry Carrez Fri, 13 Jun 2008 14:18:37 +0200 + pure-ftpd (1.0.21-11.2) unstable; urgency=low * Non-maintainer upload to solve release goal. @@ -5,6 +18,25 @@ -- Petter Reinholdtsen Wed, 19 Mar 2008 23:53:07 +0100 +pure-ftpd (1.0.21-11.1ubuntu2) hardy; urgency=low + + * Rebuild for the libldap-2.3-0 -> libldap-2.4-2 transistion. + + -- Steve Kowalik Thu, 24 Jan 2008 23:54:15 +1100 + +pure-ftpd (1.0.21-11.1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - added --with-rfc2640 to configure options. + - added suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - changed default answer for debconf question to standalone, not inetd. + - create /var/run/ directory if necessary in pure-ftpd.init.d + - adding filesystemencoding and clientencoding options in + debian/pure-ftpd.wrapper + - modified maintainer values to match debian-maintainer-field spec. + + -- Lionel Porcheron Tue, 23 Oct 2007 22:26:09 +0200 + pure-ftpd (1.0.21-11.1) unstable; urgency=low * Non-maintainer upload. @@ -15,6 +47,19 @@ -- Emmanuel Bouthenot Sat, 29 Sep 2007 14:16:16 +0200 +pure-ftpd (1.0.21-11ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - added --with-rfc2640 to configure options. + - added suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - changed default answer for debconf question to standalone, not inetd. + - create /var/run/ directory if necessary in pure-ftpd.init.d + - adding filesystemencoding and clientencoding options in + debian/pure-ftpd.wrapper + - modified maintainer values to match debian-maintainer-field spec. + + -- Lionel Porcheron Fri, 22 Jun 2007 00:01:20 +0200 + pure-ftpd (1.0.21-11) unstable; urgency=low * Portuguese translation of debconf templates added (Closes: #429291, @@ -24,6 +69,19 @@ -- Stefan Hornburg (Racke) Thu, 21 Jun 2007 21:32:31 +0200 +pure-ftpd (1.0.21-10ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Added --with-rfc2640 to configure options. + - Added Suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - Changed default answer for debconf question to standalone, not inetd. + - create /var/run/ directory if necessary in pure-ftpd.init.d + - adding FileSystemEncoding and ClientEncoding options in + debian/pure-ftpd.wrapper + - Modified Maintainer values to match Debian-Maintainer-Field spec. + + -- Lionel Porcheron Sat, 19 May 2007 12:15:32 +0200 + pure-ftpd (1.0.21-10) unstable; urgency=low * call update-inetd conditionally in postrm (Closes: #417036, thanks to @@ -31,6 +89,20 @@ -- Stefan Hornburg (Racke) Mon, 14 May 2007 22:25:57 +0200 +pure-ftpd (1.0.21-9ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Added --with-rfc2640 to configure options. + - Added Suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - Changed default answer for debconf question to standalone, not inetd. + - Add update-inetd to pure-ftpd-common's dependencies + - create /var/run/ directory if necessary in pure-ftpd.init.d + - adding FileSystemEncoding and ClientEncoding options in + debian/pure-ftpd.wrapper + * Modified Maintainer values to match Debian-Maintainer-Field spec. + + -- Andrea Veri Sun, 13 May 2007 04:03:39 +0200 + pure-ftpd (1.0.21-9) unstable; urgency=low * Italian translation of debconf templates added (Closes: #412225, @@ -41,6 +113,20 @@ -- Stefan Hornburg (Racke) Sat, 12 May 2007 15:59:41 +0200 +pure-ftpd (1.0.21-8ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Added --with-rfc2640 to configure options. + - Added Suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - Changed default answer for debconf question to standalone, not inetd. + - Add update-inetd to pure-ftpd-common's dependencies + - create /var/run/ directory if necessary in pure-ftpd.init.d + - adding FileSystemEncoding and ClientEncoding options in + debian/pure-ftpd.wrapper + * Modified Maintainer values to match Debian-Maintainer-Field spec. + + -- Michael Bienia Wed, 7 Feb 2007 00:22:15 +0100 + pure-ftpd (1.0.21-8) unstable; urgency=high * don't call db_stop at all in the postinst, fixing interaction problems @@ -50,12 +136,36 @@ -- Stefan Hornburg (Racke) Tue, 6 Feb 2007 13:20:28 +0100 +pure-ftpd (1.0.21-7ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Added --with-rfc2640 to configure options. + - Added Suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - Changed default answer for debconf question to standalone, not inetd. + - Add update-inetd to pure-ftpd-common's dependencies + * create /var/run/ directory if necessary in pure-ftpd.init.d (Closes + Ubuntu #71401) + * adding FileSystemEncoding and ClientEncoding options in + debian/pure-ftpd.wrapper (Closes Ubuntu #78806 and #41059) + + -- Lionel Porcheron Sat, 27 Jan 2007 22:12:15 +0100 + pure-ftpd (1.0.21-7) unstable; urgency=medium * avoid builds with ancient libmysqlclient10 -- Stefan Hornburg (Racke) Fri, 26 Jan 2007 12:11:14 +0100 +pure-ftpd (1.0.21-6ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Added --with-rfc2640 to configure options. + - Added Suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - Changed default answer for debconf question to standalone, not inetd. + - Add update-inetd to pure-ftpd-common's dependencies + + -- Lionel Porcheron Sun, 14 Jan 2007 21:21:33 +0100 + pure-ftpd (1.0.21-6) unstable; urgency=medium * Japanese translation of debconf templates updated (Closes: #394518, @@ -65,6 +175,22 @@ -- Stefan Hornburg (Racke) Wed, 10 Jan 2007 10:03:23 +0100 +pure-ftpd (1.0.21-5ubuntu2) feisty; urgency=low + + * debian/control: Add update-inetd to pure-ftpd-common's dependencies + (Closes Ubuntu: #76136). + + -- Lionel Porcheron Sun, 17 Dec 2006 14:01:12 +0100 + +pure-ftpd (1.0.21-5ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Added --with-rfc2640 to configure options. + - Added Suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + - Changed default answer for debconf question to standalone, not inetd. + + -- William Alexander Grant Sun, 3 Sep 2006 10:11:43 +1000 + pure-ftpd (1.0.21-5) unstable; urgency=low * exclude Linux specific package libcap-dev from Build-Depends for other @@ -98,6 +224,42 @@ -- Stefan Hornburg (Racke) Sun, 9 Apr 2006 21:04:52 +0200 +pure-ftpd (1.0.21-1ubuntu4) dapper; urgency=low + + * debian/control + + Build with libmysqlclient15-dev. (Closes: Malone #45046) + + -- Chuck Short Wed, 17 May 2006 10:39:21 -0400 + +pure-ftpd (1.0.21-1ubuntu3) dapper; urgency=low + + * debian/rules + + Added --with-rfc2640 to configure options. (Closes: Malone #40525) + + -- Chuck Short Sun, 23 Apr 2006 14:46:58 -0400 + +pure-ftpd (1.0.21-1ubuntu2) dapper; urgency=low + + * Rebuild against the new libmysqlclient15off with correct symbols. + + -- Adam Conrad Thu, 6 Apr 2006 15:12:03 +1000 + +pure-ftpd (1.0.21-1ubuntu1) dapper; urgency=low + + * Change the default answer for the debconf question that ask whether you + want pure-ftpd start via inetd or standalone to standalone. (Closes: + M#3172) + * Add Suggests: netkit-inetd | openbsd-inetd | xinetd to pure-ftpd. + + -- Reinhard Tartler Sat, 1 Apr 2006 15:26:55 +0200 + +pure-ftpd (1.0.21-1build1) dapper; urgency=low + + * Fake sync, Upstream Version Freeze exception by MOTU-UVF (Malone: #34346), + thanks Bart Verwilst for working on this. + + -- Daniel Holbach Fri, 24 Mar 2006 11:45:10 +0100 + pure-ftpd (1.0.21-1) unstable; urgency=low * new upstream release (Closes: #295347), including fix for wrong report @@ -357,0 +520 @@ + diff -u pure-ftpd-1.0.21/debian/pure-ftpd-common.templates pure-ftpd-1.0.21/debian/pure-ftpd-common.templates --- pure-ftpd-1.0.21/debian/pure-ftpd-common.templates +++ pure-ftpd-1.0.21/debian/pure-ftpd-common.templates @@ -1,7 +1,7 @@ Template: pure-ftpd/standalone-or-inetd Type: select _Choices: inetd, standalone -Default: inetd +Default: standalone _Description: Run pure-ftpd from inetd or as a standalone server: Pure-ftpd can be run from inetd or as a standalone daemon. Using inetd is a suitable option for small ftp servers because the inetd super-server