Wed Apr 4 22:09:49 2012 UTC ()
Fixes for PR pkg/45818 (#1 and #2)


(pettai)
diff -r1.1.1.1 -r1.2 pkgsrc/mail/sid-milter/MESSAGE
diff -r1.1.1.1 -r1.2 pkgsrc/mail/sid-milter/PLIST
diff -r1.2 -r1.3 pkgsrc/mail/sid-milter/Makefile
diff -r0 -r1.1 pkgsrc/mail/sid-milter/files/sid-filter.sh
diff -r1.1.1.1 -r0 pkgsrc/mail/sid-milter/files/sid-milter.sh
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/sid-milter/MESSAGE (expand / switch to unified diff)

--- pkgsrc/mail/sid-milter/MESSAGE 2010/03/12 22:42:55 1.1.1.1
+++ pkgsrc/mail/sid-milter/MESSAGE 2012/04/04 22:09:49 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1.1.1 2010/03/12 22:42:55 pettai Exp $ 2$NetBSD: MESSAGE,v 1.2 2012/04/04 22:09:49 pettai Exp $
3 3
4sid-milter is now installed. 4sid-milter is now installed.
5The documentation can be found at ${PREFIX}/share/doc/sid-milter/ 5The documentation can be found at ${PREFIX}/share/doc/sid-milter/
6 6
7Please read the instructions in ${PREFIX}/share/doc/sid-milter/INSTALL 7Please read the instructions in ${PREFIX}/share/doc/sid-milter/INSTALL
8for setting up sid-milter. 8for setting up sid-milter.
9 9
10At a minmium you will need to specify: 10At a minmium you will need to specify:
11 11
12 sidmilter_flags="-p socketfile -d domain" 12 sidfilter_flags="-p socketfile -d domain"
13 13
14in your /etc/rc.conf. 14in your /etc/rc.conf.
15 15
16For security you may also wish to investigate the use of "-u userid". 16For security you may also wish to investigate the use of "-u userid".
17=========================================================================== 17===========================================================================
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/sid-milter/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/sid-milter/PLIST 2010/03/12 22:42:55 1.1.1.1
+++ pkgsrc/mail/sid-milter/PLIST 2012/04/04 22:09:49 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/12 22:42:55 pettai Exp $ 1@comment $NetBSD: PLIST,v 1.2 2012/04/04 22:09:49 pettai Exp $
2bin/sid-filter 2bin/sid-filter
3include/sm-marid.h 3include/sm-marid.h
4lib/libar.a 4lib/libar.a
5man/cat3/ar.0 5man/man3/ar.0
6man/cat8/sid-filter.0 6man/man8/sid-filter.0
7share/doc/sid-milter/FEATURES 7share/doc/sid-milter/FEATURES
8share/doc/sid-milter/INSTALL 8share/doc/sid-milter/INSTALL
9share/doc/sid-milter/KNOWNBUGS 9share/doc/sid-milter/KNOWNBUGS
10share/doc/sid-milter/LICENSE 10share/doc/sid-milter/LICENSE
11share/doc/sid-milter/README 11share/doc/sid-milter/README
12share/doc/sid-milter/README-SenderID 12share/doc/sid-milter/README-SenderID
13share/doc/sid-milter/RELEASE_NOTES 13share/doc/sid-milter/RELEASE_NOTES
14share/doc/sid-milter/rfc4406.txt 14share/doc/sid-milter/rfc4406.txt
15share/doc/sid-milter/rfc4407.txt 15share/doc/sid-milter/rfc4407.txt
16share/doc/sid-milter/rfc4408.txt 16share/doc/sid-milter/rfc4408.txt
17share/examples/rc.d/sid-milter 17share/examples/rc.d/sid-filter
cvs diff -r1.2 -r1.3 pkgsrc/mail/sid-milter/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/sid-milter/Makefile 2011/12/05 08:07:52 1.2
+++ pkgsrc/mail/sid-milter/Makefile 2012/04/04 22:09:49 1.3
@@ -1,63 +1,64 @@ @@ -1,63 +1,64 @@
1# $NetBSD: Makefile,v 1.2 2011/12/05 08:07:52 pettai Exp $ 1# $NetBSD: Makefile,v 1.3 2012/04/04 22:09:49 pettai Exp $
2# 2#
3 3
4DISTNAME= sid-milter-1.0.0 4DISTNAME= sid-milter-1.0.0
 5PKGREVISION= 1
5CATEGORIES= mail 6CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sid-milter/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sid-milter/}
7 8
8MAINTAINER= pettai@NetBSD.org 9MAINTAINER= pettai@NetBSD.org
9HOMEPAGE= http://sid-milter.sourceforge.net/ 10HOMEPAGE= http://sid-milter.sourceforge.net/
10COMMENT= Open source SPF/SenderID filter software from Sendmail, Inc 11COMMENT= Open source SPF/SenderID filter software from Sendmail, Inc
11LICENSE= sendmail-open-source-license 12LICENSE= sendmail-open-source-license
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0 16BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
16 17
17USE_BUILTIN.libmilter= NO 18USE_BUILTIN.libmilter= NO
18USE_TOOLS+= gm4 19USE_TOOLS+= gm4
19MAKE_ENV+= M4=${M4:Q} 20MAKE_ENV+= M4=${M4:Q}
20PTHREAD_OPTS+= require 21PTHREAD_OPTS+= require
21RCD_SCRIPTS= sid-milter 22RCD_SCRIPTS= sid-filter
22 23
23SIDDOC= ${PREFIX}/share/doc/sid-milter 24SIDDOC= ${PREFIX}/share/doc/sid-milter
24 25
25SUBST_CLASSES+= libs 26SUBST_CLASSES+= libs
26SUBST_STAGE.libs= pre-build 27SUBST_STAGE.libs= pre-build
27SUBST_FILES.libs= sid-filter/Makefile.m4 28SUBST_FILES.libs= sid-filter/Makefile.m4
28SUBST_SED.libs= -e "s|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g" 29SUBST_SED.libs= -e "s|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g"
29SUBST_MESSAGE.libs= Fixing paths. 30SUBST_MESSAGE.libs= Fixing paths.
30 31
31INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/cat3 ${PKGMANDIR}/cat8 32INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man3 ${PKGMANDIR}/man8
32 33
33post-extract: 34post-extract:
34 ${CP} ${FILESDIR}/sid-filter.m4 ${WRKSRC}/sid-filter/Makefile.m4 35 ${CP} ${FILESDIR}/sid-filter.m4 ${WRKSRC}/sid-filter/Makefile.m4
35 36
36do-build: 37do-build:
37 (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build) 38 (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build)
38 39
39do-install: 40do-install:
40 ${INSTALL_DATA_DIR} ${DESTDIR}${SIDDOC} 41 ${INSTALL_DATA_DIR} ${DESTDIR}${SIDDOC}
41 ${INSTALL_LIB} ${WRKSRC}/${SIDWORK}/libmarid/sm-marid.h \ 42 ${INSTALL_LIB} ${WRKSRC}/${SIDWORK}/libmarid/sm-marid.h \
42 ${DESTDIR}${PREFIX}/include 43 ${DESTDIR}${PREFIX}/include
43 ${INSTALL_LIB} ${WRKSRC}/${SIDWORK}/libar/libar.a \ 44 ${INSTALL_LIB} ${WRKSRC}/${SIDWORK}/libar/libar.a \
44 ${DESTDIR}${PREFIX}/lib 45 ${DESTDIR}${PREFIX}/lib
45 ${INSTALL_MAN} ${WRKSRC}/${SIDWORK}/libar/ar.0 \ 46 ${INSTALL_MAN} ${WRKSRC}/${SIDWORK}/libar/ar.0 \
46 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat3/ 47 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/
47 ${INSTALL_PROGRAM} ${WRKSRC}/${SIDWORK}/sid-filter/sid-filter \ 48 ${INSTALL_PROGRAM} ${WRKSRC}/${SIDWORK}/sid-filter/sid-filter \
48 ${DESTDIR}${PREFIX}/bin 49 ${DESTDIR}${PREFIX}/bin
49 ${INSTALL_MAN} ${WRKSRC}/${SIDWORK}/sid-filter/sid-filter.0 \ 50 ${INSTALL_MAN} ${WRKSRC}/${SIDWORK}/sid-filter/sid-filter.0 \
50 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat8/ 51 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
51 ${INSTALL_DATA} ${WRKSRC}/FEATURES ${DESTDIR}${SIDDOC} 52 ${INSTALL_DATA} ${WRKSRC}/FEATURES ${DESTDIR}${SIDDOC}
52 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${SIDDOC} 53 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${SIDDOC}
53 ${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${DESTDIR}${SIDDOC} 54 ${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${DESTDIR}${SIDDOC}
54 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${SIDDOC} 55 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${SIDDOC}
55 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${SIDDOC} 56 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${SIDDOC}
56 ${INSTALL_DATA} ${WRKSRC}/README-SenderID ${DESTDIR}${SIDDOC} 57 ${INSTALL_DATA} ${WRKSRC}/README-SenderID ${DESTDIR}${SIDDOC}
57 ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${DESTDIR}${SIDDOC} 58 ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${DESTDIR}${SIDDOC}
58 ${INSTALL_DATA} ${WRKSRC}/rfc4406.txt ${DESTDIR}${SIDDOC} 59 ${INSTALL_DATA} ${WRKSRC}/rfc4406.txt ${DESTDIR}${SIDDOC}
59 ${INSTALL_DATA} ${WRKSRC}/rfc4407.txt ${DESTDIR}${SIDDOC} 60 ${INSTALL_DATA} ${WRKSRC}/rfc4407.txt ${DESTDIR}${SIDDOC}
60 ${INSTALL_DATA} ${WRKSRC}/rfc4408.txt ${DESTDIR}${SIDDOC} 61 ${INSTALL_DATA} ${WRKSRC}/rfc4408.txt ${DESTDIR}${SIDDOC}
61 62
62.include "../../security/openssl/buildlink3.mk" 63.include "../../security/openssl/buildlink3.mk"
63.include "../../mail/libmilter/buildlink3.mk" 64.include "../../mail/libmilter/buildlink3.mk"
File Added: pkgsrc/mail/sid-milter/files/sid-filter.sh
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: sid-filter.sh,v 1.1 2012/04/04 22:09:49 pettai Exp $
#
# PROVIDE: sidfilter
# REQUIRE: DAEMON

if [ -f /etc/rc.subr ]; then
	. /etc/rc.subr
fi

name="sidfilter"
rcvar=$name
command="@PREFIX@/bin/sid-filter"
pidfile="@VARBASE@/run/sid-filter/${name}.pid"
command_args="-p local:@VARBASE@/run/sid-filter/${name}.sock -P ${pidfile} -l"
start_precmd="sidfilter_precmd"

sidfilter_precmd()
{
        if [ ! -d @VARBASE@/run/sid-filter ]; then
                @MKDIR@ @VARBASE@/run/sid-filter
                @CHMOD@ 0750 @VARBASE@/run/sid-filter
                @CHOWN@ smmsp:smmsp @VARBASE@/run/sid-filter
        fi

        if [ -f @VARBASE@/run/sid-filter/${name}.sock ]; then
                @RM@ -f @VARBASE@/run/sid-filter/${name}.sock
        fi
}

if [ -f /etc/rc.subr ]; then
        load_rc_config $name
	run_rc_command "$1"
else
	echo -n " ${name}"
	${command} ${sidfilter_flags} ${command_args}
fi
File Deleted: pkgsrc/mail/sid-milter/files/Attic/sid-milter.sh