rpms/milter-greylist/FC-4 milter-greylist-1.6-sysconf.patch, NONE, 1.1 milter-greylist.spec, 1.5, 1.6

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2444

Modified Files:
	milter-greylist.spec 
Added Files:
	milter-greylist-1.6-sysconf.patch 
Log Message:
- allowed to configure the parameter given to the daemon in an
  /etc/sysconfig/milter-greylist file (bz #162334)
- set user and socketfile in the configfile
- minor specfile cleanups


milter-greylist-1.6-sysconf.patch:

--- NEW FILE milter-greylist-1.6-sysconf.patch ---
2005-12-24 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* rc-redhat.sh.in: allow to override the used options by
	  loading /etc/sysconfig/milter-greylist

--- milter-greylist-1.6/rc-redhat.sh.in.sysconf	2005-12-24 13:14:25.000000000 +0100
+++ milter-greylist-1.6/rc-redhat.sh.in	2005-12-24 13:15:09.000000000 +0100
@@ -16,6 +16,10 @@
 socket="/var/milter-greylist/milter-greylist.sock"
 user="@USER@"
 OPTIONS="-P $pidfile -u $user -p $socket"
+
+f=/etc/sysconfig/milter-greylist
+test ! -e "$f" || . "$f"
+
 RETVAL=0
 prog="Milter-Greylist"
 


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/FC-4/milter-greylist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- milter-greylist.spec	19 May 2005 17:37:44 -0000	1.5
+++ milter-greylist.spec	24 Dec 2005 12:25:06 -0000	1.6
@@ -21,7 +21,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
-Release:	%release_func 3
+Release:	%release_func 4
 License:	BSD w/ advertising
 Group:		System Environment/Daemon
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -29,6 +29,7 @@
 Patch0:		milter-greylist-1.6-rh.patch
 Patch1:		milter-greylist-1.6-group.patch
 Patch2:		milter-greylist-1.4-spfbool.patch
+Patch3:		milter-greylist-1.6-sysconf.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Requires(pre):		fedora-usermgmt
@@ -91,9 +92,12 @@
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .group
 %patch2 -p1 -b .spfbool
+%patch3 -p1 -b .sysconf
 
 perl -pi -e 's!(\$\{INSTALL\}.*\s)(\S+\s*)$!$1\${DESTDIR}$2!' Makefile.in
 perl -pi -e 's!--rpath!--XXXX!g' configure
+sed  -i  -e 's!^\#user .*!user "%username"!;
+             s!^\#socket !socket !' greylist.conf
 
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
@@ -117,7 +121,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %__install -d -m755 \
-	$RPM_BUILD_ROOT{/etc/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
+	$RPM_BUILD_ROOT{%_sysconfdir/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
 
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
@@ -171,7 +175,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %_mandir/man*/*
-%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
+%attr(0640,root,%username) %verify(not mtime) %config(noreplace) %_sysconfdir/mail/greylist.conf
 %dir %attr(0751,%username,%username) %vardir
 %dir %attr(0770,root,%username) %dbdir
 %dir %attr(0700,%username,root) %rundir
@@ -194,6 +198,12 @@
 %endif
 
 %changelog
+* Sat Dec 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.6-4
+- allowed to configure the parameter given to the daemon in an
+  /etc/sysconfig/milter-greylist file (bz #162334)
+- set user and socketfile in the configfile
+- minor specfile cleanups
+
 * Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.6-3
 - set %%dist
 - use %%global instead of %%define