[milter-greylist] updated to 4.4.2

[ensc]

commit 419ecfdc269d9bd9c420f966c404787e780ff4b8
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sun Jan 27 14:15:25 2013 +0100

    updated to 4.4.2

 .gitignore                       |    3 +-
 ai_addrconfig.patch              |    8 +-
 cloexec.patch                    |  213 --------------------------------------
 lastver                          |    2 +-
 milter-greylist-2.0.2-sysv.patch |   25 ++---
 milter-greylist.spec             |   12 +--
 sources                          |    2 +-
 spamd-null.patch                 |   72 -------------
 8 files changed, 21 insertions(+), 316 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63c6eb3..49187d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-milter-greylist-4.2.6.tgz
-/milter-greylist-4.2.7.tgz
+/milter-greylist-4.4.2.tgz
diff --git a/ai_addrconfig.patch b/ai_addrconfig.patch
index 9ad4a74..d10179c 100644
--- a/ai_addrconfig.patch
+++ b/ai_addrconfig.patch
@@ -5,11 +5,11 @@ 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.2.5/spamd.c
+Index: milter-greylist-4.4.1/spamd.c
 ===================================================================
---- milter-greylist-4.2.5.orig/spamd.c
-+++ milter-greylist-4.2.5/spamd.c
-@@ -454,11 +454,21 @@ spamd_inet_socket(host, port)
+--- milter-greylist-4.4.1.orig/spamd.c
++++ milter-greylist-4.4.1/spamd.c
+@@ -470,11 +470,21 @@ spamd_inet_socket(host, port)
  
  	bzero(&hints, sizeof(hints));
  	hints.ai_socktype = SOCK_STREAM;
diff --git a/lastver b/lastver
index 4739c61..1d068c6 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-4.2.7
+4.4.2
diff --git a/milter-greylist-2.0.2-sysv.patch b/milter-greylist-2.0.2-sysv.patch
index cf117e1..495c1a6 100644
--- a/milter-greylist-2.0.2-sysv.patch
+++ b/milter-greylist-2.0.2-sysv.patch
@@ -1,23 +1,16 @@
-diff -up milter-greylist-4.1.1/rc-redhat.sh.in.sysv milter-greylist-4.1.1/rc-redhat.sh.in
---- milter-greylist-4.1.1/rc-redhat.sh.in.sysv	2006-08-20 01:20:51.000000000 -0400
-+++ milter-greylist-4.1.1/rc-redhat.sh.in	2008-08-08 13:43:50.000000000 -0400
-@@ -13,9 +13,7 @@
+Index: milter-greylist-4.4.1/rc-redhat.sh.in
+===================================================================
+--- milter-greylist-4.4.1.orig/rc-redhat.sh.in
++++ milter-greylist-4.4.1/rc-redhat.sh.in
+@@ -13,10 +13,9 @@
  . /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"
+ user="@USER@"
+ hardstopdelay=5
+-OPTIONS="-u $user -P $pidfile -p $socket"
++OPTIONS="-u $user -P $pidfile"
  if [ -f /etc/sysconfig/milter-greylist ]
  then
      . /etc/sysconfig/milter-greylist
-@@ -29,7 +27,7 @@ start() {
-                 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
- 		[ $RETVAL -eq 0 ] && success || failure
diff --git a/milter-greylist.spec b/milter-greylist.spec
index 9af3ac3..bde0088 100644
--- a/milter-greylist.spec
+++ b/milter-greylist.spec
@@ -43,7 +43,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
-Version:	4.2.7
+Version:	4.4.2
 Release:	%release_func 1900
 License:	BSD with advertising
 Group:		System Environment/Daemons
@@ -53,10 +53,6 @@ Source1:	README.fedora
 Patch0:		milter-greylist-2.0.2-sysv.patch
 Patch4:		ai_addrconfig.patch
 Patch7:		milter-greylist-dkim-reentrant.patch
-# http://tech.groups.yahoo.com/group/milter-greylist/message/5551
-Patch8:		cloexec.patch
-# http://tech.groups.yahoo.com/group/milter-greylist/message/5564
-Patch9:		spamd-null.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Provides:		user(%username)  = 7
@@ -148,8 +144,6 @@ This package provides the systemd initscripts for the %name package.
 %patch0 -p1 -b .sysv
 %apply -n4 -p1
 %apply -n7 -p1
-%apply -n8 -p1
-%apply -n9 -p1
 
 install -p -m0644 %SOURCE1 .
 
@@ -297,6 +291,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jan 27 2013 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.4.2-1900
+- updated to 4.4.2
+- rediffed patches and removed obsolete ones
+
 * Sun Aug 19 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.7-1900
 - disabled upstart
 - removed old sysv related cruft
diff --git a/sources b/sources
index 9b6bc3e..7b6a0cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a47d70e0b8a73d341f0d511b3f693650  milter-greylist-4.2.7.tgz
+176b7f657de48e0e165a3af6595fc4e8  milter-greylist-4.4.2.tgz