Sat Jan 5 17:05:07 2013 UTC ()
2.7.3           2012/11/29
        Log DB error string in dkimf_add_signrequest(), and fix a DSN handling
                error in dkimf_db_strerror().
        LIBOPENDKIM: Ignore entries in the oversign header field name list
                that are empty, and an oversign header field name list that
                is present but empty.
        LIBOPENDKIM: Allow header field lists to be empty, flushing any that
                were previously defined.
        BUILD: Improve tests for including <strl.h>.
        REPUTATION: Use lowercase for keywords in REPUTE query generation
                and handling.
        STATS: Clean up a dead link in opendkim-genstats.

2.7.2           2012/11/14
        Log the author domain name when rejecting or discarding due to ADSP.
        LIBOPENDKIM: Improve re-entrancy of dkim_eoh() when verifying.
        LIBOPENDKIM: Only do a single read attempt of a private key under
                GNUTLS to avoid hiding a useful error code.
        STATS: Add long option support for opendkim-importstats.
        STATS: Fix overly-strict domain name rules in opendkim-reportstats.
        TOOLS: Fix opendkim-genkey subdomains default.
        TOOLS: Fix opendkim-testmsg GNUTLS initialization.
        TOOLS: Add ability to assert a reporter ID to opendkim-spam.
        TOOLS: Add ability to skip a fixed number of Received: fields.
        TOOLS: Print a warning when asked to generate a key smaller than
                the recommended minimum.
        BUILD: Fix bug #SF3585163: Use a provided libstrl if detected.
        BUILD: Portability fixes for Solaris 10 from Claus Assmann and
                Leena Heino.

2.7.1           2012/10/30
        Fix bug #SF3581657: Fix faulty logic in LDAP open code.
        Fix bug #SF3581743: Properly handle NULLs returned from OpenDBX
                queries and low field counts in dkimf_db_walk().
        In the _FFR_REPUTATION code, free JSON objects when done with them.
        TOOLS: Fix argument parsing in new version of opendkim-genkey.

2.7.0           2012/10/24
        Feature request #SF2964375: Reject configuration files that have
                a SigningTable referencing a missing or malformed KeyTable
                entry.
        Feature request #SF3544764: Support for libar has been discontinued.
                For asynchronous and/or thread-safe resolver service,
                use libunbound or a suitable version of BIND.
        Feature request #SF3545658: Replace "ResolvConf" with "Nameservers"
                and add support for NS list overrides for versions of bind
                that have res_setservers().  Also rename "UnboundConfigFile"
                to "ResolverConfiguration", and make "TrustAnchorFile"
                generally available.
        Feature request #SF3547124: Skip reputation checks on passing
                signatures whose keys had a "t=y" value.
        Feature request #SF3555842: Add "ReputationTest" setting.
        Feature request #SF3556439: Update opendkim-atpszone per RFC6541.
        Feature request #SF3559744: Add library option DKIM_OPTS_MINKEYBITS
                allowing one to specify a minimum number of key bits for
                acceptable keys and signatures.  This is exposed through new
                configuration file option "MinimumKeyBits".  The default
                is 1024.
        Fix bug #SF3536414: Activate _FFR_OVERSIGN, and remove
                DKIM_OPTS_ALWAYSHDRS.
        Fix bug #SF3536655: Rename "X-Header" to "SoftwareHeader", and rename
                all header fields added that start "X-" to remove that prefix,
                per RFC6648.  The old name will be accepted through the end
                of the 2.7.x line.
        Fix bug #SF3538896: Remove antiquated CVS Id: tags, which cleans up
                some (harmless) build warnings.
        Fix bug #SF3548741: Add "ReputationTimeout" for use inside
                _FFR_REPUTATION, rather than using the built-in default
                or a hard-coded one.
        Fix bug #SF3549307: Remove _FFR_REPUTATION_CACHE, as it is redundant
                to caching code that's part of _FFR_REPUTATION already.
        Fix bug #SF3555844: Get repute client code in sync with repute.php
                (and the current REPUTE WG drafts).
        Fix bounds checking in the dstring printf functions.
        Fix loop structure in the C side of odkim.get_rcpt().
        Change all temporary directory defaults from /var/tmp to /tmp.
        Activate _FFR_LUA_GLOBALS.
        Request the milter permissions required to get _FFR_REDIRECT working.
        Add _FFR_REPRRD, which is a second approach to DKIM-based reputation
                using round robin databases and Holt-Winters foreacasting
                using rrdtool (see http://oss.oetiker.ch/rrdtool/).  Still
                experimental.
        Patch #SF3555843: With sufficient verbosity, report the default
                configuration file path.  Patch from Andreas Schulze.
        BUILD: Fix bug #SF3531658: Move the strlcat() and strlcpy()
                implementations to their own library so that programs don't
                drag in crypto and other dependencies they don't need.
                Also clean up several other unnecessary dependencies imposed
                by imprecise use of autoconf.
        BUILD: Patch #SF3555845: Add support for older versions of libcurl.
        BUILD: Install non-user things in sbin instead of bin.
        LIBOPENDKIM: Feature request #SF3565006: Add dkim_add_querymethod()
                and dkim_sig_seterror(), define DKIM_CBSTAT_DEFAULT, and
                remove an assertion in dkim_get_key_dns(), which together
                allow for applications to develop non-standard key retrieval
                mechanisms.
        LIBOPENDKIM: Fix bug #SF3559080: Log correct domains and selectors
                with SSL errors.
        LIBOPENDKIM: Add DNS functions dkim_dns_config(), dkim_dns_init(),
                dkim_dns_nslist(), dkim_dns_set_init(), dkim_dns_set_close(),
                dkim_dns_set_nslist(), dkim_dns_set_config(),
                dkim_dns_set_trustanchor(), dkim_dns_trustanchor().
        LIBOPENDKIM: Patch #SF3562496: Add DKIM_OPTS_REQUIREDHDRS to allow
                alteration of the mandatory header field set.
        LIBOPENDKIM: If "q=" is present and method "dns" is specified, it
                must be followed by "/txt", per RFC6376.
        LIBOPENDKIM: For dkim_add_xtag(), copy the provided values so the
                caller doesn't have to keep them around.
        LIBOPENDKIM: Allow dual signing of a single body with dkim_resign().
        STATS: Fix bug #SF3555847: Add "--nocircles" to opendkim-gengraphs
                to allow operation with versions of gnuplot that don't know
                what "with circles" means.
        STATS: Patch #SF3555841: Temporary table SQL correction.
        TOOLS: Feature request #SF3553918: Add "-u" flag to opendkim-atpszone
                and opendkim-genzone enabling them to produce output suitable
                for use as input to nsupdate(8).
        TOOLS: Feature request #SF3558818: Teach opendkim-testkey about the new
                "ResolverConfiguration" setting.
        TOOLS: Fix bug #SF3565013: Replace opendkim-genkey with a perl script
                that knows how to do splitting of character-strings in DNS
                TXT records.
        TOOLS: Fix bug #SF3568846: Add "-t" to opendkim-testmsg to allow
                override of the directory where temporary files go.  Also,
                clean up temporary files after creating them.
        TOOLS: Add opendkim-rephistory.

This should fix PR pkg/47370.


(pettai)
diff -r1.9 -r1.10 pkgsrc/mail/opendkim/Makefile
diff -r1.7 -r1.8 pkgsrc/mail/opendkim/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/mail/opendkim/PLIST.filter
diff -r1.5 -r1.6 pkgsrc/mail/opendkim/PLIST.stats
diff -r1.8 -r1.9 pkgsrc/mail/opendkim/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/opendkim/options.mk

cvs diff -r1.9 -r1.10 pkgsrc/mail/opendkim/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/opendkim/Makefile 2012/11/12 19:23:35 1.9
+++ pkgsrc/mail/opendkim/Makefile 2013/01/05 17:05:07 1.10
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1# $NetBSD: Makefile,v 1.9 2012/11/12 19:23:35 pettai Exp $ 1# $NetBSD: Makefile,v 1.10 2013/01/05 17:05:07 pettai Exp $
2 2
3DISTNAME= opendkim-2.6.7 3DISTNAME= opendkim-2.7.3
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendkim/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendkim/}
6 6
7MAINTAINER= pettai@NetBSD.org 7MAINTAINER= pettai@NetBSD.org
8HOMEPAGE= http://opendkim.org/ 8HOMEPAGE= http://opendkim.org/
9COMMENT= Open source DKIM library, MTA filter implementation and tools 9COMMENT= Open source DKIM library, MTA filter implementation and tools
10LICENSE= sendmail-open-source-license 10LICENSE= sendmail-open-source-license
11 11
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
13USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config perl:run
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
16 16
 17REPLACE_PERL+= opendkim/opendkim-genkey.in
 18
17FILES_SUBST+= DKIM_USER=${DKIM_USER} DKIM_GROUP=${DKIM_GROUP} 19FILES_SUBST+= DKIM_USER=${DKIM_USER} DKIM_GROUP=${DKIM_GROUP}
18BUILD_DEFS+= VARBASE DKIM_USER DKIM_GROUP 20BUILD_DEFS+= VARBASE DKIM_USER DKIM_GROUP
19 21
20DKIM_USER?= opendkim 22DKIM_USER?= opendkim
21DKIM_GROUP?= opendkim 23DKIM_GROUP?= opendkim
22PKG_GROUPS= ${DKIM_USER} 24PKG_GROUPS= ${DKIM_USER}
23PKG_USERS= ${DKIM_USER}:${DKIM_GROUP} 25PKG_USERS= ${DKIM_USER}:${DKIM_GROUP}
24PKG_GROUPS_VARS+= DKIM_GROUP 26PKG_GROUPS_VARS+= DKIM_GROUP
25PKG_USERS_VARS+= DKIM_USER 27PKG_USERS_VARS+= DKIM_USER
26OWN_DIRS_PERMS+= ${VARBASE}/run/opendkim \ 28OWN_DIRS_PERMS+= ${VARBASE}/run/opendkim \
27 ${DKIM_USER} ${DKIM_GROUP} 0750 29 ${DKIM_USER} ${DKIM_GROUP} 0750
28 30
29PKGCONFIG_OVERRIDE+= libar/ar.pc.in 
30PKGCONFIG_OVERRIDE+= libopendkim/opendkim.pc.in 31PKGCONFIG_OVERRIDE+= libopendkim/opendkim.pc.in
31PKGCONFIG_OVERRIDE+= libvbr/vbr.pc.in 
32 32
33.include "options.mk" 33.include "options.mk"
34 34
35PLIST_SRC+= ${PKGDIR}/PLIST 35PLIST_SRC+= ${PKGDIR}/PLIST
36 36
37BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8 37BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8
38.include "../../security/openssl/buildlink3.mk" 38.include "../../security/openssl/buildlink3.mk"
39BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0 39BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
40.include "../../mail/libmilter/buildlink3.mk" 40.include "../../mail/libmilter/buildlink3.mk"
41.include "../../mk/pthread.buildlink3.mk" 41.include "../../mk/pthread.buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"

cvs diff -r1.7 -r1.8 pkgsrc/mail/opendkim/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/opendkim/PLIST 2012/11/12 19:23:35 1.7
+++ pkgsrc/mail/opendkim/PLIST 2013/01/05 17:05:07 1.8
@@ -1,53 +1,67 @@ @@ -1,53 +1,67 @@
1@comment $NetBSD: PLIST,v 1.7 2012/11/12 19:23:35 pettai Exp $ 1@comment $NetBSD: PLIST,v 1.8 2013/01/05 17:05:07 pettai Exp $
2bin/opendkim-genkey 
3bin/opendkim-genzone 
4bin/opendkim-testadsp 
5bin/opendkim-testkey 
6bin/opendkim-testmsg 
7include/opendkim/dkim.h 2include/opendkim/dkim.h
8lib/libopendkim.la 3lib/libopendkim.la
9lib/pkgconfig/opendkim.pc 4lib/pkgconfig/opendkim.pc
 5man/man5/opendkim.conf.5
10man/man8/opendkim-genkey.8 6man/man8/opendkim-genkey.8
11man/man8/opendkim-genzone.8 7man/man8/opendkim-genzone.8
12man/man8/opendkim-testadsp.8 8man/man8/opendkim-testadsp.8
13man/man8/opendkim-testkey.8 9man/man8/opendkim-testkey.8
14man/man8/opendkim-testmsg.8 10man/man8/opendkim-testmsg.8
 11man/man8/opendkim.8
 12sbin/opendkim
 13sbin/opendkim-genkey
 14sbin/opendkim-genzone
 15sbin/opendkim-testadsp
 16sbin/opendkim-testkey
 17sbin/opendkim-testmsg
15share/doc/opendkim/FEATURES 18share/doc/opendkim/FEATURES
16share/doc/opendkim/KNOWNBUGS 19share/doc/opendkim/KNOWNBUGS
17share/doc/opendkim/LICENSE 20share/doc/opendkim/LICENSE
18share/doc/opendkim/LICENSE.Sendmail 21share/doc/opendkim/LICENSE.Sendmail
19share/doc/opendkim/README 22share/doc/opendkim/README
20share/doc/opendkim/README.LDAP 23share/doc/opendkim/README.LDAP
21share/doc/opendkim/README.SQL 24share/doc/opendkim/README.SQL
22share/doc/opendkim/README.opendkim-reportstats 25share/doc/opendkim/README.opendkim-reportstats
23share/doc/opendkim/README.specs.html 26share/doc/opendkim/README.specs.html
24share/doc/opendkim/RELEASE_NOTES.Sendmail 27share/doc/opendkim/RELEASE_NOTES.Sendmail
25share/doc/opendkim/authheaders-check-setup-hook.lua 28share/doc/opendkim/authheaders-check-setup-hook.lua
26share/doc/opendkim/chroot 29share/doc/opendkim/chroot
27share/doc/opendkim/convert_keylist.sh 30share/doc/opendkim/convert_keylist.sh
28share/doc/opendkim/dkim.html 31share/doc/opendkim/dkim.html
 32share/doc/opendkim/dkim_add_querymethod.html
29share/doc/opendkim/dkim_add_xtag.html 33share/doc/opendkim/dkim_add_xtag.html
30share/doc/opendkim/dkim_alg_t.html 34share/doc/opendkim/dkim_alg_t.html
31share/doc/opendkim/dkim_body.html 35share/doc/opendkim/dkim_body.html
32share/doc/opendkim/dkim_canon_t.html 36share/doc/opendkim/dkim_canon_t.html
33share/doc/opendkim/dkim_cbstat.html 37share/doc/opendkim/dkim_cbstat.html
34share/doc/opendkim/dkim_chunk.html 38share/doc/opendkim/dkim_chunk.html
35share/doc/opendkim/dkim_close.html 39share/doc/opendkim/dkim_close.html
36share/doc/opendkim/dkim_diffheaders.html 40share/doc/opendkim/dkim_diffheaders.html
 41share/doc/opendkim/dkim_dns_close.html
 42share/doc/opendkim/dkim_dns_config.html
 43share/doc/opendkim/dkim_dns_init.html
 44share/doc/opendkim/dkim_dns_nslist.html
 45share/doc/opendkim/dkim_dns_set_close.html
 46share/doc/opendkim/dkim_dns_set_config.html
 47share/doc/opendkim/dkim_dns_set_init.html
 48share/doc/opendkim/dkim_dns_set_nslist.html
37share/doc/opendkim/dkim_dns_set_query_cancel.html 49share/doc/opendkim/dkim_dns_set_query_cancel.html
38share/doc/opendkim/dkim_dns_set_query_service.html 50share/doc/opendkim/dkim_dns_set_query_service.html
39share/doc/opendkim/dkim_dns_set_query_start.html 51share/doc/opendkim/dkim_dns_set_query_start.html
40share/doc/opendkim/dkim_dns_set_query_waitreply.html 52share/doc/opendkim/dkim_dns_set_query_waitreply.html
 53share/doc/opendkim/dkim_dns_set_trustanchor.html
 54share/doc/opendkim/dkim_dns_trustanchor.html
41share/doc/opendkim/dkim_dnssec.html 55share/doc/opendkim/dkim_dnssec.html
42share/doc/opendkim/dkim_eoh.html 56share/doc/opendkim/dkim_eoh.html
43share/doc/opendkim/dkim_eom.html 57share/doc/opendkim/dkim_eom.html
44share/doc/opendkim/dkim_flush_cache.html 58share/doc/opendkim/dkim_flush_cache.html
45share/doc/opendkim/dkim_free.html 59share/doc/opendkim/dkim_free.html
46share/doc/opendkim/dkim_get_msgdate.html 60share/doc/opendkim/dkim_get_msgdate.html
47share/doc/opendkim/dkim_get_reputation.html 61share/doc/opendkim/dkim_get_reputation.html
48share/doc/opendkim/dkim_get_signer.html 62share/doc/opendkim/dkim_get_signer.html
49share/doc/opendkim/dkim_get_sigsubstring.html 63share/doc/opendkim/dkim_get_sigsubstring.html
50share/doc/opendkim/dkim_get_user_context.html 64share/doc/opendkim/dkim_get_user_context.html
51share/doc/opendkim/dkim_getcachestats.html 65share/doc/opendkim/dkim_getcachestats.html
52share/doc/opendkim/dkim_getdomain.html 66share/doc/opendkim/dkim_getdomain.html
53share/doc/opendkim/dkim_geterror.html 67share/doc/opendkim/dkim_geterror.html
@@ -136,13 +150,14 @@ share/doc/opendkim/example.com.ldif @@ -136,13 +150,14 @@ share/doc/opendkim/example.com.ldif
136share/doc/opendkim/index.html 150share/doc/opendkim/index.html
137share/doc/opendkim/opendkim 151share/doc/opendkim/opendkim
138share/doc/opendkim/opendkim-fixipaddrs.pl 152share/doc/opendkim/opendkim-fixipaddrs.pl
139share/doc/opendkim/opendkim-spam-ignore-cmdswitch.patch 153share/doc/opendkim/opendkim-spam-ignore-cmdswitch.patch
140share/doc/opendkim/opendkim.conf.sample 154share/doc/opendkim/opendkim.conf.sample
141share/doc/opendkim/opendkim.conf.simple 155share/doc/opendkim/opendkim.conf.simple
142share/doc/opendkim/opendkim.conf.simple-verify 156share/doc/opendkim/opendkim.conf.simple-verify
143share/doc/opendkim/opendkim.ldif 157share/doc/opendkim/opendkim.ldif
144share/doc/opendkim/opendkim.schema 158share/doc/opendkim/opendkim.schema
145share/doc/opendkim/opendkim.spec.in 159share/doc/opendkim/opendkim.spec.in
146share/doc/opendkim/opendkim.xml 160share/doc/opendkim/opendkim.xml
147share/doc/opendkim/overview.html 161share/doc/opendkim/overview.html
148share/doc/opendkim/stats.lua 162share/doc/opendkim/stats.lua
 163share/examples/rc.d/opendkim

cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/opendkim/PLIST.filter (expand / switch to unified diff)

--- pkgsrc/mail/opendkim/PLIST.filter 2010/10/19 23:11:42 1.1.1.1
+++ pkgsrc/mail/opendkim/PLIST.filter 2013/01/05 17:05:07 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1@comment $NetBSD: PLIST.filter,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $ 1@comment $NetBSD: PLIST.filter,v 1.2 2013/01/05 17:05:07 pettai Exp $
2man/man5/opendkim.conf.5 2man/man5/opendkim.conf.5
3man/man8/opendkim.8 3man/man8/opendkim.8
4sbin/opendkim 4sbin/opendkim
 5share/examples/opendkim/opendkim.conf.sample
5share/examples/rc.d/opendkim 6share/examples/rc.d/opendkim

cvs diff -r1.5 -r1.6 pkgsrc/mail/opendkim/PLIST.stats (expand / switch to unified diff)

--- pkgsrc/mail/opendkim/PLIST.stats 2012/06/16 20:20:15 1.5
+++ pkgsrc/mail/opendkim/PLIST.stats 2013/01/05 17:05:07 1.6
@@ -1,5 +1,11 @@ @@ -1,5 +1,11 @@
1@comment $NetBSD: PLIST.stats,v 1.5 2012/06/16 20:20:15 pettai Exp $ 1@comment $NetBSD: PLIST.stats,v 1.6 2013/01/05 17:05:07 pettai Exp $
2bin/opendkim-spam 2man/man8/opendkim-expire.8
3bin/opendkim-stats 3man/man8/opendkim-gengraphs.8
4man/man1/opendkim-spam.1 4man/man8/opendkim-genstats.8
5man/man8/opendkim-stats.8 5man/man8/opendkim-stats.8
 6sbin/opendkim-expire
 7sbin/opendkim-gengraphs
 8sbin/opendkim-genstats
 9sbin/opendkim-reportstats
 10sbin/opendkim-stats
 11share/doc/opendkim/mkdb.mysql

cvs diff -r1.8 -r1.9 pkgsrc/mail/opendkim/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/opendkim/distinfo 2012/11/19 18:39:34 1.8
+++ pkgsrc/mail/opendkim/distinfo 2013/01/05 17:05:07 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2012/11/19 18:39:34 pettai Exp $ 1$NetBSD: distinfo,v 1.9 2013/01/05 17:05:07 pettai Exp $
2 2
3SHA1 (opendkim-2.6.7.tar.gz) = db689bbb9c2df7c0140a470504f050e6ffe2c24b 3SHA1 (opendkim-2.7.3.tar.gz) = abaab329ccea5f27166d99030a6e3cac3db63d76
4RMD160 (opendkim-2.6.7.tar.gz) = 54fc6693d610f5e746360904415c003396ab5012 4RMD160 (opendkim-2.7.3.tar.gz) = 83270cc71246b21806e6c3ca83f3e2dcdae6c845
5Size (opendkim-2.6.7.tar.gz) = 1129124 bytes 5Size (opendkim-2.7.3.tar.gz) = 1157432 bytes
6SHA1 (patch-configure) = 8e635d41c213f899b31b392b1cdb96c8d5113ca4 6SHA1 (patch-configure) = 8e635d41c213f899b31b392b1cdb96c8d5113ca4

cvs diff -r1.3 -r1.4 pkgsrc/mail/opendkim/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/opendkim/options.mk 2011/04/29 11:48:24 1.3
+++ pkgsrc/mail/opendkim/options.mk 2013/01/05 17:05:07 1.4
@@ -1,59 +1,66 @@ @@ -1,59 +1,66 @@
1# $NetBSD: options.mk,v 1.3 2011/04/29 11:48:24 adam Exp $ 1# $NetBSD: options.mk,v 1.4 2013/01/05 17:05:07 pettai Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.opendkim 3PKG_OPTIONS_VAR= PKG_OPTIONS.opendkim
4PKG_SUPPORTED_OPTIONS= filter debug dkim-stats vbr 4PKG_SUPPORTED_OPTIONS= opendkim-filter debug dkim-stats vbr
5PKG_SUGGESTED_OPTIONS= filter 5PKG_SUGGESTED_OPTIONS= opendkim-filter
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### Debug support 10### Debug support
11### 11###
12.if !empty(PKG_OPTIONS:Mdebug) 12.if !empty(PKG_OPTIONS:Mdebug)
13CONFIGURE_ARGS+= --enable-debug 13CONFIGURE_ARGS+= --enable-debug
14.else 14.else
15CONFIGURE_ARGS+= --disable-debug 15CONFIGURE_ARGS+= --disable-debug
16.endif 16.endif
17 17
18### 18###
19### Install filter (milter) plugin 19### Install filter (milter) plugin
20### 20###
21.if !empty(PKG_OPTIONS:Mfilter) 21.if !empty(PKG_OPTIONS:Mopendkim-filter)
22EGDIR= ${PREFIX}/share/examples/opendkim 22EGDIR= ${PREFIX}/share/examples/opendkim
23RCD_SCRIPTS= opendkim 23RCD_SCRIPTS= opendkim
24 24
25CONFIGURE_ARGS+= --enable-filter 25CONFIGURE_ARGS+= --enable-filter
26CONFIGURE_ARGS+= --with-milter=${PREFIX} 26CONFIGURE_ARGS+= --with-milter=${PREFIX}
27SUBST_CLASSES+= conf 
28SUBST_STAGE.conf= pre-configure 
29SUBST_FILES.conf= opendkim/Makefile.in 
30SUBST_SED.conf+= -e 's|@EGDIR@|${EGDIR}|g' 
31 27
32#CONF_FILES= ${EGDIR}/opendkim.conf.sample \ 28CONF_FILES= ${EGDIR}/opendkim.conf.sample \
33# ${PKG_SYSCONFDIR}/opendkim.conf 29 ${PKG_SYSCONFDIR}/opendkim.conf
 30
 31INSTALLATION_DIRS= ${EGDIR}
 32
 33post-install:
 34 ${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \
 35 ${DESTDIR}${EGDIR}/opendkim.conf.sample
34 36
35PLIST_SRC+= ${PKGDIR}/PLIST.filter 37PLIST_SRC+= ${PKGDIR}/PLIST.filter
36.else 38.else
37CONFIGURE_ARGS+= --disable-filter 39CONFIGURE_ARGS+= --disable-filter
38.endif 40.endif
39 41
 42
40### 43###
41### Build with VBR support 44### Build with VBR support
42### 45###
43.if !empty(PKG_OPTIONS:Mvbr) 46.if !empty(PKG_OPTIONS:Mvbr)
44CONFIGURE_ARGS+= --enable-vbr 47CONFIGURE_ARGS+= --enable-vbr
 48PKGCONFIG_OVERRIDE+= libvbr/vbr.pc.in
45PLIST_SRC+= ${PKGDIR}/PLIST.vbr 49PLIST_SRC+= ${PKGDIR}/PLIST.vbr
46.else 50.else
47CONFIGURE_ARGS+= --disable-vbr 51CONFIGURE_ARGS+= --disable-vbr
48.endif 52.endif
49 53
50### 54###
51### Install stats which outputs opendkim statistics 55### Install stats which outputs opendkim statistics
52### 56###
53.if !empty(PKG_OPTIONS:Mdkim-stats) 57.if !empty(PKG_OPTIONS:Mdkim-stats)
54#.include "../../mk/db1.builtin.mk" 58#.include "../../mk/db1.builtin.mk"
55CONFIGURE_ARGS+= --enable-stats 59CONFIGURE_ARGS+= --enable-stats
56PLIST_SRC+= ${PKGDIR}/PLIST.stats 60PLIST_SRC+= ${PKGDIR}/PLIST.stats
 61REPLACE_PERL+= stats/opendkim-expire.in
 62REPLACE_PERL+= stats/opendkim-gengraphs.in
 63REPLACE_PERL+= stats/opendkim-genstats.in
57.else 64.else
58CONFIGURE_ARGS+= --disable-stats 65CONFIGURE_ARGS+= --disable-stats
59.endif 66.endif