version bump

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

4 files changed, 167 insertions, 3 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index cbc3b5d03de7..d789ab5ef876 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.3 2009/11/01 23:21:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.4 2009/12/14 03:05:11 dragonheart Exp $
+
+*opendkim-1.2.0 (14 Dec 2009)
+
+  14 Dec 2009; Daniel Black <dragonheart@gentoo.org> +opendkim-1.2.0.ebuild,
+  metadata.xml:
+  version bump
 
 *opendkim-1.1.2 (01 Nov 2009)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index f6e2e81337c3..752f7a6e3717 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -6,7 +6,9 @@ AUX opendkim-1.1.2-test73.patch 309 RMD160 2caaf1bb4f1547c6f59c94733f4cc5cf6389a
 AUX opendkim.init 1417 RMD160 df83c4df3b5a6eaa86ff21f8557bcb41fe5cbf2a SHA1 5d70122b00fd11f2a1b26537faca50bda7647f45 SHA256 a79ff9fed5ee3834aa905f6df613035b1121a3b3e264362a74558d315d3c30d9
 DIST opendkim-1.1.0.tar.gz 887601 RMD160 99bb535a89945093030ca12a488eec121232bc82 SHA1 32f407dc1bb4835b0726413d4a27a8f01c210650 SHA256 e579f7ec6cf430a934bab24fc04e190f2a4f0f6fde18098dce0ac390d0d7d734
 DIST opendkim-1.1.2.tar.gz 856455 RMD160 c79918192ed26f771286f1c88efe29ac71e66d73 SHA1 1609c6ffb201e0aa99ddb6c3194f252916074abd SHA256 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
+DIST opendkim-1.2.0.tar.gz 973738 RMD160 3aa933e96901952b50341ed0ee4173f138bb0187 SHA1 8f4c068c9e41428795ea7c9765d112ee1feec6c9 SHA256 eb048682ca587d466b9d01fde576ef7868e718abedb8a1a773aaa016719393d3
 EBUILD opendkim-1.1.0.ebuild 4820 RMD160 71d6466fed544a8bf7d7a2dbb55f17056f9915cd SHA1 2623f4fc318ffa196f197d33ddec9f5ea18fdbb3 SHA256 6297c1ab1541675b3c21278833ce253df5783f93f113a2597998f0e89e83f486
 EBUILD opendkim-1.1.2.ebuild 4978 RMD160 60f9c9d991c192797740c81d9ac886b954281bb8 SHA1 df683fb692d2ee36f9c5d031796f7498da9dc340 SHA256 9362279db968010a95e7e4ebc59646e480cbda64df5c723306936d7c70336f13
-MISC ChangeLog 972 RMD160 929c37e5fef27ed124ef3991c2f6c91c0c512f9c SHA1 fe208bbed593facdeb7e9be16167b5938c97e211 SHA256 c09d110006b6363018426c28604f1e97d7404568712e38355c1ae0092f09bcde
-MISC metadata.xml 877 RMD160 212b16dcf1e9235b6812e00b87bb86829b36851c SHA1 4dd885d68dd701a414497170c202501fc4510e93 SHA256 9a19f087a9a36275fbd21cc8539abdaa69c424fb883468ee3a19165c4e91aaf9
+EBUILD opendkim-1.2.0.ebuild 5090 RMD160 6d6900fb1a3a2cec9c371cd7e7cf937e158745be SHA1 62de0fc5628dd2d3841bb0260a53b53dfab86a09 SHA256 afff56a3c782aa260421211718f4d77a8de4e1f6a42367b8fcea4d06fe1f3de8
+MISC ChangeLog 1112 RMD160 bc01f0564304fa3a9e34b4062a06d9cc8769971f SHA1 c2ddfe498caa847be86d772a68a4589ba9eac35d SHA256 b37a649a2d469b4625597dbc014b9bf9f6beb217e4d3b2d5b673f36ffb3a2766
+MISC metadata.xml 1058 RMD160 6750134c6f61c6e63034f6ca167ec15cde7ecde8 SHA1 3e511b0843049dde6e0086033f9c7b8be8ae874e SHA256 2774392c4952db7c7b8648b49cd1b642aa3d52a2470b8decfd79e7e7f31cf444
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 516223af66db..2073d216d835 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -17,6 +17,9 @@ using the DKIM standard. This is a fork of Sendmail's DKIM-milter</longdescripti
 	queries</flag>
 	<flag name='multiplesigs'>Allow addition of multiple signatures when key
 	lists are in use.</flag>
+	<flag name='opendbx'>Use opendbx backend to faciliate dataset driven
+	OpenDKIM configuration options like stats, bodylengthdb, etc. against a wide
+	variety of databse types</flag>
 
 </use>
 </pkgmetadata>
diff --git a/mail-filter/opendkim/opendkim-1.2.0.ebuild b/mail-filter/opendkim/opendkim-1.2.0.ebuild
new file mode 100644
index 000000000000..99b69103ac49
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-1.2.0.ebuild
@@ -0,0 +1,153 @@
+# 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.2.0.ebuild,v 1.1 2009/12/14 03:05:11 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 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+db asyncdns opendbx"
+
+# 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 )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )"
+#	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() {
+	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 query_cache) \
+		$(use_enable db report_intervals) \
+		$(use_enable db stats) \
+		$(use_enable asyncdns arlib) \
+		$(use_enable asyncdns dnsupgrade) \
+		$(use_with opendbx odbx) \
+		--without-domainkeys \
+		--enable-capture_unknown_errors \
+		--enable-dkim_reputation \
+		--enable-identity_header \
+		--enable-redirect \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-select_canonicalization \
+		--enable-selector_header \
+		--enable-sender_macro \
+		--enable-vbr \
+		--enable-ztags
+#		$(use_enable diffheaders) \
+	# post release error found.
+	use db && sed -i -e 's/_FFR_BODYLENGTHDB/_FFR_BODYLENGTH_DB/' build-config.h
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# file collision
+	rm "${D}"/usr/share/man/man3/ar.3
+
+	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"
+}