rpms/milter-greylist/FC-3 milter-greylist-1.6-sysconf.patch, NONE, 1.1 milter-greylist.spec, 1.2, 1.3
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sat Dec 24 13:15:45 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/milter-greylist/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4491
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
- fixed groupname
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-3/milter-greylist.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- milter-greylist.spec 19 May 2005 17:39:07 -0000 1.2
+++ milter-greylist.spec 24 Dec 2005 13:15:45 -0000 1.3
@@ -21,14 +21,15 @@
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
+Group: System Environment/Daemons
URL: http://hcpnet.free.fr/milter-greylist/
Source0: ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
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
@@ -38,7 +39,7 @@
%package sysv
Summary: Sysv initscripts for %name
-Group: System Environment/Daemon
+Group: System Environment/Daemons
Provides: init(%name) = sysv
Requires(preun): %name = %version-%release
Requires(postun): %name = %version-%release
@@ -49,7 +50,7 @@
%package minit
Summary: Minit initscripts for %name
-Group: System Environment/Daemon
+Group: System Environment/Daemons
Provides: init(%name) = minit
Requires: %name = %version-%release
Requires(pre): minit-setup
@@ -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,13 @@
%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
+- fixed groupname
+
* Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.6-3
- set %%dist
- use %%global instead of %%define
More information about the scm-commits
mailing list