Version bump

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

3 files changed, 224 insertions, 15 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index 3bf0ec11f619..d83ede16371d 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.41 2012/07/12 17:14:04 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.42 2012/07/13 06:17:44 eras Exp $
+
+*opendkim-2.6.4 (13 Jul 2012)
+
+  13 Jul 2012; Eray Aslan <eras@gentoo.org> +opendkim-2.6.4.ebuild:
+  Version bump
 
 *opendkim-2.6.3 (12 Jul 2012)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 425780ea9eee..710373a401e4 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -8,27 +8,29 @@ DIST opendkim-2.5.2.tar.gz 1475225 SHA256 fb6994ea4bbd7e93772517cd3ee0b4ec338ed5
 DIST opendkim-2.6.0.tar.gz 1127009 SHA256 1fd20a436af5005fb9870ec112315b9866642271250f0439cf0f0ac061051e41
 DIST opendkim-2.6.1.tar.gz 1125780 SHA256 a6cb55b1ae51cc6b37bfe09325c6e4c2309aabca0a447ea0baddbe8a159b25b6
 DIST opendkim-2.6.3.tar.gz 1127456 SHA256 6208d1bdf3e754cd26e3c9dd95ed68f00f9236e471242c176f2a6a61ede37216 SHA512 a9cbbac94cf23b613adb19e2fb38bda406d1874dd53be7ab0bae44860c284403ee33a1ca8b5aebe7964d0ea832169efa4c41c3ae93c37b8586904a0ecb431e19 WHIRLPOOL c12be4edbd42347d2e5e54d8073d948dbcbf84a15a3869ded14299baef08cd321487f2ea17f8d8e995e63fd0954a195c887046aca4e164f0a438417dabdc56ba
+DIST opendkim-2.6.4.tar.gz 1127508 SHA256 ff0c53eb93f21bca88f803668d32e127d884c83f850c159eb291898656dc622f SHA512 3706a75b259c96b9bd9efa7a79cb470bb5d3276d9080378ffe7dce771ae9e90797e5c6f5a24b89a1a23ff15cd379d6203938b2145ac0fc6a090e3a3fa708524f WHIRLPOOL 8a8ba93acfb82c676a528af35f2b70c05edb1a8f508ed9e5e855e8ab78941e8e757425610a3536a78c740a964893a79862252a83536989ff720b402e25c81318
 EBUILD opendkim-2.4.3.ebuild 6386 SHA256 5a997081adfa28ba728b2b1a9afc1b548094eef3265aaa5b5efb225b936fde67 SHA512 34b99a31e2b5a448f266cdab7fbf6f4f771b6441f49aacf13fe3b9ffce4e80b95bacab09d2f51bf2c91eb821f5f2cd8bd6a68bbef326fa91ad627632390862f4 WHIRLPOOL 1f6f918adf564bc3866ea7197be28c8be2c757b2b699c9c93a49b2bb7ed22d4c91d35e842a335a764025cba12698b72fb8dd7d1e516dcf8c47ed677e6109cf94
 EBUILD opendkim-2.5.2-r1.ebuild 6381 SHA256 fb66509fcc160db3cb5add3386e5d0ff40ed21e3d28d1405f330575c34f36a72 SHA512 6275ecedda76b28ab20de3ab9ec010f4529a9b0545a62c5298aa8c1f4759583c51a6ee64f8a624fd3aca8395a274ac153ec682d2c2ab6519427c401d4ece34ba WHIRLPOOL cd3ed8b5e46bb1e2073d9918cfbda16bdf92f98615607e9bcc80335b60bfd6dead5e3e7c4ec1473446d900b9845db6989e4c2c420427fa1c5741121b257cd594
 EBUILD opendkim-2.6.0.ebuild 6348 SHA256 16414fae7170e523be6a92cf2118a48296456f325ed57b0eefd164ae9d5a3444 SHA512 88f6393b58901d6b0f1acc4065ec67c264115c97e85628c6264831a929e3138a90d63eef0952cda4d950a8b51dd8f78b57517bdbd568440d5bf7ffb1dd7d5781 WHIRLPOOL 9ab00561df7c118c75b77a07bdf21c4ad85bf2a3d150fcda71a9ef50c9fbe92eac0a69ff51afae37676109e037b21cbcdcca6de077069b9ee7aadb6e26502172
 EBUILD opendkim-2.6.1.ebuild 6332 SHA256 2960caca3efcbfd1e791576aea7fbe591b32c1b518f6ea1a72f1cb69a60cec57 SHA512 6a89efc29d092682233f2079da9806b7ca2247bdaac9e37107d0c604b0131b6c63aaaff0090e7fd82fe7a071ffbb56667f43e535c3d25e9186912d3652615799 WHIRLPOOL 6a63ca377ead189d8f222c1d6c9c7bf79c5c586033d6a722231a7f8b9bbf8aa1aee01926fd234cba7741729bbca93388729a54e4847b6addb40679e79882d576
 EBUILD opendkim-2.6.3.ebuild 6332 SHA256 ec74fb29947fed50cf835bf848d184f6f902ef81741c00891ed598338523b837 SHA512 278a57502a8343948bd4a118fbe8092ab8cf703b7b28f0989105d2125273c3e1747301ace318de54e96a9ce1026085c7945fc760bde3f631e141bbf7a698faf6 WHIRLPOOL 6f9156e644207a540340e51fa72235eb20c5603b070c946c2d785393fe46aaffc1bb1498278a8f01fd5c6cebc2ae8fe9f9f2afcba862c3a6ce4dc879a0c373c7
-MISC ChangeLog 7638 SHA256 ecdc9fbc07b18f16be65d4ee92196da7f1a87c433cf90b3df49b025ea227930a SHA512 cdf782cd4a20a0e98fc3ff146e6e559087446260dc063b43322ba6bc71d264e55c74e2a87047af0782e98e7075da8981df3f296370e0999b14b910adf85de89d WHIRLPOOL 97b233729ec9159813df45e9cb18d5ec94a1157511d8ee826c8e5222d73b353c97e41611bd328de259c665e902c252ad10003fadcf0440ba4f2935b96a576211
+EBUILD opendkim-2.6.4.ebuild 6332 SHA256 6a789a58b78532698c1ac6351e9bd0404e000049a19ca330225dcd3aa79a5732 SHA512 7adb77946102c310aeb48f3a592b57ae165ee36c4793e3f0757e230160cba17569548bc39601ddc4273e8a86ae1919ae2f22230e105770f075ce33f7eee2d299 WHIRLPOOL ece4f43bc716d8768da704c19b293e8530a74111af9641ade1e6c1202b711ec76711a8b57396a60a0885203b312a7331d8f8ef8b623cf8285cc1c8e297068c2f
+MISC ChangeLog 7753 SHA256 d84088ca985de9ab07f8733ce885337c42b4466ad36e9b3ee126874f63ac21a1 SHA512 08d7aa756a406d9355771a4cd28b072706f3de18db9f1aa1e9a29bc589b131ff343c5599b169fb1f887883f926f27ae964636e57f9c0282043075233ea6752af WHIRLPOOL 1e6db2c5b355ac30323666f9cebf4eaf2a93da9d18e27fef70645cf2bb428a4546d619ecc3e1befeec262666cb110784ba70589a7cfc8025dfcce27e894d8f88
 MISC metadata.xml 1325 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb SHA512 ae25f27a0c0cc5c3460b150f3eb6369e34b3051984b58da6a81847b5e90edc62e91fdd8f0d428576ef73614db095dc3a415237cccc1cc3cc806f9d99ff588df5 WHIRLPOOL d8b1221d484e12c31d76a20e8a7e6e0d033e16884e7dd14f657d4383f24f8f9294bc51dea4f512896a4183f9299c2faef31e7540d95c418000245090a3a0cdfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP/wXpAAoJEHfx8XVYajsfQsEP/A6uCfMH4jMkxwrEb+SpwoB5
-1s07ROCT2GyRBeiOXv3TsYQisSPd43MbpJm3ncIoxz3WTkLxBKrDqb46fFq7cOBF
-JXWq0YRnvKNrGRbhIsKBdC9YmI6DcIa9c3rhwN0fWiSNYAxYdyU5zFNdvyqaPILc
-KZzaap+vJseQA5+W+EvheFEGOtR1BfvUgPyqRdyIBt/WOTcvsnoQx6pYrH9kujPK
-HELV+vZcGdkSWvM6B1GYwfvTmJeFNP+PkdE4zPYSsC5FSBYo6YfF7l05NNKB4WTW
-PM5Z5ndzzBoGOrMllXxzVzVUuT84anDAU9Nf7KEoftxrgBJmKayt0S6qHAZ6pAAP
-54TSKcj5Y5qqwM/4IWB6nsnEAFCTtGK1PQGG1aQnwwBpMJTaoMLjX+kamgLMzqO6
-T//6s8NC/g69UPw1eBkluokjoB+GTEMFvCABO4WzRym2M31igpSYfSiOdJk55o3Q
-a2S4BxxDhUFrwQQKxIvkgKhG95NaumKP9NlMnCg71Q3CiqDJtnS+8d9xMPM+WI73
-lhPbKSd+kca6b7c4gyDpEsa5cULoFW7L9SJjrwjFFeykUsxEjt9qxUhvXBsT/g5X
-uO1gxZvofjqwsL7iPJGIYHA8LjM2MbQ7gO4U2ALF7S2mw0nVBouzodokAX1XdBbD
-bOdFwNfIP0cGhzLjeZt8
-=HWR/
+iQIcBAEBCAAGBQJP/72YAAoJEHfx8XVYajsfOgMQAIo4Zoe98KMs9jPsJiuD44+c
+y2fwEBhRz5988SG0cObg56pLtFV6zc72fv68oiCIkL1Ye4wkqDkXrT2LcjAog8Nf
+ErFQFkTUxaihEyXzU7qAAJUKF8LoKoa6Vn5/R/mTCHSiI92I7cvzocfptWxysyOD
+SB1JVi0gJIRNd2Tq92StJgZqxaUTuulXd1aPs5GWEeLzNopXKJePVKiYK7Fd/b9s
+TJaJ2FIe8bWpnNUodvREg/ZuOgVZt7ceQWWY3dpoptvT21XnLcLjEIfh4Vb7J25e
+7hFBmtOZO7S8vjN+ir33YW2xy3U1AIUJXhOJU1wmbjeeeiuy1giCADGaFA4PjvYy
+IQN/7JVKXsHEYAnGGrkTnwwi4MWnFHMFy/P4Ha84YziS69HSwvK5XJSVXyeu8gye
+YHiGsqej0c1kOfBnrJmii/GhcVz2LhDU+u8atDrKt0snTsHHDKPuxGFq4T8UpiUx
+0dq9520hv9V7jrC2bRYb5rVs172s7FIBW/m+hSfahblDq6+w2jbPn03cV8e1QjuG
+4JK8ze/XcUPW1G1TdvaaCo3wgyhUayghEPWhEbOS9JJOu//fRWGHp9bbKyyLk+Zz
+jWPJA3lKYxarWlwXU9Tlb2COF8n48s8QVa4Akhy01aD8/pAhHXNlpCJg8CeDCvzq
+n4Z1ngckDaQ3+083WgYD
+=jgzH
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.6.4.ebuild b/mail-filter/opendkim/opendkim-2.6.4.ebuild
new file mode 100644
index 000000000000..7b0f97347467
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.6.4.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.6.4.ebuild,v 1.1 2012/07/13 06:17:44 eras Exp $
+
+EAPI=4
+inherit eutils db-use autotools user
+
+# 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"
+
+LICENSE="Sendmail-Open-Source BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="asyncdns +berkdb ldap lua opendbx poll sasl +ssl static-libs unbound"
+
+# FUTURE: diffheaders (libtre error) - bug #296813
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	ssl? ( >=dev-libs/openssl-0.9.8 )
+	berkdb? ( >=sys-libs/db-3.2 )
+	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 net-dns/dnssec-root )"
+	#diffheaders? ( dev-libs/tre )
+	#gnutls? ( >=net-libs/gnutls-2.11.7 )
+
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="sasl? ( ldap )"
+	#lua? ( berkdb )"
+
+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:/var/db/opendkim:/var/lib/opendkim:g' \
+	       -e 's:/etc/mail:/etc/opendkim:g' \
+	       -e 's:mailnull:milter:g' \
+	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
+		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		   stats/opendkim-reportstats || die
+
+	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
+		|| die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use berkdb ; then
+		myconf=$(db_includedir)
+		myconf="--with-db-incdir=${myconf#-I}"
+		myconf+=" --enable-popauth"
+		myconf+=" --enable-query_cache"
+	fi
+	if use asyncdns ; then
+		if use unbound; then
+			myconf+=" --with-unbound"
+		else
+			myconf+=" --enable-arlib"
+		fi
+	else
+		myconf+=" $(use_with unbound) --disable-arlib"
+	fi
+	if use ldap; then
+		myconf+=" $(use_with sasl)"
+	fi
+	econf \
+		$(use_with berkdb db) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_enable poll) \
+		$(use_enable static-libs static) \
+		${myconf} \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--enable-filter \
+		--enable-oversign \
+		--enable-adsp_lists \
+		--enable-dkim_reputation \
+		--enable-identity_header \
+		--enable-rate_limit \
+		--enable-redirect \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
+		--enable-sender_macro \
+		--enable-vbr \
+		--disable-rpath \
+		--disable-live-testing
+		#$(use_enable diffheaders)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# file collision
+	rm -f "${D}"/usr/share/man/man3/ar.3
+
+	dosbin stats/opendkim-reportstats
+	newinitd "${FILESDIR}/opendkim.init.r2" opendkim
+	dodir /etc/opendkim /var/lib/opendkim
+	fowners milter:milter /var/lib/opendkim
+
+	# default configuration
+	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
+		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
+			> "${D}"/etc/opendkim/opendkim.conf
+		if use unbound; then
+			echo TrustedAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
+		fi
+		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
+		if use berkdb; then
+			echo Statistics /var/lib/opendkim/stats.dat >> \
+				"${D}"/etc/opendkim/opendkim.conf
+		fi
+	fi
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	elog "If you want to sign your mail messages and need some help"
+	elog "please 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 -b ${keysize} -D "${ROOT}"etc/opendkim/ \
+			-s ${selector} -d '(your domain)' && \
+			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 /etc/opendkim/opendkim.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"
+	einfo "  and read http://www.postfix.org/MILTER_README.html"
+
+	# 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"
+}