diff options
| -rw-r--r-- | mail-filter/opendkim/ChangeLog | 10 | ||||
| -rw-r--r-- | mail-filter/opendkim/files/opendkim-1.1.2-test73.patch | 11 | ||||
| -rw-r--r-- | mail-filter/opendkim/opendkim-1.2.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | mail-filter/opendkim/opendkim-2.0.0.ebuild | 4 | ||||
| -rw-r--r-- | mail-filter/opendkim/opendkim-2.0.1.ebuild (renamed from mail-filter/opendkim/opendkim-1.1.2.ebuild) | 76 |
5 files changed, 64 insertions, 41 deletions
diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog index 5bbbdc7433ad..79442f877a23 100644 --- a/mail-filter/opendkim/ChangeLog +++ b/mail-filter/opendkim/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for mail-filter/opendkim # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.11 2010/03/16 09:57:54 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.12 2010/03/22 05:39:28 dragonheart Exp $ + +*opendkim-2.0.1 (22 Mar 2010) + + 22 Mar 2010; Daniel Black <dragonheart@gentoo.org> -opendkim-1.1.2.ebuild, + -files/opendkim-1.1.2-test73.patch, opendkim-1.2.2-r1.ebuild, + opendkim-2.0.0.ebuild, +opendkim-2.0.1.ebuild: + bug fix release from upstream. License offically changed to BSD-3. Fixed + old ones to BSD-4 like they should of been. removed old version 16 Mar 2010; Daniel Black <dragonheart@gentoo.org> files/opendkim-2.0.0-lua-ldap.patch: diff --git a/mail-filter/opendkim/files/opendkim-1.1.2-test73.patch b/mail-filter/opendkim/files/opendkim-1.1.2-test73.patch deleted file mode 100644 index ea69c2bd8485..000000000000 --- a/mail-filter/opendkim/files/opendkim-1.1.2-test73.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- opendkim-1.1.2/libopendkim/t-test73.c.orig 2009-11-02 09:32:50.000000000 +1100 -+++ opendkim-1.1.2/libopendkim/t-test73.c 2009-11-02 09:34:32.000000000 +1100 -@@ -18,7 +18,7 @@ - - - /* libopendkim includes */ --#include "dkim.h" -+#include "dkim-internal.h" - #include "t-testdata.h" - - #define MAXHEADER 4096 diff --git a/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild b/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild index 6a52b245ee65..c20c49e70495 100644 --- a/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild +++ b/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild,v 1.1 2010/01/21 01:53:34 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild,v 1.2 2010/03/22 05:39:28 dragonheart Exp $ EAPI="2" @@ -10,7 +10,7 @@ DESCRIPTION="A milter-based application to provide DKIM signing and verification HOMEPAGE="http://opendkim.org" SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" -LICENSE="Sendmail-Open-Source BSD" +LICENSE="Sendmail-Open-Source BSD-4" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+db asyncdns opendbx unbound" diff --git a/mail-filter/opendkim/opendkim-2.0.0.ebuild b/mail-filter/opendkim/opendkim-2.0.0.ebuild index c371a1c1a4f8..3f2a922e8870 100644 --- a/mail-filter/opendkim/opendkim-2.0.0.ebuild +++ b/mail-filter/opendkim/opendkim-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.0.ebuild,v 1.2 2010/03/09 00:43:12 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.0.ebuild,v 1.3 2010/03/22 05:39:28 dragonheart Exp $ EAPI="2" @@ -15,7 +15,7 @@ DESCRIPTION="A milter-based application to provide DKIM signing and verification HOMEPAGE="http://opendkim.org" SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" -LICENSE="Sendmail-Open-Source BSD" +LICENSE="Sendmail-Open-Source BSD-4" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="asyncdns +db opendbx ldap lua sasl unbound" diff --git a/mail-filter/opendkim/opendkim-1.1.2.ebuild b/mail-filter/opendkim/opendkim-2.0.1.ebuild index 779e4c18632d..2649f0cda96b 100644 --- a/mail-filter/opendkim/opendkim-1.1.2.ebuild +++ b/mail-filter/opendkim/opendkim-2.0.1.ebuild @@ -1,11 +1,16 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-1.1.2.ebuild,v 1.2 2009/11/01 23:38:50 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.1.ebuild,v 1.1 2010/03/22 05:39:28 dragonheart Exp $ EAPI="2" inherit eutils +# for betas +#MY_P=${P/_b/.B} +#S=${WORKDIR}/${PN}-2.0.0 +#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz" + DESCRIPTION="A milter-based application to provide DKIM signing and verification" HOMEPAGE="http://opendkim.org" SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" @@ -13,14 +18,20 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" LICENSE="Sendmail-Open-Source BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+db diffheaders asyncdns multiplesigs" +IUSE="asyncdns +db opendbx ldap lua sasl unbound" -# FUTURE: unbound (dnssec lib) - bug #223103 +# FUTURE: diffheaders (libtre error) - bug #296813 DEPEND="dev-libs/openssl db? ( >=sys-libs/db-3.2 ) || ( mail-filter/libmilter mail-mta/sendmail ) - diffheaders? ( dev-libs/tre )" + opendbx? ( >=dev-db/opendbx-1.4.0 ) + lua? ( dev-lang/lua ) + ldap? ( net-nds/openldap + sasl? ( dev-libs/cyrus-sasl ) + ) + unbound? ( >=net-dns/unbound-1.4.1 )" +# diffheaders? ( dev-libs/tre ) RDEPEND="${DEPEND}" pkg_setup() { @@ -32,52 +43,67 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-test73.patch sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \ -e 's:/etc/mail:/etc/opendkim:g' \ opendkim/opendkim.conf.sample } src_configure() { - econf $(use_enable db bodylengthdb) \ + local conf + if use asyncdns ; then + if use unbound; then + conf=$(use_with unbound) + else + conf="$(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)" + fi + else + conf="$(use_with unbound) $(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)" + fi + if use ldap; then + conf="${conf} $(use_with sasl)" + fi + econf $(use_enable db bodylength_db) \ $(use_enable db popauth) \ - $(use_enable db querycache) \ - $(use_enable db reportintervals) \ + $(use_enable db query_cache) \ + $(use_enable db report_intervals) \ $(use_enable db stats) \ - $(use_enable diffheaders) \ - $(use_enable asyncdns arlib) \ - $(use_enable asyncdns dnsupgrade) \ - $(use_enable multiplesigs multiplesigs) \ + $(use_with opendbx odbx) \ + $(use_with lua) \ + $(use_with ldap openldap) \ + ${conf} \ + --docdir=/usr/share/doc/${PF} \ --without-domainkeys \ - --enable-captureerrors \ - --enable-dkimreputation \ - --enable-identityheader \ + --enable-capture_unknown_errors \ + --enable-dkim_reputation \ + --enable-identity_header \ --enable-redirect \ - --enable-replacerules \ - --enable-selectcanon \ - --enable-selectorheader \ - --enable-sendermacro \ + --enable-resign \ + --enable-replace_rules \ + --enable-select_canonicalization \ + --enable-selector_header \ + --enable-sender_macro \ --enable-vbr \ --enable-ztags +# $(use_enable diffheaders) \ } src_install() { emake DESTDIR="${D}" install # file collision rm "${D}"/usr/share/man/man3/ar.3 + #mv "${D}"/usr/share/doc/opendkim "${D}"/usr/share/doc/${PF} - mv "${D}"/usr/share/doc/opendkim "${D}"/usr/share/doc/${PF} newinitd "${FILESDIR}/opendkim.init" opendkim dodir /etc/opendkim /var/run/opendkim /var/lib/opendkim fowners milter:milter /var/run/opendkim /etc/opendkim /var/lib/opendkim # default configuration - if [ ! -f /etc/opendkim/opendkim.conf ]; then + if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then grep ^[^#] "${S}"/opendkim/opendkim.conf.sample \ > "${D}"/etc/opendkim/opendkim.conf echo \# Socket local:/var/run/opendkim/opendkim.sock >> \ "${D}"/etc/opendkim/opendkim.conf - echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf + echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf.basic if use db; then echo Statistics /var/lib/opendkim/stats.db >> \ "${D}"/etc/opendkim/opendkim.conf @@ -121,7 +147,7 @@ pkg_config() { # generate the private and public keys opendkim-genkey.sh -b ${keysize} -D "${ROOT}"etc/opendkim/ \ - -s ${selector} && \ + -s ${selector} -d '(your domain)' && \ chown milter:milter \ "${ROOT}"etc/opendkim/"${selector}".private || \ { eerror "Failed to create private and public keys." ; return 1; } @@ -130,7 +156,7 @@ pkg_config() { # opendkim selector configuration echo - einfo "Make sure you have the following settings in your dkim-filter.conf:" + einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:" einfo " Keyfile /etc/opendkim/${selector}.private" einfo " Selector ${selector}" |