rpms/milter-greylist/devel milter-greylist.upstart, NONE, 1.1 ai_addrconfig.patch, 1.1, 1.2 milter-greylist.spec, 1.28, 1.29

[Enrico Scholz]

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv521

Modified Files:
	ai_addrconfig.patch milter-greylist.spec 
Added Files:
	milter-greylist.upstart 
Log Message:
updated


--- NEW FILE milter-greylist.upstart ---
### Uncomment matching 'start' lines below.

### Uncomment these two lines when you want milter-greylist to be a
### milter for a remote machine. 
### 'starting\ local' and 'starting local' should be uncommented
### together as former is required due to broken Fedora initscripts
### and later is the correct one

#start on starting\ local
#start on starting local


### Uncomment this line when you run want milter-greylist to be a
### milter for sendmail on the current machine

#start on starting sendmail


### Uncomment this line when you run want milter-greylist to be a
### milter for postfix on the current machine

#start on starting postfix


stop  on runlevel 0
stop  on runlevel 1
stop  on runlevel 6

respawn
exec /usr/sbin/milter-greylist -D

ai_addrconfig.patch:

Index: ai_addrconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/ai_addrconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ai_addrconfig.patch	14 Feb 2009 18:28:43 -0000	1.1
+++ ai_addrconfig.patch	7 Mar 2009 12:22:30 -0000	1.2
@@ -1,5 +1,9 @@
 ISC libbind provides AI_ADDRCONFIG macro, but getaddrinfo() fails with
-EAI_BADFLAGS when invoked with it.
+EAI_BADFLAGS when invoked with it.  This patch retries getaddrinfo()
+without AI_ADDRCONFIG flag in this case.
+
+It is very simple and a ./configure test for working AI_ADDRCONFIG
+might be better.
 
 Index: milter-greylist-4.2b1/spamd.c
 ===================================================================


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- milter-greylist.spec	26 Feb 2009 00:45:24 -0000	1.28
+++ milter-greylist.spec	7 Mar 2009 12:22:30 -0000	1.29
@@ -19,7 +19,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	4.2
-Release:	%release_func 0.3.%{?beta}
+Release:	%release_func 0.4.%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -41,17 +41,31 @@
 BuildRequires:		curl-devel GeoIP-devel
 %{?FE_USERADD_REQ}
 
-%package sysv
+%package sysvinit
 Summary:	Sysv initscripts for %name
 Group:		System Environment/Daemons
-Provides:	init(%name) = sysv
+Provides:	init(%name) = sysvinit
 Requires(preun):	%name = %version-%release
 Requires(postun):	%name = %version-%release
 Requires(preun):	initscripts
 Requires(postun):	initscripts
 Requires(post):		%__chkconfig
 Requires(preun):	%__chkconfig
-
+Provides:		%name-sysv = %version-%release
+Obsoletes:		%name-sysv < %version-%release
+BuildArch:		noarch
+
+%package upstart
+Summary:		upstart initscripts for %name
+Group:			System Environment/Daemons
+Source10:		%name.upstart
+Provides:		init(%name) = upstart
+Requires:		%name = %version-%release
+# implicates a conflict with upstart 0.5+
+Requires(pre):		/etc/event.d	
+Requires(post):		/usr/bin/killall
+Requires(postun):	/sbin/initctl
+BuildArch:		noarch
 
 %description
 Greylisting is a new method of blocking significant amounts of spam at
@@ -63,7 +77,7 @@
 This package provides a greylist filter for sendmail's milter API.
 
 
-%description sysv
+%description sysvinit
 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,
@@ -73,6 +87,16 @@
 This package provides the SysV initscripts for the %name package.
 
 
+%description upstart
+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 upstart initscripts for the %name package.
+
+
 %prep
 %setup -q %{?beta:-n %name-%version%beta}
 %patch0 -p1 -b .sysv
@@ -124,6 +148,7 @@
 %__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%rundir,%dbdir,%_var/run}
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/milter-greylist
 
 # create temporary files
 touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
@@ -145,17 +170,24 @@
 
 
 
-%post sysv
+%post sysvinit
 %__chkconfig --add %name
 
-%preun sysv
+%preun sysvinit
 test "$1" != 0 || %__chkconfig --del %name
 test "$1" != 0 || %_initrddir/%name stop >/dev/null || :
 
-%postun sysv
+%postun sysvinit
 test "$1"  = 0 || %_initrddir/%name condrestart >/dev/null || :
 
 
+%post upstart
+/usr/bin/killall -u %username milter-greylist 2>/dev/null || :
+
+%preun upstart
+test "$1" != "0" || /sbin/initctl -q stop milter-greylist || :
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -172,13 +204,24 @@
 %ghost %rundir/milter-greylist.sock
 %ghost %_var/run/milter-greylist.pid
 
+
 %if 0%{!?_without_sysv:1}
-%files sysv
+%files sysvinit
   %defattr(-,root,root,-)
   %config %_initrddir/*
 %endif
 
+
+%files upstart
+%defattr(-,root,root,-)
+%config(noreplace) /etc/event.d/*
+
+
 %changelog
+* Sat Mar  7 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2-0.4.b1
+- added -upstart subpackage
+- renamed -sysv to -sysvinit to let -upstart win the default depresolving
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2-0.3.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild