Attachment #132623 for bug #176950

View | Details | Raw Unified | Return to bug 176950
Collapse All | Expand All




# Created by: Cyril Guibourg
# $FreeBSD$
#

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

MAINTAINER=	m.tsatsenko@gmail.com
COMMENT=	Easy-to-use greylist milter for sendmail and postfix

LICENSE=	BSD

CONFLICTS=	milter-greylist-devel-[1-9]*.*
PKGMESSAGE=	${WRKDIR}/pkg-message


# installed port preference over it.
##

OPTIONS_DEFINE=		MANPAGES SPF GEOIP CURL LDAP P0F POSTFIX
OPTIONS_DEFAULT=	MANPAGES
SPF_DESC=		SPF support
CURL_DESC=		curl support
P0F_DESC=		P0F support
POSTFIX_DESC=		Use Postfix instead of Sendmail
P0F_DESC=	Include P0F support
POSTFIX_DESC=	Use Postfix instead of Sendmail

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MMANPAGES}
MAN5=		greylist.conf.5

BUILD_DEPENDS+=	curl>=7.18:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=	--with-libcurl=${LOCALBASE}
.endif
.if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP=yes
CONFIGURE_ARGS+=	--with-openldap
.endif
.if ${PORT_OPTIONS:MP0F}
RUN_DEPENDS+=	p0f:${PORTSDIR}/net-mgmt/p0f
CONFIGURE_ARGS+=	--enable-p0f306
.endif
.if ${PORT_OPTIONS:MPOSTFIX}
CONFIGURE_ARGS+=	--enable-postfix


do-install:
	@${MKDIR} ${PREFIX}/etc/mail
.if ${PORT_OPTIONS:MMANPAGES}
	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
.endif

post-install:
	@${MKDIR} /var/milter-greylist
	@${CHOWN} -R mailnull:mailnull /var/milter-greylist
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
	@${MKDIR} ${EXAMPLESDIR}
	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
.endif


.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (milter-greylist-4.4.1.tgz) = 5400a71e0b01d3f6915638dcd96c57c6fa3bbbc2fb16fcc8eda715ae83a4ad8c	1	SHA256 (milter-greylist-4.4.3.tgz) = fdf7e37c5dd370473ff2cdec7e4b6ca9e60fc2b5c716612d2d449de98d0054a9
2	SIZE (milter-greylist-4.4.1.tgz) = 229401	2	SIZE (milter-greylist-4.4.3.tgz) = 236277

Lines 1-9 Link Here

(-)files/patch-configure (-4 / +6 lines)
1	--- configure.orig 2010-07-12 08:27:51.000000000 +0400	1	Index: configure
2	+++ configure 2010-08-05 05:18:10.000000000 +0400	2	diff -u configure.orig configure
3	@@ -4978,7 +4978,7 @@	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 @@
4	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5	6	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
5	$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }	7	$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
6	if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :	8	if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
7	- LIBS="$LIBS -lpthread"	9	- LIBS="$LIBS -lpthread"
8	+ true; #LIBS="$LIBS -lpthread"	10	+ true; #LIBS="$LIBS -lpthread"
9	else	11	else




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 176950

Lines 1-16 Link Here

(-)Makefile (-17 / +17 lines)
1	# Created by: Cyril Guibourg	1	# Created by: Cyril Guibourg
2	# $FreeBSD$	2	# $FreeBSD$
3	#
4		3
5	PORTNAME= milter-greylist	4	PORTNAME= milter-greylist
6	PORTVERSION= 4.4.1	5	PORTVERSION= 4.4.3
7	CATEGORIES= mail	6	CATEGORIES= mail
8	MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/	7	MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \
		8	http://fossies.org/unix/privat/
9	EXTRACT_SUFX= .tgz	9	EXTRACT_SUFX= .tgz
10		10
11	MAINTAINER= m.tsatsenko@gmail.com	11	MAINTAINER= m.tsatsenko@gmail.com
12	COMMENT= Easy-to-use greylist milter for sendmail and postfix	12	COMMENT= Easy-to-use greylist milter for sendmail and postfix
13		13
		14	LICENSE= BSD
		15
14	CONFLICTS= milter-greylist-devel-[1-9].	16	CONFLICTS= milter-greylist-devel-[1-9].
15	PKGMESSAGE= ${WRKDIR}/pkg-message	17	PKGMESSAGE= ${WRKDIR}/pkg-message
16		18
Lines 27-42 Link Here
27	# installed port preference over it.	29	# installed port preference over it.
28	##	30	##
29		31
30	OPTIONS_DEFINE= SPF GEOIP CURL OPENLDAP P0F POSTFIX	32	OPTIONS_DEFINE= MANPAGES SPF GEOIP CURL LDAP P0F POSTFIX
31	OPTIONS_DEFAULT= MANPAGES	33	OPTIONS_DEFAULT= MANPAGES
32	MANPAGES_DESC= Install manpages	34	SPF_DESC= SPF support
33	SPF_DESC= Include SPF support	35	CURL_DESC= curl support
34	GEOIP_DESC= Include GeoIP support	36	P0F_DESC= P0F support
35	OPENLDAP_DESC= Include OpenLDAP support	37	POSTFIX_DESC= Use Postfix instead of Sendmail
36	P0F_DESC= Include P0F support
37	POSTFIX_DESC= Use Postfix instead of Sendmail
38		38
39	.include <bsd.port.pre.mk>	39	.include <bsd.port.options.mk>
40		40
41	.if ${PORT_OPTIONS:MMANPAGES}	41	.if ${PORT_OPTIONS:MMANPAGES}
42	MAN5= greylist.conf.5	42	MAN5= greylist.conf.5
Lines 54-66 Link Here
54	BUILD_DEPENDS+= curl>=7.18:${PORTSDIR}/ftp/curl	54	BUILD_DEPENDS+= curl>=7.18:${PORTSDIR}/ftp/curl
55	CONFIGURE_ARGS+= --with-libcurl=${LOCALBASE}	55	CONFIGURE_ARGS+= --with-libcurl=${LOCALBASE}
56	.endif	56	.endif
57	.if ${PORT_OPTIONS:MOPENLDAP}	57	.if ${PORT_OPTIONS:MLDAP}
58	USE_OPENLDAP=yes	58	USE_OPENLDAP=yes
59	CONFIGURE_ARGS+= --with-openldap	59	CONFIGURE_ARGS+= --with-openldap
60	.endif	60	.endif
61	.if ${PORT_OPTIONS:MP0F}	61	.if ${PORT_OPTIONS:MP0F}
62	RUN_DEPENDS+= p0f:${PORTSDIR}/net-mgmt/p0f	62	RUN_DEPENDS+= p0f:${PORTSDIR}/net-mgmt/p0f
63	CONFIGURE_ARGS+= --enable-p0f	63	CONFIGURE_ARGS+= --enable-p0f306
64	.endif	64	.endif
65	.if ${PORT_OPTIONS:MPOSTFIX}	65	.if ${PORT_OPTIONS:MPOSTFIX}
66	CONFIGURE_ARGS+= --enable-postfix	66	CONFIGURE_ARGS+= --enable-postfix
Lines 85-91 Link Here
85		85
86	do-install:	86	do-install:
87	@${MKDIR} ${PREFIX}/etc/mail	87	@${MKDIR} ${PREFIX}/etc/mail
88	.if defined (WITH_MANPAGES)	88	.if ${PORT_OPTIONS:MMANPAGES}
89	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5	89	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
90	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8	90	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
91	.endif	91	.endif
Lines 96-106 Link Here
96	post-install:	96	post-install:
97	@${MKDIR} /var/milter-greylist	97	@${MKDIR} /var/milter-greylist
98	@${CHOWN} -R mailnull:mailnull /var/milter-greylist	98	@${CHOWN} -R mailnull:mailnull /var/milter-greylist
99	.if !${PORT_OPTIONS:MDOCS}	99	.if ${PORT_OPTIONS:MDOCS}
100	@${MKDIR} ${DOCSDIR}	100	@${MKDIR} ${DOCSDIR}
101	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	101	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
102	.endif	102	.endif
103	.if !defined (NOPORTEXAMPLES)	103	.if ${PORT_OPTIONS:MEXAMPLES}
104	@${MKDIR} ${EXAMPLESDIR}	104	@${MKDIR} ${EXAMPLESDIR}
105	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}	105	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
106	.endif	106	.endif
Lines 122-125 Link Here
122		122
123	.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"	123	.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
124		124
125	.include <bsd.port.post.mk>	125	.include <bsd.port.mk>

Line 0 Link Here

(-)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: