Date: Fri, 10 Sep 2004 20:10:31 GMT From: "David A. Koran" <dak@solo.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/71565: upgrade milter-sender 0.61.833 to 0.62.837 Message-ID: <200409102010.i8AKAVlX022283@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/71565; it has been noted by GNATS.
From: "David A. Koran" <dak@solo.net>
To: freebsd-gnats-submit@FreeBSD.org, dak@solo.net
Cc:
Subject: Re: ports/71565: upgrade milter-sender 0.61.833 to 0.62.837
Date: Fri, 10 Sep 2004 16:09:04 -0400
Updated patches: (for patch-ac, scratch it, comment out the calls to
accounce(), pass(), fail() and re-apply the text for startup and
shutdown messages from the original patch. The developer of
milter-sender now has proper FreeBSD calls in the code, but it needs to
be made ports-tree friendly)
patch-ab:
--- install.sh.in.orig Wed Aug 25 06:35:08 2004
+++ install.sh.in Fri Sep 10 15:09:59 2004
@@ -18,69 +18,21 @@
MAILDIR="@with_sendmail@"
MILTER_CF="@milter_cf@"
-if [ ! -d ${STATEDIR} ]; then
- mkdir -p ${STATEDIR}
-fi
-chown ${USER} ${STATEDIR}
-chgrp ${GROUP} ${STATEDIR}
+install -d -o ${USER} -g ${GROUP} -m 755 ${STATEDIR}
RC="${STARTUP_DIR}/${MILTER}${STARTUP_EXT}"
-if [ ! -f $RC ]; then
- cp ${MILTER}.sh $RC
- chmod 540 $RC
+${BSD_INSTALL_SCRIPT} ${MILTER}.sh $RC.sample
+[ ! -f $RC ] && cp $RC.sample $RC
- case `uname -s` in
- FreeBSD)
- ${BSD_INSTALL_PROGRAM} ${MILTER} ${SBINDIR}
- ;;
- Linux*)
- which chkconfig
- if test $? -eq 0; then
- chkconfig --add ${MILTER}
- else
- # Probably a stupid Debian system.
- cd ${STARTUP_DIR}
+${BSD_INSTALL_PROGRAM} ${MILTER} ${SBINDIR}
+${BSD_INSTALL_DATA} ${MILTER}.mc ${MAILDIR}/${MILTER}.mc.sample
+[ ! -f ${MAILDIR}/${MILTER}.mc ] && cp ${MAILDIR}/${MILTER}.mc.sample
${MAILDIR}/${MILTER}.mc
+./milter-sender help=1 | sed
's|^MilterSocket=.*|MilterSocket=unix:/var/spool/milter-sender/socket|'
>${MILTER_CF}.sample
+[ ! -f ${MILTER_CF} ] && cp ${MILTER_CF}.sample ${MILTER_CF}
- # Create relative links
- cd ../rc0.d
- ln -s ../init.d/${MILTER} K20${MILTER}
- cd ../rc1.d
- ln -s ../init.d/${MILTER} K20${MILTER}
- cd ../rc6.d
- ln -s ../init.d/${MILTER} K20${MILTER}
+chgrp ${GROUP} ${MAILDIR}/access.db ${MAILDIR}/aliases.db ${MILTER_CF}
${MILTER_CF}.sample
+chmod g+r ${MAILDIR}/access.db ${MAILDIR}/aliases.db ${MILTER_CF}
${MILTER_CF}.sample
- # Assume S20sendmail or higher.
- cd ../rc2.d
- ln -s ../init.d/${MILTER} S18${MILTER}
- cd ../rc3.d
- ln -s ../init.d/${MILTER} S18${MILTER}
- cd ../rc4.d
- ln -s ../init.d/${MILTER} S18${MILTER}
- cd ../rc5.d
- ln -s ../init.d/${MILTER} S18${MILTER}
- fi
- ;;
- SunOS*)
- # Does SunOS have a chkconfig like tool?
- ln -s $RC /etc/rc2.d/S70${MILTER}
- ln -s $RC /etc/rcS.d/K30${MILTER}
- ;;
- esac
-fi
-
-cp -f ${MILTER} ${SBINDIR}
-chmod 550 ${SBINDIR}/${MILTER}
-
-cp -f ${MILTER}.mc ${MAILDIR}/${MILTER}.mc.sample
-
-# Save the default configuration.
-./milter-sender help=1 >${MILTER_CF}.sample
-
-# Save the existing configuration with any new additions.
-./milter-sender help=2 >${MILTER_CF}.new
-
-chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.*
${MILTER_CF}.sample*
-chmod g+r ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.*
${MILTER_CF}.sample*
echo '***************************************************************'
echo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409102010.i8AKAVlX022283>