Update "milter-greylist" to version 4.4.2. This version fixes build

problems under Solaris which previously required patches.

4 files changed, 6 insertions, 136 deletions

diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 20a2fd5100d..d72c7bc8400 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2013/01/03 09:50:44 tron Exp $
+# $NetBSD: Makefile,v 1.58 2013/01/08 15:54:54 tron Exp $
 
-DISTNAME=	milter-greylist-4.4.1
+DISTNAME=	milter-greylist-4.4.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
 EXTRACT_SUFX=	.tgz
diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo
index e5bf84ce706..aa7771995cc 100644
--- a/mail/milter-greylist/distinfo
+++ b/mail/milter-greylist/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.34 2013/01/03 09:50:44 tron Exp $
+$NetBSD: distinfo,v 1.35 2013/01/08 15:54:54 tron Exp $
 
-SHA1 (milter-greylist-4.4.1.tgz) = 4ed61d7f76e88266ce21096d08191c23b281bf74
-RMD160 (milter-greylist-4.4.1.tgz) = 17daad46bd5f5e1e5f62cec74d293b2599d8c147
-Size (milter-greylist-4.4.1.tgz) = 229401 bytes
+SHA1 (milter-greylist-4.4.2.tgz) = a87468a3ab7a9cbb051f88e043cd1f244b6a1351
+RMD160 (milter-greylist-4.4.2.tgz) = 077ab452c8bb007c9f52e80be8db3475a83af410
+Size (milter-greylist-4.4.2.tgz) = 230544 bytes
 SHA1 (patch-aa) = c42757814933001ddbcdfb77dd03e17a9c4c8283
-SHA1 (patch-p0f.c) = 01a16304527cad8eb0d0ad8686c2be1e90426c74
-SHA1 (patch-spamd.c) = 7347c4bc4115df743e489ba4221d3d0c50e9d1ef
diff --git a/mail/milter-greylist/patches/patch-p0f.c b/mail/milter-greylist/patches/patch-p0f.c
deleted file mode 100644
index d5c9ea51d35..00000000000
--- a/mail/milter-greylist/patches/patch-p0f.c
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-p0f.c,v 1.2 2013/01/03 09:50:44 tron Exp $
-
-. More portable int types.
-. Use strstr(3) in place of strcasestr(3) under SunOS.
-. Rename 'sun' to 's_un' to avoid a conflict on SunOS.
-
---- p0f.c.orig	2012-02-21 05:53:44.000000000 +0000
-+++ p0f.c	2012-12-30 13:40:25.000000000 +0000
-@@ -75,25 +75,25 @@
- #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 */
-@@ -159,7 +159,11 @@
-                return 0;
- 
- 	data = (char *)ad->string;
-+#ifdef __sun__
-+	if (strstr(priv->priv_p0f, data) != NULL)
-+#else
- 	if (strcasestr(priv->priv_p0f, data) != NULL)
-+#endif
- 		return 1;
- 	return 0;
- }
-@@ -404,7 +408,7 @@
- static int
- p0f_connect(void)
- {
--	struct sockaddr_un sun;
-+	struct sockaddr_un s_un;
- 	int p0fsock = -1;
- 
- 	if (!conf.c_p0fsock[0])
-@@ -424,11 +428,11 @@
- 
- 	if (conf.c_debug)
- 		mg_log(LOG_DEBUG, "using p0f socket \"%s\"", conf.c_p0fsock);		
--	(void)memset(&sun, 0, sizeof(sun));
--	sun.sun_family = AF_UNIX;
--	strncpy(sun.sun_path, conf.c_p0fsock, sizeof(sun.sun_path));
-+	(void)memset(&s_un, 0, sizeof(s_un));
-+	s_un.sun_family = AF_UNIX;
-+	strncpy(s_un.sun_path, conf.c_p0fsock, sizeof(s_un.sun_path));
- 
--	if (connect(p0fsock, (struct sockaddr *)&sun, sizeof(sun)) != 0) {
-+	if (connect(p0fsock, (struct sockaddr *)&s_un, sizeof(s_un)) != 0) {
- 		mg_log(LOG_ERR, "Cannot connect to p0f socket \"%s\"",
- 		      conf.c_p0fsock);	
- 		close(p0fsock);
diff --git a/mail/milter-greylist/patches/patch-spamd.c b/mail/milter-greylist/patches/patch-spamd.c
deleted file mode 100644
index 665a82f048d..00000000000
--- a/mail/milter-greylist/patches/patch-spamd.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-spamd.c,v 1.2 2013/01/03 09:50:44 tron Exp $
-
-Rename 'sun' to 's_un' to avoid a conflict on SunOS
-and include <strings.h> if present
---- spamd.c.orig	2012-02-24 02:25:46.000000000 +0000
-+++ spamd.c
-@@ -44,6 +44,9 @@ __RCSID("$Id: spamd.c,v 1.22 2012/02/24
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-+#ifdef HAVE_STRINGS_H
-+#include <strings.h>            /* bzero, ... */
-+#endif
- #include <unistd.h>
- #include <netdb.h>
- #include <sys/types.h>
-@@ -436,12 +439,12 @@ static int
- spamd_unix_socket(path)
- 	char *path;
- {
--	struct sockaddr_un sun;
-+	struct sockaddr_un s_un;
- 	int sock;
- 	
--	bzero(&sun, sizeof(sun));
--	sun.sun_family = AF_UNIX;
--	strncpy(sun.sun_path, path, sizeof(sun.sun_path) - 1);
-+	bzero(&s_un, sizeof(s_un));
-+	s_un.sun_family = AF_UNIX;
-+	strncpy(s_un.sun_path, path, sizeof(s_un.sun_path) - 1);
- 
- 	if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
- 		mg_log(LOG_ERR, "spamd socket failed: %s", strerror(errno));
-@@ -450,7 +453,7 @@ spamd_unix_socket(path)
- 
- 	SET_CLOEXEC(sock);
- 
--	if (connect(sock, (struct sockaddr*) &sun, sizeof(sun))) {
-+	if (connect(sock, (struct sockaddr*) &s_un, sizeof(s_un))) {
- 		mg_log(LOG_ERR, "spamd connect failed: %s", strerror(errno));
- 		return -1;
- 	}