Attachment #212437 for bug #239334





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


LICENSE=	BSD3CLAUSE

USES=		tar:tgz autoreconf

MAKE_JOBS_UNSAFE=	yes

USES=		tar:tgz

##
# Use the following quirks to choose which sendmail to use (ports or system):
#

# installed port preference over it.
##

OPTIONS_DEFINE=		DKIM SPF CURL LDAP P0F POSTFIX DOCS EXAMPLES
OPTIONS_DEFAULT=	DKIM SPF CURL
DKIM_DESC=		DKIM support
SPF_DESC=		SPF support
GEOIP_DESC=		Enable GeoIP1 + GeoIP2 Support
CURL_DESC=		curl support
P0F_DESC=		P0F support
POSTFIX_DESC=		Use Postfix instead of Sendmail

DKIM_LIB_DEPENDS=	libopendkim.so:mail/opendkim
P0F_RUN_DEPENDS=	p0f:net-mgmt/p0f
SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl

POSTFIX_CONFIGURE_ENABLE=	postfix
POSTFIX_LDFLAGS_OFF=		${SENDMAIL_LDFLAGS}
POSTFIX_LIBS_OFF=		${SENDMAIL_LDADD}

P0F_CONFIGURE_ENABLE=		p0f306

DKIM_CONFIGURE_ON=		--with-libopendkim=${LOCALBASE}
DKIM_USES=			ssl
SPF_CONFIGURE_ON=		--with-libspf2=${LOCALBASE}
GEOIP_CONFIGURE_ON=		--with-libmaxminddb=${LOCALBASE}
CURL_CONFIGURE_ON=		--with-libcurl=${LOCALBASE}
LDAP_CONFIGURE_ON=		--with-openldap=${LOCALBASE}
LDAP_LDFLAGS=			-L${LOCALBASE}/lib




Index: configure
--- configure.orig	2016-07-12 03:09:29 UTC
+++ configure
@@ -6083,7 +6083,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+true; #LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 

Lines 1-4 Link Here

(-)/usr/ports/mail/milter-greylist/files/patch-greylist.conf (-2 / +2 lines)
1	--- greylist.conf.orig 2013-08-13 12:45:08 UTC	1	--- greylist.conf.orig 2013-01-27 02:10:19 UTC
2	+++ greylist.conf	2	+++ greylist.conf
3	@@ -9,7 +9,7 @@ pidfile "/var/run/milter-greylist.pid"	3	@@ -9,7 +9,7 @@ pidfile "/var/run/milter-greylist.pid"
4	socket "/var/milter-greylist/milter-greylist.sock"	4	socket "/var/milter-greylist/milter-greylist.sock"
Lines 7-11 Link Here
7	-user "smmsp"	7	-user "smmsp"
8	+user "mailnull:mailnull"	8	+user "mailnull:mailnull"
9		9
10
11	# Log milter-greylist activity to a file	10	# Log milter-greylist activity to a file
		11	#stat ">>/var/milter-greylist/greylist.log" \

Lines 1-240 Link Here

(-)/usr/ports/mail/milter-greylist/files/patch-libmaxminddb-support_from_GH-geoip2-fork (-6 lines)
1	--- README.orig 2016-01-31 05:37:00 UTC
2	+++ README
3	@@ -60,7 +60,7 @@ Build dependencies:
4	Optional dependencies:
5	- libspf2, libspf_alt or libspf, for SPF support
6	- libcurl, for URL checks support

Return to bug 239334

Lines 3-9 Link Here

(-)/usr/ports/mail/milter-greylist/Makefile (-8 / +7 lines)
3		3
4	PORTNAME= milter-greylist	4	PORTNAME= milter-greylist
5	PORTVERSION= 4.6.2	5	PORTVERSION= 4.6.2
6	PORTREVISION= 5	6	PORTREVISION= 4
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 13-22 Link Here
13		13
14	LICENSE= BSD3CLAUSE	14	LICENSE= BSD3CLAUSE
15		15
16	USES= tar:tgz autoreconf
17
18	MAKE_JOBS_UNSAFE= yes	16	MAKE_JOBS_UNSAFE= yes
19		17
		18	USES= tar:tgz
		19
20	##	20	##
21	# Use the following quirks to choose which sendmail to use (ports or system):	21	# Use the following quirks to choose which sendmail to use (ports or system):
22	#	22	#
Lines 28-38 Link Here
28	# installed port preference over it.	28	# installed port preference over it.
29	##	29	##
30		30
31	OPTIONS_DEFINE= DKIM SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES	31	OPTIONS_DEFINE= DKIM SPF CURL LDAP P0F POSTFIX DOCS EXAMPLES
32	OPTIONS_DEFAULT= DKIM SPF GEOIP	32	OPTIONS_DEFAULT= DKIM SPF CURL
33	DKIM_DESC= DKIM support	33	DKIM_DESC= DKIM support
34	SPF_DESC= SPF support	34	SPF_DESC= SPF support
35	GEOIP_DESC= Enable GeoIP1 + GeoIP2 Support
36	CURL_DESC= curl support	35	CURL_DESC= curl support
37	P0F_DESC= P0F support	36	P0F_DESC= P0F support
38	POSTFIX_DESC= Use Postfix instead of Sendmail	37	POSTFIX_DESC= Use Postfix instead of Sendmail
Lines 40-56 Link Here
40	DKIM_LIB_DEPENDS= libopendkim.so:mail/opendkim	39	DKIM_LIB_DEPENDS= libopendkim.so:mail/opendkim
41	P0F_RUN_DEPENDS= p0f:net-mgmt/p0f	40	P0F_RUN_DEPENDS= p0f:net-mgmt/p0f
42	SPF_LIB_DEPENDS= libspf2.so:mail/libspf2	41	SPF_LIB_DEPENDS= libspf2.so:mail/libspf2
43	GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
44	CURL_LIB_DEPENDS= libcurl.so:ftp/curl	42	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
45		43
46	POSTFIX_CONFIGURE_ENABLE= postfix	44	POSTFIX_CONFIGURE_ENABLE= postfix
		45	POSTFIX_LDFLAGS_OFF= ${SENDMAIL_LDFLAGS}
		46	POSTFIX_LIBS_OFF= ${SENDMAIL_LDADD}
47		47
48	P0F_CONFIGURE_ENABLE= p0f306	48	P0F_CONFIGURE_ENABLE= p0f306
49		49
50	DKIM_CONFIGURE_ON= --with-libopendkim=${LOCALBASE}	50	DKIM_CONFIGURE_ON= --with-libopendkim=${LOCALBASE}
51	DKIM_USES= ssl	51	DKIM_USES= ssl
52	SPF_CONFIGURE_ON= --with-libspf2=${LOCALBASE}	52	SPF_CONFIGURE_ON= --with-libspf2=${LOCALBASE}
53	GEOIP_CONFIGURE_ON= --with-libmaxminddb=${LOCALBASE}
54	CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}	53	CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}
55	LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE}	54	LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE}
56	LDAP_LDFLAGS= -L${LOCALBASE}/lib	55	LDAP_LDFLAGS= -L${LOCALBASE}/lib

Line 0 Link Here

(-)/usr/ports/mail/milter-greylist/files/patch-configure (+12 lines)
	1	Index: configure
	2	--- configure.orig 2016-07-12 03:09:29 UTC
	3	+++ configure
	4	@@ -6083,7 +6083,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
	5	$as_echo_n "(cached) " >&6
	6	else
	7	ac_check_lib_save_LIBS=$LIBS
	8	-LIBS="-lpthread $LIBS"
	9	+true; #LIBS="-lpthread $LIBS"
	10	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	11	/* end confdefs.h. */
	12