diff options
| -rw-r--r-- | mail/dkim-milter/Makefile | 12 | ||||
| -rw-r--r-- | mail/dkim-milter/PLIST | 5 | ||||
| -rw-r--r-- | mail/dkim-milter/distinfo | 12 | ||||
| -rw-r--r-- | mail/dkim-milter/options.mk | 20 | ||||
| -rw-r--r-- | mail/dkim-milter/patches/patch-aa | 30 | ||||
| -rw-r--r-- | mail/dkim-milter/patches/patch-ac | 13 |
6 files changed, 67 insertions, 25 deletions
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile index 679509d52fd..8b22a43dca8 100644 --- a/mail/dkim-milter/Makefile +++ b/mail/dkim-milter/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2008/04/06 12:59:11 adrianp Exp $ +# $NetBSD: Makefile,v 1.15 2008/04/20 17:20:20 adrianp Exp $ -DISTNAME= dkim-milter-2.5.2 +DISTNAME= dkim-milter-2.5.4 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dkim-milter/} @@ -36,6 +36,7 @@ SUBST_CLASSES+= libs SUBST_STAGE.libs= pre-configure SUBST_FILES.libs= devtools/Site/site.config.m4 SUBST_FILES.libs+= dkim-filter/dkim-filter.conf.5 dkim-filter/dkim-stats.8 +SUBST_FILES.libs+= dkim-filter/Makefile.m4 SUBST_SED.libs+= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' SUBST_SED.libs+= -e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g' SUBST_SED.libs+= -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g' @@ -93,6 +94,13 @@ post-install: ${INSTALL_MAN} ar.3 ${PREFIX}/${PKGMANDIR}/man3 . endif +. if !empty(PKG_OPTIONS:Mdkim-stats) + cd ${WRKSRC}/obj.`uname -s`.`uname -r`.`uname -m`/dkim-filter && \ + ${INSTALL_PROGRAM} dkim-stats ${PREFIX}/bin && \ + ${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-stats.8 \ + ${PREFIX}/${PKGMANDIR}/man8 +. endif + .include "../../security/openssl/buildlink3.mk" .include "../../mail/libmilter/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST index 78449d05488..63947452698 100644 --- a/mail/dkim-milter/PLIST +++ b/mail/dkim-milter/PLIST @@ -1,16 +1,17 @@ -@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:03 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/20 17:20:20 adrianp Exp $ ${PLIST.arlib}lib/libar.a ${PLIST.arlib}man/man3/ar.3 lib/libdkim.a include/dkim.h libexec/dkim-filter bin/dkim-genkey +${WITH_STATS}bin/dkim-stats bin/dkim-testkey bin/dkim-testssp man/man5/dkim-filter.conf.5 man/man8/dkim-filter.8 man/man8/dkim-genkey.8 -man/man8/dkim-stats.8 +${WITH_STATS}man/man8/dkim-stats.8 man/man8/dkim-testkey.8 man/man8/dkim-testssp.8 share/doc/dkim-milter/FEATURES diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo index 6e263c86a61..9b593a53d01 100644 --- a/mail/dkim-milter/distinfo +++ b/mail/dkim-milter/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2008/04/06 12:59:11 adrianp Exp $ +$NetBSD: distinfo,v 1.7 2008/04/20 17:20:20 adrianp Exp $ -SHA1 (dkim-milter-2.5.2.tar.gz) = 0862b9ea4d1bfbe04bb8cb1240f0b1783d5a0a2c -RMD160 (dkim-milter-2.5.2.tar.gz) = 6c9b285af7c73792afde1270b527e2472d5544f9 -Size (dkim-milter-2.5.2.tar.gz) = 641510 bytes -SHA1 (patch-aa) = 0a4c66bbf4d699d12c5b1cefbe573b13b9d6aa5d +SHA1 (dkim-milter-2.5.4.tar.gz) = 3664131dd4f4d82a2c54c9039bf7574b16998043 +RMD160 (dkim-milter-2.5.4.tar.gz) = 6f718d5319ebacd7fad4aaa20855d68f51dfb9d8 +Size (dkim-milter-2.5.4.tar.gz) = 644945 bytes +SHA1 (patch-aa) = 5691ba5ff1ea70a68d03d829bb5697ca824280a7 SHA1 (patch-ab) = ab99d7cbc6cf3ad5aff905d32c50caac7d5c02e0 -SHA1 (patch-ab.old) = e7e2f8c49b1d2aee7fd1762d509392a1da86e662 +SHA1 (patch-ac) = 863ff7ec1ac1ebf06732a78c8429fcc1b2799ac4 diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk index 84656a84b56..eb419162048 100644 --- a/mail/dkim-milter/options.mk +++ b/mail/dkim-milter/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:03 jlam Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/20 17:20:20 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dkim-milter -PKG_SUPPORTED_OPTIONS= inet6 dkim-milter-arlib debug +PKG_SUPPORTED_OPTIONS= inet6 dkim-milter-arlib debug dkim-stats .include "../../mk/bsd.options.mk" @@ -35,3 +35,19 @@ SUBST_SED.libs+= -e 's|@ARLIB@||g' SUBST_SED.libs+= -e 's|@RESOLVLIB@|resolv bind|g' SUBST_SED.libs+= -e 's|@ARLIB@|dnl|g' .endif + +### +### Install dkim-stats(8) which outputs dkim-milter statistics +### +.if !empty(PKG_OPTIONS:Mdkim-stats) +.include "../../mk/db1.builtin.mk" +PLIST_SUBST+= WITH_STATS='' +SUBST_SED.libs+= -e 's|@STATS@||g' +SUBST_SED.libs+= -e 's|@MAN_STATS@|dkim-stats.8|g' +SUBST_SED.libs+= -e 's|@DBLIB@|db|g' +.else +PLIST_SUBST+= WITH_STATS='@comment ' +SUBST_SED.libs+= -e 's|@STATS@|dnl|g' +SUBST_SED.libs+= -e 's|@MAN_STATS@||g' +SUBST_SED.libs+= -e 's|@DBLIB@||g' +.endif diff --git a/mail/dkim-milter/patches/patch-aa b/mail/dkim-milter/patches/patch-aa index a333fa47119..7ab6157aa6a 100644 --- a/mail/dkim-milter/patches/patch-aa +++ b/mail/dkim-milter/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $ +$NetBSD: patch-aa,v 1.5 2008/04/20 17:20:20 adrianp Exp $ ---- devtools/Site/site.config.m4.orig 2008-03-09 11:23:02.000000000 +0000 -+++ devtools/Site/site.config.m4 2008-03-09 12:49:32.000000000 +0000 -@@ -11,7 +11,7 @@ +--- devtools/Site/site.config.m4.orig 2008-04-20 17:49:29.000000000 +0100 ++++ devtools/Site/site.config.m4 +@@ -11,7 +11,7 @@ dnl dnl If you are encountering coredumps and want to be able to analyze them dnl using something like "gdb", enable this next line by deleting the "dnl" dnl at the front of it. @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $ dnl Shared library for libdkim dnl -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ dnl If you want libdkim and dkim.h to be dnl the package, enable this next line by deleting the "dnl" at the front dnl of it. This is done automatically if you've requested the shared dnl library. @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $ dnl Faster strtoul()/strtoull() implementations dnl -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ dnl libar -- asynchronous resolver libra dnl dnl If you want to use the asynchronous resolver library, enable this dnl next line by deleting the "dnl" at the front of it. @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $ dnl dnl libar normally uses res_init() or res_ninit() to load the contents dnl of resolv.conf for its use. If neither of these work on your system -@@ -49,7 +49,7 @@ +@@ -49,7 +49,7 @@ dnl may need to enable code that parses dnl also be required if you've got any IPv6 addresses in /etc/resolv.conf. dnl In that case, enable this next line by deleting the "dnl" at the front dnl of it. @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $ dnl POPAUTH -- POP-before-SMTP authentication dnl -@@ -87,6 +87,14 @@ +@@ -87,6 +87,14 @@ dnl have v0.9.8 or later for SHA256 supp dnl lines by deleting "dnl" from the front of them and edit paths as needed. dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ') dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ') @@ -53,15 +53,19 @@ $NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $ dnl TRE -- Approximate regular expression matching dnl -@@ -117,6 +125,7 @@ - dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ') +@@ -116,9 +124,10 @@ dnl APPENDDEF(`confENVDEF', `-D_FFR_REPL + dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ') + dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ') + dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ') +-dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ') ++@STATS@ APPENDDEF(`confENVDEF', `-D_FFR_STATS ') dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ') dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ') +@INET6@ APPENDDEF(`confENVDEF', `-DNETINET6 ') dnl DomainKeys -- Yahoo DomainKeys verification support dnl -@@ -130,8 +139,8 @@ +@@ -132,8 +141,8 @@ dnl dnl This must be in the search rules for your compile. If necessary, dnl adjust the paths below and enable the lines by deleting "dnl" from the dnl front of them. @@ -72,7 +76,7 @@ $NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $ dnl smfi_addheader() -- older versions of libmilter dnl -@@ -140,3 +150,21 @@ +@@ -142,3 +151,22 @@ dnl primitive, you can enable this to ha dnl instead. It will still work, but it breaks the DKIM specification. dnl To enable this, remove the "dnl" from the front of the line. dnl APPENDDEF(`conf_dkim_filter_ENVDEF', `-DNO_SMFI_INSHEADER ') @@ -94,4 +98,4 @@ $NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $ + +dnl option fixes for pkgsrc +dnl -+define(`confLIBSEARCH', `db @RESOLVLIB@') ++define(`confLIBSEARCH', `@DBLIB@ @RESOLVLIB@') diff --git a/mail/dkim-milter/patches/patch-ac b/mail/dkim-milter/patches/patch-ac new file mode 100644 index 00000000000..67abe18c08d --- /dev/null +++ b/mail/dkim-milter/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.3 2008/04/20 17:20:20 adrianp Exp $ + +--- dkim-filter/Makefile.m4.orig 2008-03-23 07:41:07.000000000 +0000 ++++ dkim-filter/Makefile.m4 +@@ -77,7 +77,7 @@ define(`bldSOURCES', `dkim-testssp.c ') + bldPRODUCT_END + + bldPRODUCT_START(`manpage', `dkim-filter') +-define(`bldSOURCES', `dkim-filter.conf.5 dkim-filter.8 dkim-genkey.8 dkim-stats.8 dkim-testkey.8 dkim-testssp.8') ++define(`bldSOURCES', `dkim-filter.conf.5 dkim-filter.8 dkim-genkey.8 @MAN_STATS@ dkim-testkey.8 dkim-testssp.8') + bldPRODUCT_END + + bldFINISH |