6 files changed, 148 insertions, 32 deletions

diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile
index 161fef12f153..008fcd3244f8 100644
--- a/mail/milter-greylist-devel/Makefile
+++ b/mail/milter-greylist-devel/Makefile
@@ -1,50 +1,99 @@
-# New ports collection makefile for:	milter-greylist-devel
-# Date created:				11 Dec 2004
+# New ports collection makefile for:	milter-greylist
+# Date created:				27 Apr 2004
 # Whom:					Cyril Guibourg
 #
 # $FreeBSD$
 #
 
-PORTNAME=	milter-greylist-devel
-DISTVERSION=	4.3.4
+PORTNAME=	milter-greylist
+PORTVERSION=	4.3.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
-DISTNAME=	milter-greylist-${DISTVERSION}
+PKGNAMESUFFIX=	-devel
+DISTNAME=	milter-greylist-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	pgollucci@FreeBSD.org
-COMMENT=	Easy-to-use greylist milter for sendmail (development)
+MAINTAINER=	ache@FreeBSD.org
+COMMENT=	Easy-to-use greylist milter for sendmail and postfix (development)
+
+CONFLICTS=	milter-greylist-4.2.*
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAKE_JOBS_UNSAFE=	yes
 
+OPTIONS=	LIBSPF2 "Include SPF support" off\
+		GEOIP "Include GeoIP support" off\
+		CURL "Include curl support" off\
+		OPENLDAP "Include OpenLDAP support" off\
+		POSTFIX "Use Postfix instead of Sendmail" off
+
+.include <bsd.port.pre.mk>
+
+##
+# Use the following quirks to choose which sendmail to use (ports or system):
+#
+#   WITH_SENDMAIL_BASE=yes
+# or
+#   WITH_SENDMAIL_PORT=yes
+#
+# If unspecified, check for an up-to-date system version but give an
+# installed port preference over it.
+##
+
 MAN5=		greylist.conf.5
 MAN8=		milter-greylist.8
 
+##
+# If you have a reentrant resolver (starting with RELENG_5_2) you can use SPF
+##
+.if defined(WITH_LIBSPF2)
+BUILD_DEPENDS+=	libspf2>=1.2.5:${PORTSDIR}/mail/libspf2
+CONFIGURE_ARGS+=	--with-libspf2=${LOCALBASE}
+.endif
+.if defined(WITH_GEOIP)
+BUILD_DEPENDS+=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
+CONFIGURE_ARGS+=	--with-libGeoIP=${LOCALBASE}
+.endif
+.if defined(WITH_CURL)
+BUILD_DEPENDS+=	curl>=7.18:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+=	--with-libcurl=${LOCALBASE}
+.endif
+.if defined(WITH_OPENLDAP)
+USE_OPENLDAP=yes
+CONFIGURE_ARGS+=	--with-openldap
+.endif
+.if defined(WITH_POSTFIX)
+CONFIGURE_ARGS+=	--enable-postfix
+.else
+LDFLAGS+=	${SENDMAIL_LDFLAGS}
+LIBS+=		${SENDMAIL_LDADD}
+.endif
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+
 CFLAGS+=	${PTHREAD_CFLAGS}
 LIBS+=		${PTHREAD_LIBS}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-user=smmsp
-CONFIGURE_ENV+=	LIBS="${LIBS}"
+CONFIGURE_ARGS+=	--with-user=mailnull --with-libmilter=${MILTERBASE} \
+			--enable-dnsrbl --with-thread-safe-resolver
+CONFIGURE_ENV+=	LIBS="${LIBS} "
 
 ALL_TARGET=	milter-greylist
-
-USE_RC_SUBR=	milter-greylist
 SUB_FILES+=	pkg-message
 
-CONFLICTS=	milter-greylist-[1-9]*.*
+USE_RC_SUBR=	milter-greylist
 
 do-install:
 	@${MKDIR} ${PREFIX}/etc/mail
-	@${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
 	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
+	@${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/libexec
 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf \
 			${PREFIX}/etc/mail/greylist.conf.sample
 
 post-install:
 	@${MKDIR} /var/milter-greylist
-	@${CHOWN} smmsp /var/milter-greylist
+	@${CHOWN} -R mailnull /var/milter-greylist
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
@@ -54,18 +103,21 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
 .endif
 	@${TEST} -f /var/db/milter-greylist/greylist.db && ( \
-		${ECHO} "***********************************************************"; \
-		${ECHO} "***********************************************************"; \
-		${ECHO} "**                                                       **"; \
-		${ECHO} "**                      WARNING                          **"; \
-		${ECHO} "**                                                       **"; \
-		${ECHO} "** The default dump file location has changed.           **"; \
-		${ECHO} "** Please move greylist.db from /var/db/milter-greylist/ **"; \
-		${ECHO} "** to /var/milter-greylist/                              **"; \
-		${ECHO} "**                                                       **"; \
-		${ECHO} "***********************************************************"; \
-		${ECHO} "***********************************************************"; \
+		${ECHO} "************************************************************"; \
+		${ECHO} "************************************************************"; \
+		${ECHO} "**                                                        **"; \
+		${ECHO} "**                        WARNING                         **"; \
+		${ECHO} "**                                                        **"; \
+		${ECHO} "** The default dump file location has changed.            **"; \
+		${ECHO} "** Please move greylist.db from /var/db/milter-greylist/  **"; \
+		${ECHO} "** to /var/milter-greylist/ and update your greylist.conf **"; \
+		${ECHO} "** accordingly.                                           **"; \
+		${ECHO} "**                                                        **"; \
+		${ECHO} "************************************************************"; \
+		${ECHO} "************************************************************"; \
 	) || ${TRUE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
+
+.include <bsd.port.post.mk>
diff --git a/mail/milter-greylist-devel/distinfo b/mail/milter-greylist-devel/distinfo
index e8c28f0d3d31..358facb31701 100644
--- a/mail/milter-greylist-devel/distinfo
+++ b/mail/milter-greylist-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (milter-greylist-4.3.4.tgz) = b3f5729510af0a9adc66d6baca35c84d
-SHA256 (milter-greylist-4.3.4.tgz) = 937491eb3baae3697974e115344f8430e9d3e181d2a630117d8745ed0d0942f0
-SIZE (milter-greylist-4.3.4.tgz) = 216531
+MD5 (milter-greylist-4.3.5.tgz) = 66fc347ddda423d0047dc96f6e26db7c
+SHA256 (milter-greylist-4.3.5.tgz) = 16987d5d68315c61c767ebceba039b9c48f4e97a53a28f3e821d3c4db4009a55
+SIZE (milter-greylist-4.3.5.tgz) = 218787
diff --git a/mail/milter-greylist-devel/files/patch-configure b/mail/milter-greylist-devel/files/patch-configure
new file mode 100644
index 000000000000..de73967a3375
--- /dev/null
+++ b/mail/milter-greylist-devel/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig	2009-08-14 04:31:15.000000000 +0400
++++ configure	2009-08-24 02:07:12.000000000 +0400
+@@ -6387,7 +6387,7 @@
+ { $as_echo "$as_me:$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
+-  LIBS="$LIBS -lpthread"
++  true; #LIBS="$LIBS -lpthread"
+ else
+   { $as_echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
+ $as_echo_n "checking for pthread_create in -lc_r... " >&6; }
+@@ -7168,13 +7168,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:$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:$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 >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/mail/milter-greylist-devel/files/patch-greylist.conf b/mail/milter-greylist-devel/files/patch-greylist.conf
new file mode 100644
index 000000000000..6a0c17360e28
--- /dev/null
+++ b/mail/milter-greylist-devel/files/patch-greylist.conf
@@ -0,0 +1,11 @@
+--- greylist.conf.orig	2009-02-13 01:39:01.000000000 +0300
++++ greylist.conf	2009-04-22 09:10:46.000000000 +0400
+@@ -9,7 +9,7 @@
+ socket "/var/milter-greylist/milter-greylist.sock"
+ dumpfile "/var/milter-greylist/greylist.db" 600
+ dumpfreq 1
+-user "smmsp"
++user "mailnull"
+ 
+ # Log milter-greylist activity to a file
+ #stat ">>/var/milter-greylist/greylist.log" \
diff --git a/mail/milter-greylist-devel/files/patch-ldapcheck.c b/mail/milter-greylist-devel/files/patch-ldapcheck.c
new file mode 100644
index 000000000000..89f6bbc6b3ad
--- /dev/null
+++ b/mail/milter-greylist-devel/files/patch-ldapcheck.c
@@ -0,0 +1,25 @@
+--- 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;
diff --git a/mail/milter-greylist-devel/pkg-plist b/mail/milter-greylist-devel/pkg-plist
index d5e2cb2e5b4d..41254f195013 100644
--- a/mail/milter-greylist-devel/pkg-plist
+++ b/mail/milter-greylist-devel/pkg-plist
@@ -1,10 +1,10 @@
-bin/milter-greylist
+libexec/milter-greylist
 etc/mail/greylist.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/greylist.conf
 @exec /bin/mkdir -p /var/milter-greylist
-@exec /usr/sbin/chown smmsp /var/milter-greylist
-@exec [ -f /var/db/milter-greylist/greylist.db ] && printf '\n*\n************************************************************\n************************************************************\n***                                                       **\n***                      WARNING                          **\n***                                                       **\n*** The default dump file location has changed.           **\n*** Please move greylist.db from /var/db/milter-greylist/ **\n*** to /var/milter-greylist/                              **\n***                                                       **\n************************************************************\n************************************************************\n' ||true
+@exec /usr/sbin/chown -R mailnull /var/milter-greylist
+@exec [ -f /var/db/milter-greylist/greylist.db ] && printf '\n\n************************************************************\n************************************************************\n**                                                        **\n**                        WARNING                         **\n**                                                        **\n** The default dump file location has changed.            **\n** Please move greylist.db from /var/db/milter-greylist/  **\n** to /var/milter-greylist/ and update your greylist.conf **\n** accordingly.                                           **\n**                                                        **\n************************************************************\n************************************************************\n' ||true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry etc/mail