version bump incorporating suggestions from steveb and Eray Aslan in bug #289929

(Portage version: 2.2_rc48/cvs/Linux x86_64)

4 files changed, 178 insertions, 3 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index a08b91c4b98f..cbc3b5d03de7 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.2 2009/10/06 22:54:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.3 2009/11/01 23:21:07 dragonheart Exp $
+
+*opendkim-1.1.2 (01 Nov 2009)
+
+  01 Nov 2009; Daniel Black <dragonheart@gentoo.org> +opendkim-1.1.2.ebuild,
+  +files/opendkim-1.1.2-test73.patch, metadata.xml:
+  version bump incorporating suggestions from steveb and Eray Aslan in bug
+  #289929
 
   06 Oct 2009; Daniel Black <dragonheart@gentoo.org> opendkim-1.1.0.ebuild:
   dependency fix thanks Eray
diff --git a/mail-filter/opendkim/files/opendkim-1.1.2-test73.patch b/mail-filter/opendkim/files/opendkim-1.1.2-test73.patch
new file mode 100644
index 000000000000..ea69c2bd8485
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-1.1.2-test73.patch
@@ -0,0 +1,11 @@
+--- 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/metadata.xml b/mail-filter/opendkim/metadata.xml
index 13dd9050dc16..516223af66db 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -9,7 +9,14 @@
 <longdescription>A program implementing the Milter API that signs and verifies
 using the DKIM standard. This is a fork of Sendmail's DKIM-milter</longdescription>
 <use>
-	<flag name='db'>Include features like stats, querycache, popauth and
-	bodylengthdb that include berkdb</flag>
+	<flag name='db'>Include features like stats, querycache, popauth, report
+	intervals and bodylengthdb that include berkdb</flag>
+	<flag name='diffheaders'>On verification failure, compare the
+	original and the received headers to look for possible munging</flag>
+	<flag name='asyncdns'>Use inbuilt asynchronous DNS library for
+	queries</flag>
+	<flag name='multiplesigs'>Allow addition of multiple signatures when key
+	lists are in use.</flag>
+
 </use>
 </pkgmetadata>
diff --git a/mail-filter/opendkim/opendkim-1.1.2.ebuild b/mail-filter/opendkim/opendkim-1.1.2.ebuild
new file mode 100644
index 000000000000..17fd8fdbf3b8
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-1.1.2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2009 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.1 2009/11/01 23:21:07 dragonheart Exp $
+
+EAPI="2"
+
+inherit eutils
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+db diffheaders asyncdns multiplesigs"
+
+# FUTURE: unbound (dnssec lib) - bug #223103
+
+DEPEND="dev-libs/openssl
+	db? ( >=sys-libs/db-3.2 )
+	|| ( mail-filter/libmilter mail-mta/sendmail )
+	diffheaders? ( dev-libs/tre )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup milter
+	# mail-milter/spamass-milter creates milter user with this home directory
+	# For consistency reasons, milter user must be created here with this home directory
+	# even though this package doesn't need a home directory for this user (#280571)
+	enewuser milter -1 -1 /var/lib/milter milter
+}
+
+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) \
+		$(use_enable db popauth) \
+		$(use_enable db querycache) \
+		$(use_enable db reportintervals) \
+		$(use_enable db stats) \
+		$(use_enable diffheaders) \
+		$(use_enable asyncdns arlib) \
+		$(use_enable asyncdns dnsupgrade) \
+		$(use_enable multiplesigs multiplesigs) \
+		--without-domainkeys \
+		--enable-captureerrors \
+		--enable-dkimreputation \
+		--enable-identityheader \
+		--enable-redirect \
+		--enable-replacerules \
+		--enable-selectcanon \
+		--enable-selectorheader \
+		--enable-sendermacro \
+		--enable-vbr \
+		--enable-ztags
+}
+
+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}
+	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
+		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
+		if use db; then
+			echo Statistics /var/lib/opendkim/stats.db >> \
+				"${D}"/etc/opendkim/opendkim.conf
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "If you want to sign your mail messages, you will have to run"
+	elog "  emerge --config ${CATEGORY}/${PN}"
+	elog "It will help you create your key and give you hints on how"
+	elog "to configure your DNS and MTA."
+
+	ewarn "Make sure your MTA has r/w access to the socket file."
+	ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
+	ewarn "to milter group or you can simply set UMask to 000."
+}
+
+pkg_config() {
+	local selector keysize pubkey
+
+	read -p "Enter the selector name (default ${HOSTNAME}): " selector
+	[[ -n "${selector}" ]] || selector=${HOSTNAME}
+	if [[ -z "${selector}" ]]; then
+		eerror "Oddly enough, you don't have a HOSTNAME."
+		return 1
+	fi
+	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
+		ewarn "The private key for this selector already exists."
+	else
+		einfo "Select the size of private key:"
+		einfo "  [1] 512 bits"
+		einfo "  [2] 1024 bits"
+		while read -n 1 -s -p "  Press 1 or 2 on the keyboard to select the key size " keysize ; do
+			[[ "${keysize}" == "1" || "${keysize}" == "2" ]] && echo && break
+		done
+		case ${keysize} in
+			1) keysize=512 ;;
+			*) keysize=1024 ;;
+		esac
+
+		# generate the private and public keys
+		opendkim-genkey.sh -b ${keysize} -D "${ROOT}"etc/opendkim/ \
+			-s ${selector} && \
+			chown milter:milter \
+			"${ROOT}"etc/opendkim/"${selector}".private || \
+				{ eerror "Failed to create private and public keys." ; return 1; }
+		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
+	fi
+
+	# opendkim selector configuration
+	echo
+	einfo "Make sure you have the following settings in your dkim-filter.conf:"
+	einfo "  Keyfile /etc/opendkim/${selector}.private"
+	einfo "  Selector ${selector}"
+
+	# MTA configuration
+	echo
+	einfo "If you are using Postfix, add following lines to your main.cf:"
+	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
+	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
+
+	# DNS configuration
+	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
+	cat "${ROOT}"etc/opendkim/${selector}.txt
+	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
+	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
+	einfo
+	einfo "Also look at the ADSP http://tools.ietf.org/html/rfc5617"
+}