rpms/dkim-milter/devel dkim-milter.spec, 1.9, 1.10 dkim-milter, 1.1, 1.2

[Jim Radford]

Author: radford

Update of /cvs/pkgs/rpms/dkim-milter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8552

Modified Files:
	dkim-milter.spec dkim-milter 
Log Message:
move pid file for better selinux compatibility



Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/dkim-milter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dkim-milter.spec	21 Aug 2009 13:05:15 -0000	1.9
+++ dkim-milter.spec	12 Sep 2009 21:51:05 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           dkim-milter
 Version:        2.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -126,6 +126,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Sat Sep 12 2009 Jim Radford <radford at blackbean.org> - 2.8.3-3
+- init script cleanup to help selinux
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.3-2
 - rebuilt with new openssl
 


Index: dkim-milter
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/dkim-milter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dkim-milter	1 Apr 2008 03:34:38 -0000	1.1
+++ dkim-milter	12 Sep 2009 21:51:05 -0000	1.2
@@ -7,7 +7,7 @@
 # processname: dkim-filter
 # config:      /etc/mail/dkim-milter/dkim-milter.conf
 # config:      /etc/sysconfig/dkim-milter
-# pidfile:     /var/run/dkim-milter.pid
+# pidfile:     /var/run/dkim-milter/dkim-milter.pid
 
 # Source function library.
 . /etc/init.d/functions
@@ -17,7 +17,7 @@ name=dkim-milter
 prog=dkim-filter
 prog_with_path=/usr/sbin/${prog}
 user=${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/${name}/${name}.pid
 config=/etc/mail/${name}/${prog}.conf
 
 SOCKET=local:/var/run/${name}/${name}.sock
@@ -26,8 +26,6 @@ EXTRA_FLAGS=""
 
 start() {
 	echo -n "Starting ${desc} (${prog}): "
-        touch ${pidfile}
-        chown ${user}:${user} ${pidfile}
         daemon --user ${user} ${prog_with_path} -x ${config} -P ${pidfile} -p ${SOCKET} ${EXTRA_FLAGS}
         RETVAL=$?
         echo