summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/dkim-milter/Makefile4
-rw-r--r--mail/dkim-milter/PLIST22
-rw-r--r--mail/dkim-milter/distinfo10
-rw-r--r--mail/dkim-milter/patches/patch-aa86
4 files changed, 64 insertions, 58 deletions
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 7dae62ee852..7769eac2a4c 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2008/10/06 14:56:52 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/01/19 23:24:28 adrianp Exp $
-DISTNAME= dkim-milter-2.5.4
+DISTNAME= dkim-milter-2.8.1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST
index 8b77c5ab013..ef0fadf6da9 100644
--- a/mail/dkim-milter/PLIST
+++ b/mail/dkim-milter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2008/04/20 17:36:15 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/01/19 23:24:28 adrianp Exp $
${PLIST.arlib}lib/libar.a
${PLIST.arlib}man/man3/ar.3
lib/libdkim.a
@@ -20,11 +20,20 @@ share/doc/dkim-milter/KNOWNBUGS
share/doc/dkim-milter/README
share/doc/dkim-milter/RELEASE_NOTES
share/examples/dkim-milter/dkim-filter.conf.sample
-share/doc/dkim-milter/draft-hoffman-dac-vbr-02.txt
-share/doc/dkim-milter/draft-ietf-dkim-deployment-01.txt
-share/doc/dkim-milter/draft-ietf-dkim-overview-09.txt
-share/doc/dkim-milter/draft-ietf-dkim-ssp-03.txt
-share/doc/dkim-milter/draft-kucherawy-sender-auth-header-14.txt
+share/doc/dkim-milter/draft-hoffman-dac-vbr-05.txt
+share/doc/dkim-milter/draft-ietf-dkim-deployment-02.txt
+share/doc/dkim-milter/draft-ietf-dkim-overview-10.txt
+share/doc/dkim-milter/draft-ietf-dkim-ssp-08.txt
+share/doc/dkim-milter/draft-kucherawy-dkim-reporting-04.txt
+share/doc/dkim-milter/draft-kucherawy-sender-auth-header-19.txt
+share/doc/dkim-milter/draft-shafranovich-feedback-report-06.txt
+share/doc/dkim-milter/libdkim/dkim_dnssec.html
+share/doc/dkim-milter/libdkim/dkim_policy_getdnssec.html
+share/doc/dkim-milter/libdkim/dkim_policy_getreportinfo.html
+share/doc/dkim-milter/libdkim/dkim_set_margin.html
+share/doc/dkim-milter/libdkim/dkim_sig_getdnssec.html
+share/doc/dkim-milter/libdkim/dkim_sig_getreportinfo.html
+share/doc/dkim-milter/libdkim/dkim_sig_hdrsigned.html
share/doc/dkim-milter/libdkim/dkim.html
share/doc/dkim-milter/libdkim/dkim_alg_t.html
share/doc/dkim-milter/libdkim/dkim_body.html
@@ -59,7 +68,6 @@ share/doc/dkim-milter/libdkim/dkim_policy_t.html
share/doc/dkim-milter/libdkim/dkim_presult.html
share/doc/dkim-milter/libdkim/dkim_pstate.html
share/doc/dkim-milter/libdkim/dkim_query_t.html
-share/doc/dkim-milter/libdkim/dkim_reportinfo.html
share/doc/dkim-milter/libdkim/dkim_set_dns_callback.html
share/doc/dkim-milter/libdkim/dkim_set_final.html
share/doc/dkim-milter/libdkim/dkim_set_key_lookup.html
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 9b593a53d01..d63af081ec1 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2008/04/20 17:20:20 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2009/01/19 23:24:28 adrianp Exp $
-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 (dkim-milter-2.8.1.tar.gz) = 0bfc8839c21da7208670f39e8d054579d56865df
+RMD160 (dkim-milter-2.8.1.tar.gz) = 76745d9fba95cfd0a05f62aa334293a56f6715d1
+Size (dkim-milter-2.8.1.tar.gz) = 726239 bytes
+SHA1 (patch-aa) = 27b4ad93e1f97ba072eaaf28d06801f765b74ec4
SHA1 (patch-ab) = ab99d7cbc6cf3ad5aff905d32c50caac7d5c02e0
SHA1 (patch-ac) = 863ff7ec1ac1ebf06732a78c8429fcc1b2799ac4
diff --git a/mail/dkim-milter/patches/patch-aa b/mail/dkim-milter/patches/patch-aa
index 7ab6157aa6a..eb4775f51cd 100644
--- a/mail/dkim-milter/patches/patch-aa
+++ b/mail/dkim-milter/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2008/04/20 17:20:20 adrianp Exp $
+$NetBSD: patch-aa,v 1.6 2009/01/19 23:24:28 adrianp Exp $
---- devtools/Site/site.config.m4.orig 2008-04-20 17:49:29.000000000 +0100
+--- devtools/Site/site.config.m4.orig 2009-01-19 23:11:46.000000000 +0000
+++ 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.
-dnl define(`confOPTIMIZE', `-g')
-+@DEBUG@ define(`confOPTIMIZE', `-g')
++@DEBUG@ dnl define(`confOPTIMIZE', `-g')
dnl Shared library for libdkim
dnl
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.5 2008/04/20 17:20:20 adrianp Exp $
dnl
@@ -40,7 +40,7 @@ dnl libar -- asynchronous resolver libra
dnl
- dnl If you want to use the asynchronous resolver library, enable this
+ dnl If you want to use the provided asynchronous resolver library, enable this
dnl next line by deleting the "dnl" at the front of it.
-dnl define(`bld_USE_ARLIB', `true')
+@ARLIB@ define(`bld_USE_ARLIB', `true')
@@ -36,25 +36,25 @@ $NetBSD: patch-aa,v 1.5 2008/04/20 17:20:20 adrianp Exp $
-dnl APPENDDEF(`conf_libar_ENVDEF', `-DAR_RES_MANUAL')
+@ARLIB@ APPENDDEF(`conf_libar_ENVDEF', `-DAR_RES_MANUAL')
- dnl POPAUTH -- POP-before-SMTP authentication
+ dnl libunbound -- "unbound" asynchronous resolver library
dnl
-@@ -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 ')
-+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib ')
-+
-+dnl pthread support
-+dnl
-+APPENDDEF(`confLIBS', `@PTHREAD_LDFLAGS@ ')
-+APPENDDEF(`confINCDIRS', `-I@PTHREAD@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@PTHREAD@/lib ')
+@@ -64,6 +64,14 @@ dnl Finally, you may need to enable and
+ dnl can find your installation.
+ dnl APPENDDEF(`confINCDIRS', `-I/usr/local/unbound/include ')
+ dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/unbound/lib ')
++APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')
++APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib ')
++
++dnl pthread support
++dnl
++APPENDDEF(`confLIBS', `@PTHREAD_LDFLAGS@ ')
++APPENDDEF(`confINCDIRS', `-I@PTHREAD@/include ')
++APPENDDEF(`confLIBDIRS', `-L@PTHREAD@/lib ')
- dnl TRE -- Approximate regular expression matching
+ dnl POPAUTH -- POP-before-SMTP authentication
dnl
-@@ -116,9 +124,10 @@ dnl APPENDDEF(`confENVDEF', `-D_FFR_REPL
- dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ')
+@@ -131,9 +139,10 @@ dnl APPENDDEF(`confENVDEF', `-D_FFR_REPL
+ dnl APPENDDEF(`confENVDEF', `-D_FFR_REPORT_INTERVALS ')
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ')
-dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
@@ -65,37 +65,35 @@ $NetBSD: patch-aa,v 1.5 2008/04/20 17:20:20 adrianp Exp $
dnl DomainKeys -- Yahoo DomainKeys verification support
dnl
-@@ -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
+@@ -149,6 +158,8 @@ dnl adjust the paths below and enable th
dnl front of them.
--dnl APPENDDEF(`bld_dkim_filter_INCDIRS', `-I/usr/local/sendmail/include')
--dnl APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L/usr/local/sendmail/lib')
-+APPENDDEF(`bld_dkim_filter_INCDIRS', `-I@LMBASE@/include')
-+APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L@LMBASE@/lib')
+ dnl APPENDDEF(`bld_dkim_filter_INCDIRS', `-I/usr/local/sendmail/include')
+ dnl APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L/usr/local/sendmail/lib')
++APPENDDEF(`bld_dkim_filter_INCDIRS', `-I@LMBASE@/include')
++APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L@LMBASE@/lib')
dnl smfi_addheader() -- older versions of libmilter
dnl
-@@ -142,3 +151,22 @@ dnl primitive, you can enable this to ha
+@@ -157,3 +168,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 ')
-+
-+dnl path fixes for pkgsrc
-+dnl
-+define(`confINCLUDEDIR', `@PREFIX@/include')
-+define(`confLIBDIR', `@PREFIX@/lib')
++
++dnl path fixes for pkgsrc
++dnl
++define(`confINCLUDEDIR', `@PREFIX@/include')
++define(`confLIBDIR', `@PREFIX@/lib')
+define(`confSBINDIR', `@PREFIX@/sbin')
+define(`confUBINDIR', `@PREFIX@/bin')
-+define(`confEBINDIR', `@PREFIX@/libexec')
-+define(`confMANROOT', `@PREFIX@/@PKGMANDIR@/man')
-+define(`confMANROOTMAN', `@PREFIX@/@PKGMANDIR@/man')
-+define(`confMAN4EXT', `3')
-+define(`confMAN5EXT', `5')
-+define(`confMAN8EXT', `8')
-+define(`confINSTALL_RAWMAN', 'yes')
++define(`confEBINDIR', `@PREFIX@/libexec')
++define(`confMANROOT', `@PREFIX@/@PKGMANDIR@/man')
++define(`confMANROOTMAN', `@PREFIX@/@PKGMANDIR@/man')
++define(`confMAN4EXT', `3')
++define(`confMAN5EXT', `5')
++define(`confMAN8EXT', `8')
++define(`confINSTALL_RAWMAN', 'yes')
+define(`confDONT_INSTALL_CATMAN', 'yes')
-+
-+dnl option fixes for pkgsrc
-+dnl
-+define(`confLIBSEARCH', `@DBLIB@ @RESOLVLIB@')
++
++dnl option fixes for pkgsrc
++dnl
++define(`confLIBSEARCH', `@DBLIB@ @RESOLVLIB@')
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 23:52:20 +0000