Improvements contributed by Richard Palo in PR pkg/pkg/47420:

- Build fixes for Solaris 11 (using GCC 4.7)
- Install example for new config file format
- Replace hard-coded path to state directory in various files.

2 files changed, 83 insertions, 0 deletions

diff --git a/mail/milter-greylist/patches/patch-p0f.c b/mail/milter-greylist/patches/patch-p0f.c
new file mode 100644
index 00000000000..0d50d022dae
--- /dev/null
+++ b/mail/milter-greylist/patches/patch-p0f.c
@@ -0,0 +1,47 @@
+$NetBSD: patch-p0f.c,v 1.4 2013/01/11 13:23:17 tron Exp $
+
+Build fix for Solaris 11.
+
+--- p0f.c.orig	2013-01-08 14:30:01.000000000 +0000
++++ p0f.c
+@@ -116,25 +116,25 @@ strcasestr ( haystack, needle )
+ #define RESP_NOMATCH		2
+ 
+ struct p0f_query {
+-	u_int32_t	magic;
+-	u_int8_t	type;
+-	u_int32_t	id;
+-	u_int32_t	src_ad,dst_ad;
+-	u_int16_t	src_port,dst_port;
++	uint32_t	magic;
++	uint8_t	type;
++	uint32_t	id;
++	uint32_t	src_ad,dst_ad;
++	uint16_t	src_port,dst_port;
+ };
+ struct p0f_response {
+-	u_int32_t	magic;
+-	u_int32_t	id;
+-	u_int8_t 	type;
+-	u_int8_t	genre[20];
+-	u_int8_t	detail[40];
++	uint32_t	magic;
++	uint32_t	id;
++	uint8_t 	type;
++	uint8_t	genre[20];
++	uint8_t	detail[40];
+ 	int8_t		dist;
+-	u_int8_t	link[30];
+-	u_int8_t	tos[30];
+-	u_int8_t	fw,nat;
+-	u_int8_t	real;
++	uint8_t	link[30];
++	uint8_t	tos[30];
++	uint8_t	fw,nat;
++	uint8_t	real;
+ 	int16_t		score;
+-	u_int16_t	mflags;
++	uint16_t	mflags;
+ 	int32_t		uptime;
+ };
+ /* End of stuff borrowed from p0f/p0f-query.h */
diff --git a/mail/milter-greylist/patches/patch-spamd.c b/mail/milter-greylist/patches/patch-spamd.c
new file mode 100644
index 00000000000..dced3f585fe
--- /dev/null
+++ b/mail/milter-greylist/patches/patch-spamd.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-spamd.c,v 1.4 2013/01/11 13:23:17 tron Exp $
+
+Fix build under Solaris 11.
+
+--- spamd.c.orig	2013-01-08 14:30:01.000000000 +0000
++++ spamd.c	2013-01-11 13:07:04.000000000 +0000
+@@ -55,7 +55,11 @@
+ #include "spf.h"
+ #include "acl.h"
+ #include "conf.h"
++#ifdef HAVE_OLD_QUEUE_H
+ #include "queue.h"
++#else 
++#include <sys/queue.h>
++#endif
+ #include "milter-greylist.h"
+ 
+ #include "spamd.h"
+@@ -439,7 +443,7 @@
+ 	struct sockaddr_un s_un;
+ 	int sock;
+ 	
+-	bzero(&s_un, sizeof(s_un));
++	(void)memset(&s_un, 0, sizeof(s_un));
+ 	s_un.sun_family = AF_UNIX;
+ 	strncpy(s_un.sun_path, path, sizeof(s_un.sun_path) - 1);
+ 
+@@ -468,7 +472,7 @@
+ 	int e;
+ 	int sock = -1;
+ 
+-	bzero(&hints, sizeof(hints));
++	(void)memset(&hints, 0, sizeof(hints));
+ 	hints.ai_socktype = SOCK_STREAM;
+ #ifdef AI_ADDRCONFIG
+ 	hints.ai_flags = AI_ADDRCONFIG;