Date: Mon, 23 May 2005 20:51:28 +0200 (CEST) From: Victor Balada Diaz <victor@alf.dyndns.ws> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/81417: Update port: mail/milter-bogom to 1.7.1 Message-ID: <200505231851.j4NIpSHE012006@alf.dyndns.ws> Resent-Message-ID: <200505231900.j4NJ0Hvj069163@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81417 >Category: ports >Synopsis: Update port: mail/milter-bogom to 1.7.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 23 19:00:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Victor Balada Diaz >Release: FreeBSD 5.3-RELEASE-p15 i386 >Organization: >Environment: System: FreeBSD alf.dyndns.ws 5.3-RELEASE-p15 FreeBSD 5.3-RELEASE-p15 #3: Wed May 18 23:52:03 CEST 2005 victor@equilibrium.euesrg02.net:/usr/obj/usr/src/sys/EQUILIBRIUM i386 >Description: Update to bogom 1.7.1. Use rc.subr for the start script instead of the old plain sh script. Use the user bogomilter to run the milter. >How-To-Repeat: >Fix: --- milter.patch begins here --- diff -ruN --exclude=CVS --exclude=.svn milter-bogom/Makefile ../../../src/workdir/milter-bogom/Makefile --- milter-bogom/Makefile Tue Feb 15 22:25:44 2005 +++ ../../../src/workdir/milter-bogom/Makefile Sun Apr 17 18:34:36 2005 @@ -6,9 +6,10 @@ # PORTNAME= milter-bogom -PORTVERSION= 1.5.1 +PORTVERSION= 1.7.1 CATEGORIES= mail -MASTER_SITES= http://www.usebox.net/jjm/bogom/ +MASTER_SITES= http://www.usebox.net/jjm/bogom/ \ + http://blackshell.usebox.net/bogom/ DISTNAME= bogom-${PORTVERSION} MAINTAINER= victor@alf.dyndns.ws @@ -18,16 +19,16 @@ MAN8= bogom.8 +CFLAGS+= -DDEF_CONF=\\\"${PREFIX}/etc/bogom.conf\\\" ${PTHREAD_CFLAGS} +LIBS+= -lmilter ${PTHREAD_LIBS} +MAKE_ARGS= LIBS="${LIBS}" + +USE_RC_SUBR= yes + PLIST_FILES= sbin/bogom \ etc/bogom.conf-example \ etc/rc.d/milter-bogom.sh -PORTDOCS= README CHANGELOG - -post-extract: - @${SED} -e 's/LIBS+=-lmilter -lpthread/LIBS+=-lmilter ${PTHREAD_LIBS}/'\ - -i .bak ${WRKSRC}/Makefile - @${SED} -e 's|/etc/bogom.conf|${PREFIX}/etc/bogom.conf|' -i .bak \ - ${WRKSRC}/milter.c +PORTDOCS= README CHANGELOG COPYING do-install: @${INSTALL_PROGRAM} ${WRKSRC}/bogom ${PREFIX}/sbin @@ -38,10 +39,14 @@ @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR} .endif post-install: - @${SED} -e 's|LOCALBASE|${PREFIX}|g' -i "" \ + @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' -i "" \ + ${PREFIX}/etc/rc.d/milter-bogom.sh + @${SED} -e 's|%%RC_SUBR%%|${RC_SUBR}|g' -i "" \ ${PREFIX}/etc/rc.d/milter-bogom.sh + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff -ruN --exclude=CVS --exclude=.svn milter-bogom/distinfo ../../../src/workdir/milter-bogom/distinfo --- milter-bogom/distinfo Tue Feb 15 22:25:44 2005 +++ ../../../src/workdir/milter-bogom/distinfo Sun Apr 17 18:34:47 2005 @@ -1,2 +1,2 @@ -MD5 (bogom-1.5.1.tar.gz) = 9dc9fc890819e22df3408b8a39837606 -SIZE (bogom-1.5.1.tar.gz) = 16868 +MD5 (bogom-1.7.1.tar.gz) = e8fa2a2c78ce866b4f23fedf6e0b8764 +SIZE (bogom-1.7.1.tar.gz) = 18862 diff -ruN --exclude=CVS --exclude=.svn milter-bogom/files/milter-bogom.sh ../../../src/workdir/milter-bogom/files/milter-bogom.sh --- milter-bogom/files/milter-bogom.sh Tue Feb 15 22:25:45 2005 +++ ../../../src/workdir/milter-bogom/files/milter-bogom.sh Mon Feb 28 07:06:11 2005 @@ -1,22 +1,42 @@ #!/bin/sh -case "$1" in - start) - if [ -f LOCALBASE/sbin/bogom ] - then - LOCALBASE/sbin/bogom -u root & > /dev/null - echo -n ' milter-bogom' - fi - ;; - stop) - killall bogom - sleep 3 # wait for bogom to exit - ;; - - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - ;; -esac -exit 0; +# PROVIDE: milterbogom +# REQUIRE: LOGIN +# BEFORE: sendmail +# KEYWORD: milterbogom + +milterbogom_enable=${milterbogom_enable-"NO"} +milterbogom_socket=${milterbogom_socket-"unix:/var/run/bogom/milter.sock"} +milterbogom_user=${milterbogom_user-"bogomilter"} +milterbogom_pid=${milterbogom_pid-"/var/run/bogom/bogom.pid"} +milterbogom_flags=${milterbogom_flags-"-u ${milterbogom_user} \ +-s ${milterbogom_socket} -p ${milterbogom_pid}"} + + +. %%RC_SUBR%% + +name=milterbogom +pidfile=${milterbogom_pid} +rcvar=`set_rcvar` +command=%%PREFIX%%/sbin/bogom +start_precmd="bogom_precmd" +stop_postcmd="bogom_postcmd" + +load_rc_config $name + +bogom_precmd() +{ + if [ -d `dirname ${milterbogom_pid}` ] + then + return; + fi + mkdir -p `dirname ${milterbogom_pid}` + chown ${milterbogom_user} `dirname ${milterbogom_pid}` +} + +bogom_postcmd() +{ + # just if the directory is empty + rmdir `dirname ${milterbogom_pid}` > /dev/null 2>&1 +} +run_rc_command "$1" diff -ruN --exclude=CVS --exclude=.svn milter-bogom/pkg-deinstall ../../../src/workdir/milter-bogom/pkg-deinstall --- milter-bogom/pkg-deinstall Thu Jan 1 01:00:00 1970 +++ ../../../src/workdir/milter-bogom/pkg-deinstall Mon Feb 28 07:06:11 2005 @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$2" = "POST-DEINSTALL" ] +then + echo "***************************************************************" + echo "* The bogomilter user will not be removed by this port *" + echo "* if you are not upgrading and will not use this port anymore *" + echo "* delete the bogomilter user using: *" + echo "* pw userdel bogomilter *" + echo "***************************************************************" +fi diff -ruN --exclude=CVS --exclude=.svn milter-bogom/pkg-install ../../../src/workdir/milter-bogom/pkg-install --- milter-bogom/pkg-install Thu Jan 1 01:00:00 1970 +++ ../../../src/workdir/milter-bogom/pkg-install Mon Feb 28 07:06:11 2005 @@ -0,0 +1,17 @@ +#!/bin/sh + +if [ "$2" != "POST-INSTALL" ] +then + exit 0; +fi + +# check if bogomilter user exists +pw user show bogomilter > /dev/null 2>&1 + +if [ $? != 0 ] +then + echo "===> Adding user bogomilter" + pw useradd bogomilter -u 174 -c "milter-bogom" +else + echo "===> Using existing user bogomilter" +fi --- milter.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505231851.j4NIpSHE012006>