Bug 176950

Description Hajimu UMEMOTO 2013-03-14 08:20:02 UTC

	Update mail/milter-greylist to latest stable

Fix: Please apply the attached patch.
	This patch updates mail/milter-greylist to 4.4.3.
	It also changes to use new OPTIONS framework and new header
	format.
	Further, it includes the fix to be able to specify IPv6
	address to syncsrcaddr.  The syncsrcaddr patch was sent to the
	author of milter-greylist.


--Multipart_Thu_Mar_14_17:17:36_2013-1
Content-Type: text/x-patch; type=patch; charset=US-ASCII
Content-Disposition: attachment; filename="milter-greylist.diff"
Content-Transfer-Encoding: 7bit



--Multipart_Thu_Mar_14_17:17:36_2013-1
Content-Type: text/plain; charset=US-ASCII


--
Hajimu UMEMOTO
ume@mahoroba.org  ume@{,jp.}FreeBSD.org
http://www.mahoroba.org/~ume/

--Multipart_Thu_Mar_14_17:17:36_2013-1----rWc8DKF7UxUOmKBD4QybhGXbZOb0lSHuc4oX3zh4aQUCobOs
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: Makefile
===================================================================
--- Makefile	(revision 314132)
+++ Makefile	(working copy)
@@ -1,33 +1,32 @@
-# New ports collection makefile for:	milter-greylist
-# Date created:				27 Apr 2004
-# Whom:					Cyril Guibourg
-#
+# Created by: Cyril Guibourg
 # $FreeBSD$
-#
 
 PORTNAME=	milter-greylist
-PORTVERSION=	4.2.7
+PORTVERSION=	4.4.3
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
-DISTNAME=	milter-greylist-${PORTVERSION}
+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
 
-OPTIONS=	MANPAGES "Install manpages" on\
-		LIBSPF2 "Include SPF support" off\
-		GEOIP "Include GeoIP support" off\
-		CURL "Include curl support" off\
-		OPENLDAP "Include OpenLDAP support" off\
-		P0F "Include P0F support" off\
-		POSTFIX "Use Postfix instead of Sendmail" off
+MAKE_JOBS_UNSAFE=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=		MANPAGES LIBSPF2 GEOIP CURL LDAP P0F POSTFIX
+OPTIONS_DEFAULT=	MANPAGES
+LIBSPF2_DESC=		SPF support
+CURL_DESC=		curl support
+P0F_DESC=		P0F support
+POSTFIX_DESC=		Use Postfix instead of Sendmail
 
+.include <bsd.port.options.mk>
+
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
@@ -39,7 +38,7 @@
 # installed port preference over it.
 ##
 
-.if defined (WITH_MANPAGES)
+.if ${PORT_OPTIONS:MMANPAGES}
 MAN5=		greylist.conf.5
 MAN8=		milter-greylist.8
 .endif
@@ -47,27 +46,27 @@
 ##
 # If you have a reentrant resolver (starting with RELENG_5_2) you can use SPF
 ##
-.if defined(WITH_LIBSPF2)
+.if ${PORT_OPTIONS:MLIBSPF2}
 BUILD_DEPENDS+=	libspf2>=1.2.5:${PORTSDIR}/mail/libspf2
 CONFIGURE_ARGS+=	--with-libspf2=${LOCALBASE}
 .endif
-.if defined(WITH_GEOIP)
+.if ${PORT_OPTIONS:MGEOIP}
 BUILD_DEPENDS+=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
 CONFIGURE_ARGS+=	--with-libGeoIP=${LOCALBASE}
 .endif
-.if defined(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
 BUILD_DEPENDS+=	curl>=7.18:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-libcurl=${LOCALBASE}
 .endif
-.if defined(WITH_OPENLDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=yes
 CONFIGURE_ARGS+=	--with-openldap
 .endif
-.if defined(WITH_P0F)
+.if ${PORT_OPTIONS:MP0F}
 RUN_DEPENDS+=	p0f:${PORTSDIR}/net-mgmt/p0f
-CONFIGURE_ARGS+=	--enable-p0f
+CONFIGURE_ARGS+=	--enable-p0f306
 .endif
-.if defined(WITH_POSTFIX)
+.if ${PORT_OPTIONS:MPOSTFIX}
 CONFIGURE_ARGS+=	--enable-postfix
 .else
 LDFLAGS+=	${SENDMAIL_LDFLAGS}
@@ -90,7 +89,7 @@
 
 do-install:
 	@${MKDIR} ${PREFIX}/etc/mail
-.if defined (WITH_MANPAGES)
+.if ${PORT_OPTIONS:MMANPAGES}
 	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
 	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
 .endif
@@ -101,11 +100,11 @@
 post-install:
 	@${MKDIR} /var/milter-greylist
 	@${CHOWN} -R mailnull:mailnull /var/milter-greylist
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-.if !defined (NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
 .endif
@@ -127,4 +126,4 @@
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 314132)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (milter-greylist-4.2.7.tgz) = 41e6cc88dcccb8e1993a58235111b34de26dcb071fa59e85b877ecb869950787
-SIZE (milter-greylist-4.2.7.tgz) = 213919
+SHA256 (milter-greylist-4.4.3.tgz) = fdf7e37c5dd370473ff2cdec7e4b6ca9e60fc2b5c716612d2d449de98d0054a9
+SIZE (milter-greylist-4.4.3.tgz) = 236277
Index: files/patch-configure
===================================================================
--- files/patch-configure	(revision 314132)
+++ files/patch-configure	(working copy)
@@ -1,28 +1,13 @@
---- configure.orig	2010-07-12 08:27:51.000000000 +0400
-+++ configure	2010-08-05 05:18:10.000000000 +0400
-@@ -4978,7 +4978,7 @@
+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" = x""yes; then :
+ 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; }
-@@ -5484,13 +5484,13 @@
- if test "${with_libdkim+set}" = set; then :
-   withval=$with_libdkim; LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"
- 	    CFLAGS=$CFLAGS" -I$withval/include"
--	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -ldkim -lsm -lcrypto" >&5
--$as_echo_n "checking for dkim_init in -ldkim -lsm -lcrypto... " >&6; }
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -ldkim -lcrypto" >&5
-+$as_echo_n "checking for dkim_init in -ldkim -lcrypto... " >&6; }
- if test "${ac_cv_lib_dkim__lsm__lcrypto_dkim_init+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldkim -lsm -lcrypto  $LIBS"
-+LIBS="-ldkim -lcrypto  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
Index: files/patch-sync.c
===================================================================
--- files/patch-sync.c	(revision 0)
+++ files/patch-sync.c	(working copy)
@@ -0,0 +1,17 @@
+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: