packages: policyd/config.patch, policyd/policyd.init, policyd/policyd.spec ...

[glen]

Author: glen                         Date: Thu Jan  6 14:34:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move pidfile to private dir, or restart fails to unlink it on shutdown

---- Files affected:
packages/policyd:
   config.patch (1.1 -> 1.2) , policyd.init (1.14 -> 1.15) , policyd.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/policyd/config.patch
diff -u packages/policyd/config.patch:1.1 packages/policyd/config.patch:1.2
--- packages/policyd/config.patch:1.1	Mon Jan  3 14:30:29 2011
+++ packages/policyd/config.patch	Thu Jan  6 15:34:53 2011
@@ -1,6 +1,6 @@
---- cluebringer-2.0.10/cluebringer.conf~	2009-11-24 12:59:24.000000000 +0200
-+++ cluebringer-2.0.10/cluebringer.conf	2011-01-03 15:27:44.487256867 +0200
-@@ -20,8 +20,8 @@
+--- cluebringer-2.0.10/cluebringer.conf	2011-01-03 15:27:44.487256867 +0200
++++ cluebringer-2.0.10/cluebringer.conf	2011-01-06 16:28:24.957854449 +0200
+@@ -20,11 +20,11 @@
  EOT
  
  # User to run this daemon as
@@ -10,4 +10,8 @@
 +group=policyd
  
  # Filename to store pid of parent process
- #pid_file=/var/run/cbpolicyd.pid
+-#pid_file=/var/run/cbpolicyd.pid
++pid_file=/var/run/policyd/cbpolicyd.pid
+ 
+ # Uncommenting the below option will prevent cbpolicyd going into the background
+ #background=no

================================================================
Index: packages/policyd/policyd.init
diff -u packages/policyd/policyd.init:1.14 packages/policyd/policyd.init:1.15
--- packages/policyd/policyd.init:1.14	Mon Jan  3 14:36:19 2011
+++ packages/policyd/policyd.init	Thu Jan  6 15:34:53 2011
@@ -7,10 +7,8 @@
 #
 # description:	Policyd is an anti-spam plugin for Postfix.
 #
-
-# pidfile:      /var/run/policyd.pid
-# config:       /etc/policyd/policyd.conf
-
+# pidfile:      /var/run/policyd/policyd.pid
+# config:       /etc/policyd/cluebringer.conf
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -24,6 +22,8 @@
 	. /etc/sysconfig/policyd
 fi
 
+pidfile="/var/run/policyd/policyd.pid"
+
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
@@ -55,7 +55,7 @@
 	fi
 
 	msg_stopping "PolicyD"
-	killproc cbpolicyd
+	killproc --pidfile $pidfile cbpolicyd
 	rm -f /var/lock/subsys/policyd
 }
 
@@ -90,7 +90,7 @@
 	condrestart 7
 	;;
   status)
-	status policyd cbpolicyd
+	status --pidfile $pidfile policyd cbpolicyd
 	exit $?
 	;;
   *)

================================================================
Index: packages/policyd/policyd.spec
diff -u packages/policyd/policyd.spec:1.17 packages/policyd/policyd.spec:1.18
--- packages/policyd/policyd.spec:1.17	Mon Jan  3 14:44:56 2011
+++ packages/policyd/policyd.spec	Thu Jan  6 15:34:53 2011
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Policyd - wtyczka antyspamowa dla Postfiksa
 Name:		policyd
 Version:	2.0.10
-Release:	0.8
+Release:	0.10
 License:	GPL v2
 Group:		Networking
 Source0:	http://downloads.sourceforge.net/policyd/cluebringer-%{version}.tar.bz2
@@ -97,7 +97,7 @@
 install -d $RPM_BUILD_ROOT%{perl_vendorlib}
 cp -a cbp $RPM_BUILD_ROOT%{perl_vendorlib}
 # cbpolicyd
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/policyd,%{_sbindir},/etc/{rc.d/init.d,sysconfig}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/policyd,%{_sbindir},/etc/{rc.d/init.d,sysconfig},/var/run/%{name}}
 install -p cbpolicyd cbpadmin database/convert-tsql $RPM_BUILD_ROOT%{_sbindir}
 cp -a cluebringer.conf $RPM_BUILD_ROOT%{_sysconfdir}/policyd/cluebringer.conf
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
@@ -165,6 +165,7 @@
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,policyd) %{_sysconfdir}/%{name}/cluebringer.conf
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%dir %attr(775,root,policyd) /var/run/%{name}
 
 %files -n perl-cbp
 %defattr(644,root,root,755)
@@ -184,6 +185,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2011/01/06 14:34:53  glen
+- move pidfile to private dir, or restart fails to unlink it on shutdown
+
 Revision 1.17  2011/01/03 13:44:56  glen
 - webui uses pdo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/policyd/config.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/policyd/policyd.init?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/policyd/policyd.spec?r1=1.17&r2=1.18&f=u