[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110419.29261fb+dfsg-2-3-g6904569

[Julien Valroff]

The following commit has been merged in the master branch:
commit 69045692a5bf34988449ab9ebeb431f7951957c4
Author: Julien Valroff <julien at kirya.net>
Date:   Sat May 14 20:38:16 2011 +0200

    Transition from /var/run to the new toplevel directory /run

diff --git a/debian/changelog b/debian/changelog
index efb0b2e..ebd669d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ dspam (3.9.1~rc1+git20110419.29261fb+dfsg-3) unstable; urgency=low
 
   * Fix typo in libdspam7-drv-pgsql short description (Closes: #626608) 
   * Ensure old conffiles are correctly removed on upgrade (Closes: #626286)
+  * Transition from /var/run to the new toplevel directory /run   
 
- -- Julien Valroff <julien at debian.org>  Sat, 14 May 2011 08:57:43 +0200
+ -- Julien Valroff <julien at debian.org>  Sat, 14 May 2011 20:35:49 +0200
 
 dspam (3.9.1~rc1+git20110419.29261fb+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b19c3e2..508587f 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-dspam/dspam.git;a=summary
 
 Package: dspam
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, procmail | maildrop | courier-maildrop | sensible-mda, lsb-base (>= 3.0-6)
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, procmail | maildrop | courier-maildrop | sensible-mda, lsb-base (>= 3.0-6), initscripts (>= 2.88dsf-13.3)
 Recommends: dspam-doc
 Suggests: clamav-daemon, dspam-webfrontend
 Description: Scalable, fast and statistical anti-spam filter
diff --git a/debian/dspam.init b/debian/dspam.init
index 10641c9..029862d 100644
--- a/debian/dspam.init
+++ b/debian/dspam.init
@@ -20,7 +20,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="DSPAM Statistical anti-spam filter"
 NAME=dspam
 DAEMON=/usr/bin/$NAME
-PIDFILE=/var/run/dspam/$NAME.pid
+PIDFILE=/run/dspam/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 USER=dspam
 
diff --git a/debian/patches/013_var-run-2-run.diff b/debian/patches/013_var-run-2-run.diff
new file mode 100644
index 0000000..bd476c0
--- /dev/null
+++ b/debian/patches/013_var-run-2-run.diff
@@ -0,0 +1,73 @@
+Description: Directly use /run instead of /var/run
+ http://wiki.debian.org/ReleaseGoals/RunDirectory
+Author: Julien Valroff <julien at debian.org>
+Forwarded: not-needed
+
+--- a/doc/postfix.txt
++++ b/doc/postfix.txt
+@@ -34,7 +34,7 @@
+ ServerMode		auto
+ ServerParameters	"--deliver=innocent"
+ ServerIdent		"localhost.localdomain"
+-ServerPID		/var/run/dspam.pid
++ServerPID		/run/dspam.pid
+ ServerDomainSocketPath	"/tmp/dspam.sock"
+ 
+   This will tell DSPAM to listen on /tmp/dspam.sock using the options above.
+@@ -87,7 +87,7 @@
+ 
+   If your Postfix installation is chrooted (as eg. the default Postfix 
+   configuration in Debian GNU/Linux), make sure the socket is located 
+-  within the chroot (eg. /var/spool/postfix/var/run/dspam/dspam.sock).
++  within the chroot (eg. /var/spool/postfix/run/dspam/dspam.sock).
+ 
+   Make sure the user under which dspam runs has write access to the
+   socket directory.
+@@ -96,7 +96,7 @@
+   chrooted (both smtp and lmtp services should be modified as follows:
+ 
+ smtp      inet  n       -       n       -       -        smtpd
+-  -o content_filter=lmtp:unix:/var/run/dspam/dspam.sock
++  -o content_filter=lmtp:unix:/run/dspam/dspam.sock
+ lmtp      inet  n       -       n       -       -        smtpd
+ 
+   The 3rd dash specifies if the process will run chrooted or not.
+--- a/src/dspam.c
++++ b/src/dspam.c
+@@ -4179,7 +4179,7 @@
+ 
+     pidfile = _ds_read_attribute(agent_config, "ServerPID");
+     if ( pidfile == NULL )
+-      pidfile = "/var/run/dspam/dspam.pid";
++      pidfile = "/run/dspam/dspam.pid";
+ 
+     if (pidfile) {
+       FILE *file;
+--- a/src/dspam.conf.in
++++ b/src/dspam.conf.in
+@@ -806,7 +806,7 @@
+ #ServerHost		127.0.0.1
+ #ServerPort		2424
+ #ServerQueueSize	32
+-#ServerPID		/var/run/dspam/dspam.pid
++#ServerPID		/run/dspam/dspam.pid
+ 
+ #
+ # ServerMode specifies the type of LMTP server to start. This can be one of:
+@@ -842,14 +842,14 @@
+ # you are running the client and server on the same machine, as it eliminates
+ # much of the bandwidth overhead.
+ #
+-#ServerDomainSocketPath	"/var/run/dspam/dspam.sock"
++#ServerDomainSocketPath	"/run/dspam/dspam.sock"
+ 
+ #
+ # Client Mode: If you are running DSPAM in client/server mode, uncomment and
+ # set these variables. A ClientHost beginning with a / will be treated as
+ # a domain socket.
+ #
+-#ClientHost	/var/run/dspam/dspam.sock
++#ClientHost	/run/dspam/dspam.sock
+ #ClientIdent	"secret at Relay1"
+ #
+ #ClientHost	127.0.0.1
diff --git a/debian/patches/series b/debian/patches/series
index 7b1e09b..7cb9370 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 010_default-daemon-port.diff
 011_Document-hash-drv-support-daemon.diff
 012_typo-dspam_maintenance.diff
+013_var-run-2-run.diff

-- 
Debian packages for the DSPAM anti-spam filter