summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/opendkim/Makefile4
-rw-r--r--mail/opendkim/PLIST24
-rw-r--r--mail/opendkim/PLIST.vbr3
-rw-r--r--mail/opendkim/distinfo9
-rw-r--r--mail/opendkim/options.mk6
-rw-r--r--mail/opendkim/patches/patch-aa46
6 files changed, 27 insertions, 65 deletions
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index b99c6fae54d..fc23a64c5da 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/02/21 00:04:21 pettai Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/13 23:31:31 pettai Exp $
#
-DISTNAME= opendkim-2.2.2
+DISTNAME= opendkim-2.3.0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendkim/}
diff --git a/mail/opendkim/PLIST b/mail/opendkim/PLIST
index 85d23815e58..2e190bd0838 100644
--- a/mail/opendkim/PLIST
+++ b/mail/opendkim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/02/21 00:04:21 pettai Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/03/13 23:31:31 pettai Exp $
bin/opendkim-genkey
bin/opendkim-genzone
bin/opendkim-testadsp
@@ -15,6 +15,7 @@ share/doc/opendkim/KNOWNBUGS
share/doc/opendkim/LICENSE
share/doc/opendkim/LICENSE.Sendmail
share/doc/opendkim/README
+share/doc/opendkim/README.SQL
share/doc/opendkim/README.opendkim-reportstats
share/doc/opendkim/RELEASE_NOTES.Sendmail
share/doc/opendkim/authheaders-check-setup-hook.lua
@@ -40,6 +41,7 @@ share/doc/opendkim/dkim_get_user_context.html
share/doc/opendkim/dkim_getcachestats.html
share/doc/opendkim/dkim_getdomain.html
share/doc/opendkim/dkim_geterror.html
+share/doc/opendkim/dkim_getid.html
share/doc/opendkim/dkim_getmode.html
share/doc/opendkim/dkim_getpartial.html
share/doc/opendkim/dkim_getpolicystr.html
@@ -99,6 +101,7 @@ share/doc/opendkim/dkim_sig_getkeysize.html
share/doc/opendkim/dkim_sig_getreportinfo.html
share/doc/opendkim/dkim_sig_getselector.html
share/doc/opendkim/dkim_sig_getsignalg.html
+share/doc/opendkim/dkim_sig_getsignedhdrs.html
share/doc/opendkim/dkim_sig_getsigntime.html
share/doc/opendkim/dkim_sig_gettagvalue.html
share/doc/opendkim/dkim_sig_hdrsigned.html
@@ -115,19 +118,23 @@ share/doc/opendkim/dkim_verify.html
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-vbr-00.txt
+share/doc/opendkim/draft-ietf-marf-dkim-reporting-01.txt
+share/doc/opendkim/draft-kucherawy-authres-vbr-04.txt
+share/doc/opendkim/draft-kucherawy-dkim-atps-02.txt
share/doc/opendkim/index.html
+share/doc/opendkim/opendkim
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/opendkim.conf.sample
+share/doc/opendkim/opendkim.conf.simple
+share/doc/opendkim/opendkim.conf.simple-verify
+share/doc/opendkim/opendkim.spec.in
+share/doc/opendkim/opendkim.xml
share/doc/opendkim/overview.html
+share/doc/opendkim/rfc3447.txt
share/doc/opendkim/rfc4686.txt
share/doc/opendkim/rfc4871.txt
share/doc/opendkim/rfc5016.txt
+share/doc/opendkim/rfc5322.txt
share/doc/opendkim/rfc5451.txt
share/doc/opendkim/rfc5518.txt
share/doc/opendkim/rfc5585.txt
@@ -136,3 +143,4 @@ share/doc/opendkim/rfc5672.txt
share/doc/opendkim/rfc5863.txt
share/doc/opendkim/rfc5965.txt
share/doc/opendkim/rfc6008.txt
+share/examples/rc.d/opendkim
diff --git a/mail/opendkim/PLIST.vbr b/mail/opendkim/PLIST.vbr
index ca6ad50cfe8..5b339f2d4b2 100644
--- a/mail/opendkim/PLIST.vbr
+++ b/mail/opendkim/PLIST.vbr
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.vbr,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $
+@comment $NetBSD: PLIST.vbr,v 1.2 2011/03/13 23:31:31 pettai Exp $
include/vbr/vbr.h
lib/libvbr.la
lib/pkgconfig/vbr.pc
+man/man3/vbr.3
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index f7f1907e334..8aceb70fd3b 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/02/21 00:04:21 pettai Exp $
+$NetBSD: distinfo,v 1.3 2011/03/13 23:31:31 pettai Exp $
-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
+SHA1 (opendkim-2.3.0.tar.gz) = 99fd2afcd67d92aeca95615c9a4ede2d8bea8ab0
+RMD160 (opendkim-2.3.0.tar.gz) = 72342fc3e8915682f638301e0806ad9bb6d2616c
+Size (opendkim-2.3.0.tar.gz) = 1275560 bytes
diff --git a/mail/opendkim/options.mk b/mail/opendkim/options.mk
index 04d0c405c7e..9178a1db020 100644
--- a/mail/opendkim/options.mk
+++ b/mail/opendkim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $
+# $NetBSD: options.mk,v 1.2 2011/03/13 23:31:31 pettai Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.opendkim
PKG_SUPPORTED_OPTIONS= filter debug dkim-stats vbr
@@ -29,8 +29,8 @@ SUBST_STAGE.conf= pre-configure
SUBST_FILES.conf= opendkim/Makefile.in
SUBST_SED.conf+= -e 's|@EGDIR@|${EGDIR}|g'
-CONF_FILES= ${EGDIR}/opendkim.conf.sample \
- ${PKG_SYSCONFDIR}/opendkim.conf
+#CONF_FILES= ${EGDIR}/opendkim.conf.sample \
+# ${PKG_SYSCONFDIR}/opendkim.conf
PLIST_SRC+= ${PKGDIR}/PLIST.filter
.else
diff --git a/mail/opendkim/patches/patch-aa b/mail/opendkim/patches/patch-aa
deleted file mode 100644
index 22838132312..00000000000
--- a/mail/opendkim/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2011/02/21 00:04:22 pettai Exp $
-
---- opendkim/Makefile.in.orig 2011-02-20 23:52:59.000000000 +0000
-+++ opendkim/Makefile.in
-@@ -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_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: