--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package wzdftpd
This fixes bug #689906 which made the daemon fail to start after
reboot if /run is a tmpfs.
diff -u wzdftpd-0.8.3/debian/changelog wzdftpd-0.8.3/debian/changelog
--- wzdftpd-0.8.3/debian/changelog
+++ wzdftpd-0.8.3/debian/changelog
@@ -1,3 +1,13 @@
+wzdftpd (0.8.3-6.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Create /var/run/wzdftpd from init script (Closes: #689906)
+ (based on patch by Thomas Goirand)
+ * Fix spelling of 'bandwidth' in description
+ * Remove duplicate upstream changelog
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sat, 13 Oct 2012 11:46:01 +0100
+
wzdftpd (0.8.3-6.1) unstable; urgency=low
* Non-maintainer upload.
diff -u wzdftpd-0.8.3/debian/control wzdftpd-0.8.3/debian/control
--- wzdftpd-0.8.3/debian/control
+++ wzdftpd-0.8.3/debian/control
@@ -27,7 +27,7 @@
implements the lastest RFC extensions to FTP protocol.
.
Features are: flexible user management, acls, virtual users/groups, security,
- speed, bandwith limitation, per command authorization, virtual directories,
+ speed, bandwidth limitation, per command authorization, virtual directories,
dynamic ip changes auto-detection, etc.
.
It includes several authentication backends, is easily scriptable and provides
@@ -43,7 +43,7 @@
implements the lastest RFC extensions to FTP protocol.
.
Features are: flexible user management, acls, virtual users/groups, security,
- speed, bandwith limitation, per command authorization, virtual directories,
+ speed, bandwidth limitation, per command authorization, virtual directories,
dynamic ip changes auto-detection, etc.
.
This package provides the MySQL backend for wzdftpd.
@@ -58,7 +58,7 @@
implements the lastest RFC extensions to FTP protocol.
.
Features are: flexible user management, acls, virtual users/groups, security,
- speed, bandwith limitation, per command authorization, virtual directories,
+ speed, bandwidth limitation, per command authorization, virtual directories,
dynamic ip changes auto-detection, etc.
.
This package provides the PostgreSQL backend for wzdftpd.
@@ -72,7 +72,7 @@
implements the lastest RFC extensions to FTP protocol.
.
Features are: flexible user management, acls, virtual users/groups, security,
- speed, bandwith limitation, per command authorization, virtual directories,
+ speed, bandwidth limitation, per command authorization, virtual directories,
dynamic ip changes auto-detection, etc.
.
This package provides the necessary files to enable zeroconf support in
@@ -87,7 +87,7 @@
implements the lastest RFC extensions to FTP protocol.
.
Features are: flexible user management, acls, virtual users/groups, security,
- speed, bandwith limitation, per command authorization, virtual directories,
+ speed, bandwidth limitation, per command authorization, virtual directories,
dynamic ip changes auto-detection, etc.
.
This package provides the necessary files to run Tcl plugins in wzdftpd,
@@ -102,7 +102,7 @@
implements the lastest RFC extensions to FTP protocol.
.
Features are: flexible user management, acls, virtual users/groups, security,
- speed, bandwith limitation, per command authorization, virtual directories,
+ speed, bandwidth limitation, per command authorization, virtual directories,
dynamic ip changes auto-detection, etc.
.
This package provides the necessary files to run Perl plugins in wzdftpd,
@@ -118,7 +118,7 @@
implements the lastest RFC extensions to FTP protocol.
.
Features are: flexible user management, acls, virtual users/groups, security,
- speed, bandwith limitation, per command authorization, virtual directories,
+ speed, bandwidth limitation, per command authorization, virtual directories,
dynamic ip changes auto-detection, etc.
.
This package provides all needed files to develop extensions for wzdftpd.
diff -u wzdftpd-0.8.3/debian/init.d wzdftpd-0.8.3/debian/init.d
--- wzdftpd-0.8.3/debian/init.d
+++ wzdftpd-0.8.3/debian/init.d
@@ -17,6 +17,7 @@
DAEMON=/usr/sbin/wzdftpd
NAME=wzdftpd
DESC=wzdftpd
+PID_DIR=/var/run/$NAME
test -x $DAEMON || exit 0
@@ -34,6 +35,11 @@
case "$1" in
start)
echo -n "Starting $DESC: "
+ mkdir -p $PID_DIR
+ # the following will be used to run the server as a non-privileged user
+ if id ftp >/dev/null 2>/dev/null; then
+ chown ftp $PID_DIR
+ fi
start-stop-daemon --start --quiet \
--pidfile /var/run/$NAME/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
echo "$NAME."
diff -u wzdftpd-0.8.3/debian/wzdftpd.postrm wzdftpd-0.8.3/debian/wzdftpd.postrm
--- wzdftpd-0.8.3/debian/wzdftpd.postrm
+++ wzdftpd-0.8.3/debian/wzdftpd.postrm
@@ -27,7 +27,7 @@
rm -f /etc/wzdftpd/users /etc/wzdftpd/users.OLD
rm -f /etc/wzdftpd/wzd.cfg
rm -f /etc/wzdftpd/wzd.cfg.wzdftpd-old /etc/wzdftpd/wzd.cfg.wzdftpd-new /etc/wzdftpd/wzd.cfg.dpkg-dist /etc/wzdftpd/wzd.cfg.ucf-dist /etc/wzdftpd/wzd.cfg.ucf-old
-
+ rm -rf /var/run/wzdftpd
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff -u wzdftpd-0.8.3/debian/rules wzdftpd-0.8.3/debian/rules
--- wzdftpd-0.8.3/debian/rules
+++ wzdftpd-0.8.3/debian/rules
@@ -101,6 +101,8 @@
# we don't need those files
rm -f $(CURDIR)/debian/tmp/usr/share/doc/wzdftpd/COPYING
rm -f $(CURDIR)/debian/tmp/usr/share/doc/wzdftpd/INSTALL
+ # dh_installchangelogs will install this as 'changelog'
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/wzdftpd/ChangeLog
mv debian/tmp/usr/etc debian/tmp/
only in patch2:
unchanged:
--- wzdftpd-0.8.3.orig/debian/dirs
+++ wzdftpd-0.8.3/debian/dirs
@@ -4,7 +4,6 @@
etc
usr/share/man/man1
var/log/wzdftpd
-var/run/wzdftpd
usr/lib/wzdftpd/backends
usr/lib/wzdftpd/modules
usr/share/lintian/overrides
only in patch2:
unchanged:
--- wzdftpd-0.8.3.orig/debian/wzdftpd.postinst
+++ wzdftpd-0.8.3/debian/wzdftpd.postinst
@@ -66,18 +66,6 @@
fi
fi
-# the following will be used to run the server as a non-privileged user
-# # extract PID_DIR from config
-# if [ ! -d $PID_DIR ]; then
-# mkdir $PID_DIR
-# fi
- if [ -d $PID_DIR ]; then
- if (id ftp >/dev/null 2>/dev/null) ; then
- chown ftp $PID_DIR
- fi
- fi
-
-
case "$1" in
configure)
--- END ---
unblock wzdftpd/0.8.3-6.2
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable')
Architecture: i386 (x86_64)
Foreign Architectures: amd64
Kernel: Linux 3.2.32-rc1+ (SMP w/2 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- End Message ---