rpms/milter-greylist/devel p0f-silent.patch, NONE, 1.1 milter-greylist.spec, 1.25, 1.26

[Enrico Scholz]

Author: ensc

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

Modified Files:
	milter-greylist.spec 
Added Files:
	p0f-silent.patch 
Log Message:
updated


p0f-silent.patch:

--- NEW FILE p0f-silent.patch ---
There was no way to turn off

| milter-greylist: Cannot connect to p0f socket ""

messages when program was compiled with p0f support and there is no
p0f daemon available/configured.

Such a situation is common e.g. when providing generic binary packages
in a Linux distribution and users.

This patch skips p0f operations when 'p0fsock' is empty.
Index: milter-greylist-4.2b1/p0f.c
===================================================================
--- milter-greylist-4.2b1.orig/p0f.c
+++ milter-greylist-4.2b1/p0f.c
@@ -284,6 +284,9 @@ p0f_reconnect(void)
 	if (p0fsock != -1)
 		return 0;
 
+	if (!conf.c_p0fsock[0])	/* return silently when p0f is not configured */
+		return -1
+
 	if ((p0fsock = socket(PF_UNIX,SOCK_STREAM,0)) == -1) {
 		mg_log(LOG_ERR, "socket(PF_UNIX, SOCK_STREAM, 0) failed");
 		exit(EX_OSERR);


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- milter-greylist.spec	14 Feb 2009 10:56:29 -0000	1.25
+++ milter-greylist.spec	14 Feb 2009 12:22:52 -0000	1.26
@@ -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.0.%{?beta}
+Release:	%release_func 0.1.%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -28,6 +28,7 @@
 Patch0:		milter-greylist-2.0.2-sysv.patch
 Patch1:		overflow.patch
 Patch2:		size_t.patch
+Patch3:		p0f-silent.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Provides:		user(%username)  = 7
@@ -76,6 +77,7 @@
 %patch0 -p1 -b .sysv
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 install -p -m0644 %SOURCE1 .
 
@@ -175,7 +177,7 @@
 %endif
 
 %changelog
-* Sat Feb 14 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2-0.0.b1
+* Sat Feb 14 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2-0.1.b1
 - updated to 4.2b1
 - enabled spamassassin + p0f support
 - set path to GeoIP database in sample configuration (#439087)