Attachment #167078 for bug #207246





PORTNAME=	milter-greylist
PORTVERSION=	4.4.3
PORTREVISION=	6
CATEGORIES=	mail
MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
		http://fossies.org/unix/privat/

# installed port preference over it.
##

OPTIONS_DEFINE=		SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES
SPF_DESC=		SPF support
DKIM_DESC=		DKIM support
CURL_DESC=		curl support
P0F_DESC=		P0F support
POSTFIX_DESC=		Use Postfix instead of Sendmail

SPF_LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
DKIM_LIB_DEPENDS=	libdkim.so:${PORTSDIR}/mail/libdkim

POSTFIX_CONFIGURE_ENABLE=	postfix
POSTFIX_LDFLAGS_OFF=		${SENDMAIL_LDFLAGS}


P0F_CONFIGURE_ENABLE=		p0f306

SPF_CONFIGURE_ON=		--with-libspf2=${LOCALBASE}
GEOIP_CONFIGURE_ON=		--with-libGeoIP=${LOCALBASE}
CURL_CONFIGURE_ON=		--with-libcurl=${LOCALBASE}
CURL_CONFIGURE_WITH=		--with-libcurl=${LOCALBASE}
LDAP_CONFIGURE_ON=		--with-openldap=${LOCALBASE}
LDAP_LDFLAGS=			-L${LOCALBASE}/lib
LDAP_USE=			OPENLDAP=yes




Index: configure
diff -u configure.orig configure
--- configure.orig	2013-03-07 22:26:11.000000000 +0900
+++ configure	2013-03-14 15:35:15.476674058 +0900
@@ -5899,7 +5899,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  LIBS="$LIBS -lpthread"
+  true; #LIBS="$LIBS -lpthread"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
 $as_echo_n "checking for pthread_create in -lc_r... " >&6; }

Lines 1-11 Link Here

(-)milter-greylist/files/patch-greylist.conf (-11 lines)
1	--- greylist.conf.orig 2009-02-13 01:39:01.000000000 +0300
2	+++ greylist.conf 2009-04-22 09:10:46.000000000 +0400
3	@@ -9,7 +9,7 @@
4	socket "/var/milter-greylist/milter-greylist.sock"
5	dumpfile "/var/milter-greylist/greylist.db" 600
6	dumpfreq 1
7	-user "smmsp"
8	+user "mailnull:mailnull"
9
10	# Log milter-greylist activity to a file
11	#stat ">>/var/milter-greylist/greylist.log" \




--- ldapcheck.c.orig	2009-04-09 05:26:46.000000000 +0200
+++ ldapcheck.c	2009-10-23 23:57:42.000000000 +0200
@@ -58,6 +58,22 @@
 #include "prop.h"
 #include "ldapcheck.h"
 
+#ifndef SIMPLEQ_HEAD 
+# define SIMPLEQ_HEAD			STAILQ_HEAD
+# define SIMPLEQ_HEAD_INITIALIZER	STAILQ_HEAD_INITIALIZER
+# define SIMPLEQ_ENTRY 			STAILQ_ENTRY
+# define SIMPLEQ_INIT 			STAILQ_INIT
+# define SIMPLEQ_INSERT_HEAD 		STAILQ_INSERT_HEAD
+# define SIMPLEQ_INSERT_TAIL 		STAILQ_INSERT_TAIL
+# define SIMPLEQ_INSERT_AFTER 		STAILQ_INSERT_AFTER
+# define SIMPLEQ_REMOVE_HEAD 		STAILQ_REMOVE_HEAD
+# define SIMPLEQ_FOREACH 		STAILQ_FOREACH
+# define SIMPLEQ_EMPTY 			STAILQ_EMPTY
+# define SIMPLEQ_FIRST 			STAILQ_FIRST
+# define SIMPLEQ_NEXT 			STAILQ_NEXT
+# define SIMPLEQ_REMOVE 		STAILQ_REMOVE
+#endif
+
 struct ldapconf_entry {
 	char *lc_url;
 	char *lc_dn;




Index: sync.c
diff -u -p sync.c.orig sync.c
--- sync.c.orig	2010-04-17 12:19:02.000000000 +0900
+++ sync.c	2013-03-14 14:57:39.284674283 +0900
@@ -478,7 +478,11 @@ peer_connect(peer)	/* peer list is read-
 #ifdef AF_INET6
 		case AF_INET6:
 			SA6(res->ai_addr)->sin6_port = service;
-			laddrstr = "::";
+			if (conf.c_syncsrcaddr != NULL) {
+				laddrstr = conf.c_syncsrcaddr;
+			} else {
+				laddrstr = "::";
+			}
 			break;
 #endif
 		default:

Return to bug 207246

Lines 3-9 Link Here

(-)milter-greylist/Makefile (-8 / +5 lines)
3		3
4	PORTNAME= milter-greylist	4	PORTNAME= milter-greylist
5	PORTVERSION= 4.4.3	5	PORTVERSION= 4.4.3
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \	8	MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \
9	http://fossies.org/unix/privat/	9	http://fossies.org/unix/privat/
Lines 31-39 Link Here
31	# installed port preference over it.	31	# installed port preference over it.
32	##	32	##
33		33
34	OPTIONS_DEFINE= SPF GEOIP CURL DKIM LDAP P0F POSTFIX DOCS EXAMPLES	34	OPTIONS_DEFINE= SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES
35	SPF_DESC= SPF support	35	SPF_DESC= SPF support
36	DKIM_DESC= DKIM support
37	CURL_DESC= curl support	36	CURL_DESC= curl support
38	P0F_DESC= P0F support	37	P0F_DESC= P0F support
39	POSTFIX_DESC= Use Postfix instead of Sendmail	38	POSTFIX_DESC= Use Postfix instead of Sendmail
Lines 42-48 Link Here
42	SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/mail/libspf2	41	SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/mail/libspf2
43	CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl	42	CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
44	GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP	43	GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP
45	DKIM_LIB_DEPENDS= libdkim.so:${PORTSDIR}/mail/libdkim
46		44
47	POSTFIX_CONFIGURE_ENABLE= postfix	45	POSTFIX_CONFIGURE_ENABLE= postfix
48	POSTFIX_LDFLAGS_OFF= ${SENDMAIL_LDFLAGS}	46	POSTFIX_LDFLAGS_OFF= ${SENDMAIL_LDFLAGS}
Lines 50-59 Link Here
50		48
51	P0F_CONFIGURE_ENABLE= p0f306	49	P0F_CONFIGURE_ENABLE= p0f306
52		50
53	DKIM_CONFIGURE_WITH= --with-libdkim=${LOCALBASE}	51	SPF_CONFIGURE_ON= --with-libspf2=${LOCALBASE}
54	SPF_CONFIGURE_WITH= --with-libspf2=${LOCALBASE}	52	GEOIP_CONFIGURE_ON= --with-libGeoIP=${LOCALBASE}
55	GEOIP__CONFIGURE_WITH= --with-libGeoIP=${LOCALBASE}	53	CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}
56	CURL_CONFIGURE_WITH= --with-libcurl=${LOCALBASE}
57	LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE}	54	LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE}
58	LDAP_LDFLAGS= -L${LOCALBASE}/lib	55	LDAP_LDFLAGS= -L${LOCALBASE}/lib
59	LDAP_USE= OPENLDAP=yes	56	LDAP_USE= OPENLDAP=yes

Lines 1-13 Link Here

(-)milter-greylist/files/patch-configure (-13 lines)
1	Index: configure
2	diff -u configure.orig configure
3	--- configure.orig 2013-03-07 22:26:11.000000000 +0900
4	+++ configure 2013-03-14 15:35:15.476674058 +0900
5	@@ -5899,7 +5899,7 @@
6	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
7	$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
8	if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
9	- LIBS="$LIBS -lpthread"
10	+ true; #LIBS="$LIBS -lpthread"
11	else
12	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
13	$as_echo_n "checking for pthread_create in -lc_r... " >&6; }

Lines 1-25 Link Here

(-)milter-greylist/files/patch-ldapcheck.c (-25 lines)
1	--- ldapcheck.c.orig 2009-04-09 05:26:46.000000000 +0200
2	+++ ldapcheck.c 2009-10-23 23:57:42.000000000 +0200
3	@@ -58,6 +58,22 @@
4	#include "prop.h"
5	#include "ldapcheck.h"
6
7	+#ifndef SIMPLEQ_HEAD
8	+# define SIMPLEQ_HEAD STAILQ_HEAD
9	+# define SIMPLEQ_HEAD_INITIALIZER STAILQ_HEAD_INITIALIZER
10	+# define SIMPLEQ_ENTRY STAILQ_ENTRY
11	+# define SIMPLEQ_INIT STAILQ_INIT
12	+# define SIMPLEQ_INSERT_HEAD STAILQ_INSERT_HEAD
13	+# define SIMPLEQ_INSERT_TAIL STAILQ_INSERT_TAIL
14	+# define SIMPLEQ_INSERT_AFTER STAILQ_INSERT_AFTER
15	+# define SIMPLEQ_REMOVE_HEAD STAILQ_REMOVE_HEAD
16	+# define SIMPLEQ_FOREACH STAILQ_FOREACH
17	+# define SIMPLEQ_EMPTY STAILQ_EMPTY
18	+# define SIMPLEQ_FIRST STAILQ_FIRST
19	+# define SIMPLEQ_NEXT STAILQ_NEXT
20	+# define SIMPLEQ_REMOVE STAILQ_REMOVE
21	+#endif
22	+
23	struct ldapconf_entry {
24	char *lc_url;
25	char *lc_dn;

Lines 1-17 Link Here

(-)milter-greylist/files/patch-sync.c (-17 lines)
1	Index: sync.c
2	diff -u -p sync.c.orig sync.c
3	--- sync.c.orig 2010-04-17 12:19:02.000000000 +0900
4	+++ sync.c 2013-03-14 14:57:39.284674283 +0900
5	@@ -478,7 +478,11 @@ peer_connect(peer) /* peer list is read-
6	#ifdef AF_INET6
7	case AF_INET6:
8	SA6(res->ai_addr)->sin6_port = service;
9	- laddrstr = "::";
10	+ if (conf.c_syncsrcaddr != NULL) {
11	+ laddrstr = conf.c_syncsrcaddr;
12	+ } else {
13	+ laddrstr = "::";
14	+ }
15	break;
16	#endif
17	default: