diff options
Diffstat (limited to 'mail/milter-sender')
-rw-r--r-- | mail/milter-sender/Makefile | 23 | ||||
-rw-r--r-- | mail/milter-sender/distinfo | 6 | ||||
-rw-r--r-- | mail/milter-sender/files/patch-Error.c | 12 | ||||
-rw-r--r-- | mail/milter-sender/files/patch-ab | 30 | ||||
-rw-r--r-- | mail/milter-sender/files/patch-ac | 23 | ||||
-rw-r--r-- | mail/milter-sender/files/patch-flip.c | 12 | ||||
-rw-r--r-- | mail/milter-sender/pkg-plist | 7 |
7 files changed, 45 insertions, 68 deletions
diff --git a/mail/milter-sender/Makefile b/mail/milter-sender/Makefile index 841e3e05d9dd..6ce8f6201d50 100644 --- a/mail/milter-sender/Makefile +++ b/mail/milter-sender/Makefile @@ -6,10 +6,10 @@ # PORTNAME= milter-sender -PORTVERSION= 0.49 +PORTVERSION= 0.50 CATEGORIES= mail MASTER_SITES= http://www.snert.com/Software/download/ -DISTFILES= libsnert-1.29.tgz milter-sender-${PORTVERSION}.tgz +DISTFILES= libsnert-1.31.tgz milter-sender-${PORTVERSION}.tgz MAINTAINER= ache@FreeBSD.org COMMENT= Real-time sender address verification, based on Milter API @@ -27,18 +27,19 @@ MAKEFILE= makefile IGNORE= requires Sendmail 8.12 .endif .if exists(${LOCALBASE}/lib/libmilter.a) -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} DOCS= CHANGES.TXT index.shtml style.css mailto.js \ license-body.html LICENSE.TXT milter-sender.mc CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS+= --with-db --localstatedir=/var -MAKE_ENV+= PREFIX="${PREFIX}" +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS+= --with-db --localstatedir=/var \ + --enable-milter-cf="${PREFIX}/etc/milter-sender.cf" pre-configure: @cd ${WRKSRC}/../lib && \ @@ -60,17 +61,9 @@ post-install: @cd ${WRKSRC}/Img && \ ${INSTALL_DATA} *.gif *.png ${DOCSDIR}/Img .endif - @if [ ! -f ${PREFIX}/etc/rc.d/milter-sender.sh ] ; then \ - ${CP} ${PREFIX}/etc/rc.d/milter-sender.sh-dist ${PREFIX}/etc/rc.d/milter-sender.sh; \ - ${CHMOD} ug+x ${PREFIX}/etc/rc.d/milter-sender.sh; \ - fi @${CAT} ${PKGMESSAGE} post-deinstall: - @if [ -f ${PREFIX}/etc/rc.d/milter-sender.sh ] && \ - cmp -s ${PREFIX}/etc/rc.d/milter-sender.sh ${PREFIX}/etc/rc.d/milter-sender.sh-dist; then \ - ${RM} -f ${PREFIX}/etc/rc.d/milter-sender.sh; \ - fi @${ECHO_MSG} "" @${ECHO_MSG} "Do not forget to delete the filter description from /etc/mail/YOUR-CONF.mc" @${ECHO_MSG} "and rebuild sendmail.cf file!" diff --git a/mail/milter-sender/distinfo b/mail/milter-sender/distinfo index 28d310f0e8de..1d0f6029325b 100644 --- a/mail/milter-sender/distinfo +++ b/mail/milter-sender/distinfo @@ -1,2 +1,4 @@ -MD5 (libsnert-1.29.tgz) = d2a05e3983e33b3df206a807f644a617 -MD5 (milter-sender-0.49.tgz) = 3ee04e8d871d533af62eba707e14aef3 +MD5 (libsnert-1.31.tgz) = 8446930e803200f30518b950a5c69f8a +SIZE (libsnert-1.31.tgz) = 181926 +MD5 (milter-sender-0.50.tgz) = 8d4d0cb37935aa867a92bbafec476910 +SIZE (milter-sender-0.50.tgz) = 207473 diff --git a/mail/milter-sender/files/patch-Error.c b/mail/milter-sender/files/patch-Error.c deleted file mode 100644 index df017e092c4e..000000000000 --- a/mail/milter-sender/files/patch-Error.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ../lib/io/Error.c.orig Fri Dec 19 22:34:10 2003 -+++ ../lib/io/Error.c Fri Dec 19 22:42:34 2003 -@@ -110,8 +110,7 @@ - if (fmt == (const char *) 0) - fmt = "Terminated for unknown reason."; - -- ErrorPrintV(file, line, fmt, args); -- ErrorPrintV(file, line, "\r\n", (va_list) 0); -+ ErrorPrintLineV(file, line, fmt, args); - exit(1); - } - diff --git a/mail/milter-sender/files/patch-ab b/mail/milter-sender/files/patch-ab index bb22a464385a..4e0435c463f3 100644 --- a/mail/milter-sender/files/patch-ab +++ b/mail/milter-sender/files/patch-ab @@ -1,27 +1,29 @@ ---- install.sh.orig Mon Sep 29 12:05:54 2003 -+++ install.sh Fri Dec 5 02:27:25 2003 -@@ -17,20 +17,18 @@ +--- install.sh.in.orig Mon Feb 9 15:28:36 2004 ++++ install.sh.in Fri Feb 13 00:05:50 2004 +@@ -17,19 +17,20 @@ chown ${USER} ${STATEDIR} chgrp ${GROUP} ${STATEDIR} --cp -f ${MILTER} ${BINDIR} --chown ${USER} ${BINDIR}/${MILTER} --chgrp ${GROUP} ${BINDIR}/${MILTER} -+install -s ${MILTER} ${BINDIR} -+#chown ${USER} ${BINDIR}/${MILTER} -+#chgrp ${GROUP} ${BINDIR}/${MILTER} - - chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* +-cp -f ${MILTER} ${SBINDIR} ++install -s ${MILTER} ${SBINDIR} +-./milter-sender help=1 >${MILTER_CF}.sample +-chmod g+r ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample* +-chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample* ++./milter-sender help=1 | sed 's|^MilterSocket=.*|MilterSocket=unix:/var/milter-sender/socket|' >${MILTER_CF}.sample ++[ ! -f ${MILTER_CF} ] && cp ${MILTER_CF}.sample ${MILTER_CF} ++chmod g+r ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}* ++chgrp ${GROUP} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}* case `uname -s` in *BSD*) -- RC="/usr/local/etc/rc.d/${MILTER}.sh" + RC="${prefix}/etc/rc.d/${MILTER}.sh" - if [ ! -f $RC ]; then -+ RC="${PREFIX}/etc/rc.d/${MILTER}.sh-dist" ++# if [ ! -f $RC ]; then cp ${MILTER}.sh $RC - chmod 640 $RC + chmod 540 $RC - fi ++# fi ;; Linux*) if [ -d '/etc/rc.d/init.d' ]; then diff --git a/mail/milter-sender/files/patch-ac b/mail/milter-sender/files/patch-ac index 815f6bf3f717..010b9f61b360 100644 --- a/mail/milter-sender/files/patch-ac +++ b/mail/milter-sender/files/patch-ac @@ -1,5 +1,5 @@ ---- milter-sender.sh.in.bak Sat Nov 15 11:37:20 2003 -+++ milter-sender.sh.in Mon Nov 17 11:54:53 2003 +--- milter-sender.sh.in.orig Fri Jan 23 14:38:00 2004 ++++ milter-sender.sh.in Fri Jan 30 15:25:06 2004 @@ -68,34 +68,24 @@ start() { @@ -39,13 +39,16 @@ pid=`getpid "$PROGRAM"` if [ X"$pid" != X ]; then -@@ -109,12 +99,12 @@ - sleep 2 - pid=`getpid "$PROGRAM"` - if [ X"$pid" != X ]; then -- printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n' -+ echo " milter-sender:FAILED" - return +@@ -112,7 +102,7 @@ + kill -KILL $pid + + if [ X"$pid" != X ]; then +- printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n' ++ echo " milter-sender:FAILED" + return + fi + +@@ -131,7 +121,7 @@ fi fi @@ -54,7 +57,7 @@ } case "$1" in -@@ -131,9 +121,9 @@ +@@ -148,9 +138,9 @@ status) pid=`getpid "$PROGRAM"` if [ X"$pid" != X ]; then diff --git a/mail/milter-sender/files/patch-flip.c b/mail/milter-sender/files/patch-flip.c deleted file mode 100644 index 1a5cc344f1f5..000000000000 --- a/mail/milter-sender/files/patch-flip.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ../tools/flip.c.orig Fri Dec 19 23:10:59 2003 -+++ ../tools/flip.c Fri Dec 19 23:11:48 2003 -@@ -154,8 +154,7 @@ - if (fmt == (const char *) 0) - fmt = "Terminated for unknown reason."; - -- ErrorPrintV(file, line, fmt, args); -- ErrorPrintV(file, line, "\r\n", (va_list) 0); -+ ErrorPrintLineV(file, line, fmt, args); - exit(1); - } - diff --git a/mail/milter-sender/pkg-plist b/mail/milter-sender/pkg-plist index c60399c3ccb9..9b4c0fddb1fd 100644 --- a/mail/milter-sender/pkg-plist +++ b/mail/milter-sender/pkg-plist @@ -1,6 +1,7 @@ -@unexec if [ -f %D/etc/rc.d/milter-sender.sh ] && cmp -s %D/etc/rc.d/milter-sender.sh %D/etc/rc.d/milter-sender.sh-dist; then rm -f %D/etc/rc.d/milter-sender.sh; fi -etc/rc.d/milter-sender.sh-dist -@exec if [ ! -f %D/etc/rc.d/milter-sender.sh ] ; then cp %D/%F %B/milter-sender.sh; chmod ug+x %B/milter-sender.sh; fi +@unexec if [ -f %D/etc/milter-sender.cf ] && cmp -s %D/etc/milter-sender.cf %D/etc/milter-sender.cf.sample; then rm -f %D/etc/milter-sender.cf; fi +etc/milter-sender.cf.sample +@exec if [ ! -f %D/etc/milter-sender.cf ] ; then cp %D/%F %B/milter-sender.cf; fi +etc/rc.d/milter-sender.sh sbin/milter-sender @exec install -d -o smmsp -g smmsp -m 755 /var/milter-sender @unexec rm -rf /var/milter-sender |