diff options
| -rw-r--r-- | mail/opendkim/Makefile | 4 | ||||
| -rw-r--r-- | mail/opendkim/PLIST | 30 | ||||
| -rw-r--r-- | mail/opendkim/distinfo | 10 | ||||
| -rw-r--r-- | mail/opendkim/patches/patch-aa | 51 |
4 files changed, 69 insertions, 26 deletions
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index b66854111d1..b99c6fae54d 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/21 00:04:21 pettai Exp $ # -DISTNAME= opendkim-2.1.3 +DISTNAME= opendkim-2.2.2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendkim/} diff --git a/mail/opendkim/PLIST b/mail/opendkim/PLIST index e1e8912de87..85d23815e58 100644 --- a/mail/opendkim/PLIST +++ b/mail/opendkim/PLIST @@ -1,4 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/02/21 00:04:21 pettai Exp $ +bin/opendkim-genkey +bin/opendkim-genzone +bin/opendkim-testadsp +bin/opendkim-testkey include/opendkim/dkim.h lib/libopendkim.la lib/pkgconfig/opendkim.pc @@ -6,15 +10,12 @@ man/man8/opendkim-genkey.8 man/man8/opendkim-genzone.8 man/man8/opendkim-testadsp.8 man/man8/opendkim-testkey.8 -sbin/opendkim-genkey.sh -sbin/opendkim-genzone -sbin/opendkim-testadsp -sbin/opendkim-testkey share/doc/opendkim/FEATURES share/doc/opendkim/KNOWNBUGS share/doc/opendkim/LICENSE share/doc/opendkim/LICENSE.Sendmail share/doc/opendkim/README +share/doc/opendkim/README.opendkim-reportstats share/doc/opendkim/RELEASE_NOTES.Sendmail share/doc/opendkim/authheaders-check-setup-hook.lua share/doc/opendkim/convert_keylist.sh @@ -33,6 +34,7 @@ share/doc/opendkim/dkim_flush_cache.html share/doc/opendkim/dkim_free.html share/doc/opendkim/dkim_get_msgdate.html share/doc/opendkim/dkim_get_reputation.html +share/doc/opendkim/dkim_get_signer.html share/doc/opendkim/dkim_get_sigsubstring.html share/doc/opendkim/dkim_get_user_context.html share/doc/opendkim/dkim_getcachestats.html @@ -48,6 +50,7 @@ share/doc/opendkim/dkim_getsighdr.html share/doc/opendkim/dkim_getsighdr_d.html share/doc/opendkim/dkim_getsiglist.html share/doc/opendkim/dkim_getsignature.html +share/doc/opendkim/dkim_getuser.html share/doc/opendkim/dkim_header.html share/doc/opendkim/dkim_init.html share/doc/opendkim/dkim_key_syntax.html @@ -62,6 +65,8 @@ share/doc/opendkim/dkim_param_t.html share/doc/opendkim/dkim_policy.html share/doc/opendkim/dkim_policy_getdnssec.html share/doc/opendkim/dkim_policy_getreportinfo.html +share/doc/opendkim/dkim_policy_state_free.html +share/doc/opendkim/dkim_policy_state_new.html share/doc/opendkim/dkim_policy_syntax.html share/doc/opendkim/dkim_policy_t.html share/doc/opendkim/dkim_presult.html @@ -78,7 +83,6 @@ share/doc/opendkim/dkim_set_signature_handle.html share/doc/opendkim/dkim_set_signature_handle_free.html share/doc/opendkim/dkim_set_signature_tagvalues.html share/doc/opendkim/dkim_set_signer.html -share/doc/opendkim/dkim_set_trust_anchor.html share/doc/opendkim/dkim_set_user_context.html share/doc/opendkim/dkim_setpartial.html share/doc/opendkim/dkim_sig_getbh.html @@ -108,11 +112,16 @@ share/doc/opendkim/dkim_sign.html share/doc/opendkim/dkim_ssl_version.html share/doc/opendkim/dkim_stat.html share/doc/opendkim/dkim_verify.html -share/doc/opendkim/draft-ietf-dkim-mailinglists-00.txt -share/doc/opendkim/draft-ietf-marf-base-06.txt +share/doc/opendkim/dns.html +share/doc/opendkim/draft-ietf-dkim-implementation-report-05.txt +share/doc/opendkim/draft-ietf-dkim-mailinglists-04.txt share/doc/opendkim/draft-ietf-marf-dkim-reporting-00.txt -share/doc/opendkim/draft-kucherawy-authres-header-b-04.txt +share/doc/opendkim/draft-kucherawy-authres-vbr-00.txt share/doc/opendkim/index.html +share/doc/opendkim/opendkim-reportstats +share/examples/opendkim/opendkim.conf.sample +share/examples/opendkim/opendkim.conf.simple +share/examples/opendkim/opendkim.conf.simple-verify share/doc/opendkim/opendkim.init share/doc/opendkim/opendkim.spec share/doc/opendkim/overview.html @@ -125,4 +134,5 @@ share/doc/opendkim/rfc5585.txt share/doc/opendkim/rfc5617.txt share/doc/opendkim/rfc5672.txt share/doc/opendkim/rfc5863.txt -share/examples/opendkim/opendkim.conf.sample +share/doc/opendkim/rfc5965.txt +share/doc/opendkim/rfc6008.txt diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo index 0c6b0c79577..f7f1907e334 100644 --- a/mail/opendkim/distinfo +++ b/mail/opendkim/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $ +$NetBSD: distinfo,v 1.2 2011/02/21 00:04:21 pettai Exp $ -SHA1 (opendkim-2.1.3.tar.gz) = 81911d2a2ff15f49c039b0c90d6209e5ec7f76a3 -RMD160 (opendkim-2.1.3.tar.gz) = 09a215481eda0dee4f5248b1f1981ccf17f800f2 -Size (opendkim-2.1.3.tar.gz) = 1011019 bytes -SHA1 (patch-aa) = 892ba5e6d7f40bf095e97d8538d63e598579f82c +SHA1 (opendkim-2.2.2.tar.gz) = cd79dacf24ce1ba742618d7cf676f990841172ba +RMD160 (opendkim-2.2.2.tar.gz) = 6122e160b79de039d5ae0ab5a2f8689d51c81938 +Size (opendkim-2.2.2.tar.gz) = 1098812 bytes +SHA1 (patch-aa) = 47c743d72d2cb0eb40043a71fa87b959dd62b9d2 diff --git a/mail/opendkim/patches/patch-aa b/mail/opendkim/patches/patch-aa index 02ceef33d9a..22838132312 100644 --- a/mail/opendkim/patches/patch-aa +++ b/mail/opendkim/patches/patch-aa @@ -1,13 +1,46 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $ +$NetBSD: patch-aa,v 1.2 2011/02/21 00:04:22 pettai Exp $ ---- opendkim/Makefile.in.orig 2010-10-18 11:31:04.000000000 +0000 +--- opendkim/Makefile.in.orig 2011-02-20 23:52:59.000000000 +0000 +++ opendkim/Makefile.in -@@ -410,7 +410,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +@@ -255,7 +255,7 @@ man8dir = $(mandir)/man8 + NROFF = nroff + MANS = $(man_MANS) + am__dist_doc_DATA_DIST = opendkim.conf.sample opendkim.conf.simple \ +- opendkim.conf.simple-verify README.SQL setup.lua.sample \ ++ opendkim.conf.simple-verify setup.lua.sample \ + screen.lua.sample final.lua.sample + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ +@@ -422,6 +422,7 @@ builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ ++EGDIR = @EGDIR@ + domainname = @domainname@ + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ +@@ -462,7 +463,7 @@ top_srcdir = @top_srcdir@ @DEBUG_TRUE@AM_CFLAGS = -g - dist_sbin_SCRIPTS = opendkim-genkey.sh --exampledir = $(docdir) -+exampledir = @EGDIR@ - dist_example_DATA = opendkim.conf.sample - @BUILD_FILTER_TRUE@opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-arf.c opendkim-arf.h opendkim-config.h opendkim-crypto.c opendkim-crypto.h opendkim-db.c opendkim-db.h opendkim-lua.c opendkim-lua.h config.c config.h stats.c stats.h test.c test.h util.c util.h + dist_bin_SCRIPTS = opendkim-genkey + dist_doc_DATA = opendkim.conf.sample opendkim.conf.simple \ +- opendkim.conf.simple-verify README.SQL $(am__append_51) ++ opendkim.conf.simple-verify $(am__append_51) + @BUILD_FILTER_TRUE@opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-arf.c opendkim-arf.h opendkim-config.h opendkim-crypto.c opendkim-crypto.h opendkim-db.c opendkim-db.h opendkim-dns.c opendkim-dns.h opendkim-lua.c opendkim-lua.h config.c config.h stats.c stats.h test.c test.h util.c util.h @BUILD_FILTER_TRUE@opendkim_CC = $(PTHREAD_CC) + @BUILD_FILTER_TRUE@opendkim_CFLAGS = $(PTHREAD_CFLAGS) \ +@@ -1187,12 +1188,12 @@ uninstall-man8: + done + install-dist_docDATA: $(dist_doc_DATA) + @$(NORMAL_INSTALL) +- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" ++ test -z "$(EGDIR)" || $(MKDIR_P) "$(DESTDIR)$(EGDIR)" + @list='$(dist_doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ +- $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ ++ echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EGDIR)/$$f'"; \ ++ $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EGDIR)/$$f"; \ + done + + uninstall-dist_docDATA: |