rpms/milter-greylist/devel milter-greylist.params, NONE, 1.1 milter-greylist.i, NONE, 1.1 milter-greylist-2.0.2-sysv.patch, NONE, 1.1 milter-greylist.spec, 1.9, 1.10 milter-greylist-2.0rc5-user.patch, 1.1, NONE
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sat Dec 24 12:56:33 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2606
Modified Files:
milter-greylist.spec
Added Files:
milter-greylist.params milter-greylist.i
milter-greylist-2.0.2-sysv.patch
Removed Files:
milter-greylist-2.0rc5-user.patch
Log Message:
- use /var/run/milter-greylist as directory for the socket (bz #162334#6)
- do not set user and socket in the sysv-initscript anymore; instead
of uncomment the configfile entries
- ship minit params file as SOURCE instead of generating it on-the-fly
- added -initng subpackage
- minor specfile cleanups
--- NEW FILE milter-greylist.params ---
-D
--- NEW FILE milter-greylist.i ---
daemon daemon/milter-greylist {
need = system/initial system/mountfs;
use = system/netmount;
require_network;
respawn;
exec daemon = /usr/sbin/milter-greylist;
exec_args daemon = -D;
}
milter-greylist-2.0.2-sysv.patch:
--- NEW FILE milter-greylist-2.0.2-sysv.patch ---
--- milter-greylist-2.0.2/rc-redhat.sh.in.sysv 2005-03-13 17:43:52.000000000 +0100
+++ milter-greylist-2.0.2/rc-redhat.sh.in 2005-12-24 13:08:37.000000000 +0100
@@ -13,9 +13,7 @@
. /etc/init.d/functions
pidfile="/var/milter-greylist/milter-greylist.pid"
-socket="/var/milter-greylist/milter-greylist.sock"
-user="@USER@"
-OPTIONS="-P $pidfile -p $socket"
+OPTIONS="-P $pidfile"
if [ -f /etc/sysconfig/milter-greylist ]
then
. /etc/sysconfig/milter-greylist
@@ -29,7 +27,7 @@
RETVAL=1
failure
else
- daemon --user=$user @BINDIR@/milter-greylist $OPTIONS
+ daemon @BINDIR@/milter-greylist $OPTIONS
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/milter-greylist
fi;
Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- milter-greylist.spec 22 Oct 2005 00:56:35 -0000 1.9
+++ milter-greylist.spec 24 Dec 2005 12:56:33 -0000 1.10
@@ -1,10 +1,13 @@
## $Id$
## This package accepts the following switches:
-## --with spf ... enable SPF support
-## --with minit ... enable minit support
+## --with spf ... enable SPF support
+## --without minit ... disable creation of 'minit' subpackage
+## --without initng ... disable creation of 'initng' subpackage
## Fedora Extras specific customization below...
+%{!?_with_minit:%global _without_minit --without minit}
+%{!?_with_initng:%global _without_initng --without initng}
##
%global username grmilter
@@ -12,7 +15,7 @@
%global minitsvcdir %minitdir/services/grmilter
%global vardir %_var/lib/%name
%global dbdir %vardir/db
-%global rundir %vardir/run
+%global rundir %_var/run/%name
%global __chkconfig /sbin/chkconfig
%{!?release_func:%global release_func() %1%{?dist}}
@@ -20,12 +23,12 @@
Summary: Milter for greylisting, the next step in the spam control war
Name: milter-greylist
Version: 2.0.2
-Release: %release_func 1
+Release: %release_func 2
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-2.0rc5-user.patch
+Patch0: milter-greylist-2.0.2-sysv.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
Requires(pre): fedora-usermgmt
@@ -35,7 +38,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
@@ -46,12 +49,23 @@
%package minit
Summary: Minit initscripts for %name
-Group: System Environment/Daemon
-Provides: init(%name) = minit
+Group: System Environment/Daemons
+Source20: milter-greylist.params
+Provides: init(%name) = minit
Requires: %name = %version-%release
Requires(pre): minit-setup
Requires(postun): minit-setup
+%package initng
+Summary: initng initscripts for %name
+Group: System Environment/Daemons
+Source30: milter-greylist.i
+Provides: init(%name) = initng
+Requires: %name = %version-%release
+Requires(pre): %_sysconfdir/initng %name
+Requires(preun): initng %name
+Requires(postun): initng %name
+
%description
Greylisting is a new method of blocking significant amounts of spam at
@@ -83,11 +97,23 @@
This package provides the minit initscripts for the %name package.
+%description initng
+Greylisting is a new method of blocking significant amounts of spam at
+the mailserver level, but without resorting to heavyweight statistical
+analysis or other heuristical (and error-prone) approaches. Consequently,
+implementations are fairly lightweight, and may even decrease network
+traffic and processor load on your mailserver.
+
+This package provides the initng initscripts for the %name package.
+
+
%prep
%setup -q
-%patch0 -p1 -b .user
+%patch0 -p1 -b .sysv
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;
@@ -112,27 +138,28 @@
%install
rm -rf $RPM_BUILD_ROOT
-%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%minitsvcdir,%rundir,%dbdir,%_var/run}
+%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%minitsvcdir,%rundir,%dbdir,%_var/run} \
+ $RPM_BUILD_ROOT%_sysconfdir/initng/daemon
%__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
%__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
# the minit stuff
ln -s %_sbindir/milter-greylist $RPM_BUILD_ROOT%minitsvcdir/run
-touch $RPM_BUILD_ROOT%minitsvcdir/respawn
+%__install -p -m644 %SOURCE20 $RPM_BUILD_ROOT%minitsvcdir/params
+touch $RPM_BUILD_ROOT%minitsvcdir/respawn
-cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params
--D
--u%username
--p%rundir/milter-greylist.sock
-EOF
-
-# Short hack...
-%{!?_with_minit:rm -rf $RPM_BUILD_ROOT%minitdir}
+# the initng stuff
+%__install -p -m644 %SOURCE30 $RPM_BUILD_ROOT%_sysconfdir/initng/daemon/milter-greylist.i
# create temporary files
touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
touch $RPM_BUILD_ROOT%_var/run/milter-greylist.pid
+## Remove the unwanted init-methods
+%{?_without_sysv: rm -rf $RPM_BUILD_ROOT%_initrddir}
+%{?_without_minit: rm -rf $RPM_BUILD_ROOT%_sysconfdir/minit}
+%{?_without_initng:rm -rf $RPM_BUILD_ROOT%_sysconfdir/initng}
+
%pre
/usr/sbin/fedora-groupadd 7 -r %username &>/dev/null || :
@@ -157,6 +184,15 @@
test "$1" = 0 || %_initrddir/%name condrestart >/dev/null || :
+%preun initng
+test "$1" != 0 || {
+ /sbin/ngc --stop daemon/milter-greylist &>/dev/null || :
+ /sbin/ng-update del daemon/milter-greylist &>/dev/null || :
+}
+
+%postun initng
+test "$1" = 0 || /sbin/ngc --restart daemon/milter-greylist &>/dev/null || :
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -165,7 +201,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
@@ -174,20 +210,36 @@
%ghost %rundir/milter-greylist.sock
%ghost %_var/run/milter-greylist.pid
+%if 0%{!?_without_sysv:1}
%files sysv
-%defattr(-,root,root,-)
-%config %_initrddir/*
+ %defattr(-,root,root,-)
+ %config %_initrddir/*
+%endif
+
+%if 0%{!?_without_initng:1}
+%files initng
+ %defattr(-,root,root,-)
+ %config %_sysconfdir/initng/daemon/*
+%endif
-%if 0%{?_with_minit:1}
+%if 0%{!?_without_minit:1}
%files minit
-%defattr(-,root,root,-)
-%dir %minitsvcdir
-%minitsvcdir/run
-%minitsvcdir/respawn
-%config(noreplace) %minitsvcdir/params
+ %defattr(-,root,root,-)
+ %dir %minitsvcdir
+ %minitsvcdir/run
+ %minitsvcdir/respawn
+ %config(noreplace) %minitsvcdir/params
%endif
%changelog
+* Sat Dec 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-2
+- use /var/run/milter-greylist as directory for the socket (bz #162334#6)
+- do not set user and socket in the sysv-initscript anymore; instead
+ of uncomment the configfile entries
+- ship minit params file as SOURCE instead of generating it on-the-fly
+- added -initng subpackage
+- minor specfile cleanups
+
* Sat Oct 22 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-1
- updated to 2.0.2
--- milter-greylist-2.0rc5-user.patch DELETED ---
More information about the fedora-extras-commits
mailing list