diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2006-12-10 05:10:38 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2006-12-10 05:10:38 +0000 |
commit | e455ffcf58071920cb8267d9e2912237226d0735 (patch) | |
tree | c510db2f4a95fd775641b6b612f9b7052c763996 /mail/milter-greylist | |
parent | - Updated email address in my ports (diff) |
Upgrade to 3.0
Notes
Notes:
svn path=/head/; revision=179350
Diffstat (limited to 'mail/milter-greylist')
-rw-r--r-- | mail/milter-greylist/Makefile | 17 | ||||
-rw-r--r-- | mail/milter-greylist/distinfo | 6 | ||||
-rw-r--r-- | mail/milter-greylist/files/milter-greylist.in | 4 | ||||
-rw-r--r-- | mail/milter-greylist/files/milter-greylist.sh | 4 | ||||
-rw-r--r-- | mail/milter-greylist/files/patch-configure | 11 | ||||
-rw-r--r-- | mail/milter-greylist/files/patch-greylist.conf | 11 | ||||
-rw-r--r-- | mail/milter-greylist/files/pkg-message.in | 21 | ||||
-rw-r--r-- | mail/milter-greylist/pkg-message | 21 | ||||
-rw-r--r-- | mail/milter-greylist/pkg-plist | 2 |
9 files changed, 71 insertions, 26 deletions
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index 53a663d6e8de..abec39329494 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -6,7 +6,7 @@ # PORTNAME= milter-greylist -PORTVERSION= 2.0.2 +PORTVERSION= 3.0 CATEGORIES= mail MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ DISTNAME= milter-greylist-${PORTVERSION} @@ -16,6 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Easy-to-use greylist milter for sendmail CONFLICTS= milter-greylist-devel-[1-9]*.* +PKGMESSAGE= ${WRKDIR}/pkg-message ## # Use the following quirks to choose which sendmail to use (ports or system): @@ -67,7 +68,10 @@ LIBS+= ${PTHREAD_LIBS} GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --with-user=smmsp --with-libmilter=${MILTERBASE} +CONFIGURE_ARGS+= --with-user=mailnull --with-libmilter=${MILTERBASE} +.if ${OSVERSION} >= 502102 +CONFIGURE_ARGS+= --enable-dnsrbl +.endif CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LIBS="${LIBS} " ALL_TARGET= milter-greylist @@ -81,23 +85,25 @@ post-extract: do-install: @${MKDIR} ${PREFIX}/etc/mail - @${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/libexec @${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5 @${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8 @${INSTALL_DATA} ${WRKSRC}/greylist.conf \ ${PREFIX}/etc/mail/greylist.conf.sample @${INSTALL_SCRIPT} ${WRKSRC}/milter-greylist.sh ${PREFIX}/etc/rc.d/ + @${SED} -e "s,%%DOCSDIR%%,${DOCSDIR},g" \ + -e "s,%%PREFIX%%,${PREFIX},g" \ + ${.CURDIR}/pkg-message > ${PKGMESSAGE} post-install: @${MKDIR} /var/milter-greylist - @${CHOWN} smmsp /var/milter-greylist + @${CHOWN} -R mailnull /var/milter-greylist .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR} .endif - @${TEST} -f /var/db/milter-greylist/greylist.db && ( \ ${ECHO} "************************************************************"; \ ${ECHO} "************************************************************"; \ @@ -112,7 +118,6 @@ post-install: ${ECHO} "************************************************************"; \ ${ECHO} "************************************************************"; \ ) || ${TRUE} - @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo index 48ed6fdb3c47..1e5c612be67d 100644 --- a/mail/milter-greylist/distinfo +++ b/mail/milter-greylist/distinfo @@ -1,3 +1,3 @@ -MD5 (milter-greylist-2.0.2.tgz) = 3b407107760b09bd554fb7dc5c5a3854 -SHA256 (milter-greylist-2.0.2.tgz) = e5090acc43d9438f5a4d94ddea7e3a1d8cf73b89b6c7492465ad2742c162dcff -SIZE (milter-greylist-2.0.2.tgz) = 116459 +MD5 (milter-greylist-3.0.tgz) = ffdd5588c78a405c107d4c8a40c7e01a +SHA256 (milter-greylist-3.0.tgz) = 8962c29b730eb024e83d142f8c2ff36ffc41b65f6111ca6707752173b25c8cd0 +SIZE (milter-greylist-3.0.tgz) = 141461 diff --git a/mail/milter-greylist/files/milter-greylist.in b/mail/milter-greylist/files/milter-greylist.in index 15524546d05d..3ce90bbb90da 100644 --- a/mail/milter-greylist/files/milter-greylist.in +++ b/mail/milter-greylist/files/milter-greylist.in @@ -22,13 +22,13 @@ rcvar=`set_rcvar` load_rc_config $name miltergreylist_enable=${miltergreylist_enable-"NO"} -miltergreylist_runas=${miltergreylist_runas-"smmsp"} +miltergreylist_runas=${miltergreylist_runas-"mailnull"} miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"} miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"} miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"} miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \ -f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"} -command="%%PREFIX%%/bin/milter-greylist" +command="%%PREFIX%%/libexec/milter-greylist" run_rc_command "$1" diff --git a/mail/milter-greylist/files/milter-greylist.sh b/mail/milter-greylist/files/milter-greylist.sh index 15524546d05d..3ce90bbb90da 100644 --- a/mail/milter-greylist/files/milter-greylist.sh +++ b/mail/milter-greylist/files/milter-greylist.sh @@ -22,13 +22,13 @@ rcvar=`set_rcvar` load_rc_config $name miltergreylist_enable=${miltergreylist_enable-"NO"} -miltergreylist_runas=${miltergreylist_runas-"smmsp"} +miltergreylist_runas=${miltergreylist_runas-"mailnull"} miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"} miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"} miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"} miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \ -f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"} -command="%%PREFIX%%/bin/milter-greylist" +command="%%PREFIX%%/libexec/milter-greylist" run_rc_command "$1" diff --git a/mail/milter-greylist/files/patch-configure b/mail/milter-greylist/files/patch-configure new file mode 100644 index 000000000000..63ca97790b5f --- /dev/null +++ b/mail/milter-greylist/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Mon Nov 20 23:51:36 2006 ++++ configure Sun Dec 10 00:08:47 2006 +@@ -5518,7 +5518,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 + echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 + if test $ac_cv_lib_pthread_pthread_create = yes; then +- LIBS="$LIBS -lpthread" ++true;# LIBS="$LIBS -lpthread" + else + echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5 + echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6 diff --git a/mail/milter-greylist/files/patch-greylist.conf b/mail/milter-greylist/files/patch-greylist.conf new file mode 100644 index 000000000000..f9087fa92ab8 --- /dev/null +++ b/mail/milter-greylist/files/patch-greylist.conf @@ -0,0 +1,11 @@ +--- greylist.conf.bak Thu Sep 28 00:03:24 2006 ++++ greylist.conf Sun Dec 10 04:58:58 2006 +@@ -8,7 +8,7 @@ + pidfile "/var/run/milter-greylist.pid" + socket "/var/milter-greylist/milter-greylist.sock" + dumpfile "/var/milter-greylist/greylist.db" +-user "smmsp" ++user "mailnull" + + # Be verbose (or use -v flag) + #verbose diff --git a/mail/milter-greylist/files/pkg-message.in b/mail/milter-greylist/files/pkg-message.in index 398094ce4230..840fd10d3827 100644 --- a/mail/milter-greylist/files/pkg-message.in +++ b/mail/milter-greylist/files/pkg-message.in @@ -1,10 +1,19 @@ ===> IMPORTANT NOTE - A sample configuration file has been installed in ${PREFIX}/etc/mail - directory. Copy and edit it to suit your needs before launching - milter-greylist. + A sample configuration file has been installed in %%PREFIX%%/etc/mail + directory. Copy and edit it to suit your needs before launching + milter-greylist. - To run milter-greylist from startup, add miltergreylist_enable="YES" - in your /etc/rc.conf or your /etc/rc.conf.local + Add following lines + +define(`confMILTER_MACROS_HELO', confMILTER_MACROS_HELO``, {verify}'') +define(`confMILTER_MACROS_ENVRCPT', confMILTER_MACROS_ENVRCPT``, {greylist}'') +INPUT_MAIL_FILTER(`greylist', `S=local:/var/milter-greylist/milter-greylist.sock, F=T, T=R:30s') + + to your /etc/mail/<your_host>.mc configuration. + + To run milter-greylist from startup, add miltergreylist_enable="YES" + in your /etc/rc.conf or your /etc/rc.conf.local + + See %%DOCSDIR%%/README for operation details. - See ${DOCSDIR}/README for operation details. diff --git a/mail/milter-greylist/pkg-message b/mail/milter-greylist/pkg-message index 398094ce4230..840fd10d3827 100644 --- a/mail/milter-greylist/pkg-message +++ b/mail/milter-greylist/pkg-message @@ -1,10 +1,19 @@ ===> IMPORTANT NOTE - A sample configuration file has been installed in ${PREFIX}/etc/mail - directory. Copy and edit it to suit your needs before launching - milter-greylist. + A sample configuration file has been installed in %%PREFIX%%/etc/mail + directory. Copy and edit it to suit your needs before launching + milter-greylist. - To run milter-greylist from startup, add miltergreylist_enable="YES" - in your /etc/rc.conf or your /etc/rc.conf.local + Add following lines + +define(`confMILTER_MACROS_HELO', confMILTER_MACROS_HELO``, {verify}'') +define(`confMILTER_MACROS_ENVRCPT', confMILTER_MACROS_ENVRCPT``, {greylist}'') +INPUT_MAIL_FILTER(`greylist', `S=local:/var/milter-greylist/milter-greylist.sock, F=T, T=R:30s') + + to your /etc/mail/<your_host>.mc configuration. + + To run milter-greylist from startup, add miltergreylist_enable="YES" + in your /etc/rc.conf or your /etc/rc.conf.local + + See %%DOCSDIR%%/README for operation details. - See ${DOCSDIR}/README for operation details. diff --git a/mail/milter-greylist/pkg-plist b/mail/milter-greylist/pkg-plist index 5a9dc9d00a92..809895e7f9a4 100644 --- a/mail/milter-greylist/pkg-plist +++ b/mail/milter-greylist/pkg-plist @@ -1,4 +1,4 @@ -bin/milter-greylist +libexec/milter-greylist etc/mail/greylist.conf.sample etc/rc.d/milter-greylist.sh %%PORTDOCS%%%%DOCSDIR%%/README |