[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc4-112-g7819c45

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 0d56a236f0de36bc65b99e371a944dbf58c8c978
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Feb 6 16:42:32 2014 +0100

    Chainging statedir to /run

diff --git a/debian/changelog b/debian/changelog
index cb63e0e..54f87fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proftpd-dfsg (1.3.5~rc4-2) UNRELEASED; urgency=medium
+
+  * Now using /run instead of /var/runi for state directory.
+    (closes: #699798)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 06 Feb 2014 16:41:26 +0100
+
 proftpd-dfsg (1.3.5~rc4-1) unstable; urgency=low
 
   * New upstream pre-release, with fix for CVE-2013-4359 aka proftpd#3973.
diff --git a/debian/proftpd-basic.init b/debian/proftpd-basic.init
index 7b8cfb6..eb3f6fc 100755
--- a/debian/proftpd-basic.init
+++ b/debian/proftpd-basic.init
@@ -27,7 +27,7 @@ CONFIG_FILE=/etc/proftpd/proftpd.conf
 PIDFILE=`grep -i 'pidfile' $CONFIG_FILE|sed -e 's/pidfile[\t ]\+//i'`
 if [ "x$PIDFILE" = "x" ];
 then
-	PIDFILE=/var/run/proftpd.pid
+	PIDFILE=/run/proftpd.pid
 fi
 
 # Read config (will override defaults)
@@ -67,7 +67,7 @@ fi
 
 # /var/run could be on a tmpfs
 
-[ ! -d /var/run/proftpd ] && mkdir /var/run/proftpd
+[ ! -d /run/proftpd ] && mkdir /run/proftpd
 
 inetd_check()
 {
diff --git a/debian/proftpd-basic.postinst b/debian/proftpd-basic.postinst
index af36eb2..ed4ef10 100644
--- a/debian/proftpd-basic.postinst
+++ b/debian/proftpd-basic.postinst
@@ -39,7 +39,9 @@ add_sysuser()
 {
 	if ! grep -q "^proftpd:" /etc/passwd
 	then
-		adduser --system --disabled-login --no-create-home --home /var/run/proftpd proftpd || true
+		adduser --system --disabled-login --no-create-home --home /run/proftpd proftpd || true
+	else
+		usermod --home=/run/proftpd || true
 	fi
 }
 
@@ -61,7 +63,7 @@ tcpwin_options()
 scoreboard()
 {
     if [ -f $CONF_NEW ] ; then
-        sed -i -e "s/\(scoreboardpath.*\)/#\n#ScoreboardPath is deprecated in 1.2.9, use ScoreboardFile instead\n#\1\n#\n#ScoreboardFile\t\/var\/run\/proftpd\/proftpd.scoreboard\n#/i" \
+        sed -i -e "s/\(scoreboardpath.*\)/#\n#ScoreboardPath is deprecated in 1.2.9, use ScoreboardFile instead\n#\1\n#\n#ScoreboardFile\t\/run\/proftpd\/proftpd.scoreboard\n#/i" \
                                                 $CONF_NEW 
     fi
 }
@@ -195,7 +197,7 @@ if [ "$1" = "configure" ]; then
     db_stop
 
     # clean run files (pidfile and scoreboard)
-    rm -f /var/run/proftpd/proftpd* /var/run/proftpd.pid 
+    rm -f /run/proftpd/proftpd* /run/proftpd.pid 
 
 fi
 
diff --git a/debian/proftpd-basic.preinst b/debian/proftpd-basic.preinst
index efaa702..5559210 100644
--- a/debian/proftpd-basic.preinst
+++ b/debian/proftpd-basic.preinst
@@ -24,7 +24,7 @@ if [ "$1" = "upgrade" ]; then
                         pkill proftpd
                         sleep 2
                 fi
-                rm -f /var/run/proftpd/proftpd.scoreboard
+                rm -f /run/proftpd/proftpd.scoreboard
          fi
 fi
 
diff --git a/debian/rules b/debian/rules
index bc78758..2c6b6a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,14 +32,13 @@ ifeq (,$(DEB_BUILD_GNU_TYPE))
   include debian/scripts/dpkg-arch.mk
 endif
 
-# Note: use --localstatedir=/var/run/proftpd for > 1.3.2
 DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq:
 DSOMODS2 = mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap:mod_wrap2:mod_wrap2_file:
 DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion:mod_tls_memcache:
 DSOMODS4 = mod_geoip:mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession
 CONF_ARGS := --prefix=/usr \
 	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
-	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/var/run --libexecdir=/usr/lib/$(NAME) \
+	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/run --libexecdir=/usr/lib/$(NAME) \
 	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --with-modules=mod_readme \
 	     --enable-ipv6 --enable-nls --enable-memcache --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT)
 

-- 
ProFTPD core package