Version bump

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

3 files changed, 226 insertions, 15 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index 60cba98a3f99..167de2f51eb2 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.46 2012/10/24 11:59:45 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.47 2012/10/26 12:26:05 eras Exp $
+
+*opendkim-2.6.8 (26 Oct 2012)
+
+  26 Oct 2012; Eray Aslan <eras@gentoo.org> +opendkim-2.6.8.ebuild:
+  Version bump
 
   24 Oct 2012; Eray Aslan <eras@gentoo.org> -opendkim-2.6.7-r2.ebuild,
   opendkim-2.6.7-r1.ebuild:
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index aafa097aca68..4613b47d33e1 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -8,28 +8,30 @@ DIST opendkim-2.5.2.tar.gz 1475225 SHA256 fb6994ea4bbd7e93772517cd3ee0b4ec338ed5
 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
 DIST opendkim-2.6.7.tar.gz 1129124 SHA256 45da209ccddfb6f6888ac2366b6e38a6460b36ff0da527aed910217cead6fc84 SHA512 f47f4c4805b96a2c57774dd69a7770751649397866b29392aa756c4b143579d93951166c817342fde12b8994251a8b44d2de61e6059fd04686e04aa6e668cdd3 WHIRLPOOL df662ca97ac937720038b16fb8b5e8f3f1d6a9d5b73102082a889abddaa003ca8ddf8fcba670fb16f7d00e4fd8b07fc0ddaff97f070e795822350751b0cb0608
+DIST opendkim-2.6.8.tar.gz 1141247 SHA256 1b2e9033842634a1dc891afa10a94ba58c0e7663670e2faf117b27bead541edc SHA512 0f1a48741194d9d47b9e301bb1d1a32f0396f12ed93eeafcaea74783e5ca9fb1f0a7cc6bb384df687d30026105e65c33c6b9cee86aa836906d959b4d2315946e WHIRLPOOL 00c841fc5d73ab7b0fe26a4612e8a319087a8a15a3a7fb5bcd61ad98cb9b5cf860fb54c98077ad99792d1e5c626bd2ce69eabb1da560f45725d23170e9100293
 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.3.ebuild 6332 SHA256 ec74fb29947fed50cf835bf848d184f6f902ef81741c00891ed598338523b837 SHA512 278a57502a8343948bd4a118fbe8092ab8cf703b7b28f0989105d2125273c3e1747301ace318de54e96a9ce1026085c7945fc760bde3f631e141bbf7a698faf6 WHIRLPOOL 6f9156e644207a540340e51fa72235eb20c5603b070c946c2d785393fe46aaffc1bb1498278a8f01fd5c6cebc2ae8fe9f9f2afcba862c3a6ce4dc879a0c373c7
 EBUILD opendkim-2.6.4.ebuild 6332 SHA256 6a789a58b78532698c1ac6351e9bd0404e000049a19ca330225dcd3aa79a5732 SHA512 7adb77946102c310aeb48f3a592b57ae165ee36c4793e3f0757e230160cba17569548bc39601ddc4273e8a86ae1919ae2f22230e105770f075ce33f7eee2d299 WHIRLPOOL ece4f43bc716d8768da704c19b293e8530a74111af9641ade1e6c1202b711ec76711a8b57396a60a0885203b312a7331d8f8ef8b623cf8285cc1c8e297068c2f
 EBUILD opendkim-2.6.7-r1.ebuild 6383 SHA256 8dca87b3071166b37027f8461275722a4e513882fb58f89398d42f66a13280a1 SHA512 5b0f05e5f0d9f52ff3bdc76e3003c4b4bafead8abf0d1cf5ccb6606eafe5f28be920f5248ac326baeb92e86d86f4012081a94bb1b0031b6af1cd0a2b18d352e2 WHIRLPOOL fc7a30ff591e428df687794fef89ebd88b82d454cdeb1d0af4f7ce81add70ae2afe2e61e81bb557bdebde1796b68dbdcb5bf451605d2a7437009fe8603cab863
 EBUILD opendkim-2.6.7.ebuild 6332 SHA256 67455b4fca44a560cf226ef3a2814967e14cc210d2d15a378b48e842bf6172e0 SHA512 6134a4837b4b963425dc93403680e2022555fc158aac368b3de3753a367b299774b08c78ec373194d7fa86d5de5bde1c6d294f3735fc784df63038310a96b3dc WHIRLPOOL faa605f7bed9d139c78fed158c6e246a7450c9c7eba07d93929cabe4009ac6334adc42d4c6d93e7abc1c6300a04f037569416849543df5c2d0a4b656e5f49cfd
-MISC ChangeLog 8377 SHA256 036cd885a2594d610ae93b66fa58cae29a78cc18eab41bb06f7e941f4a04317b SHA512 acd95cc6d1448735c1856087e010004a97f28d3011ed13173c6d10f90c5f28e2698b4fd8fb233e20074dd44bf1a11546a93e6f6d87782f14f33836ef349d4f12 WHIRLPOOL 6739e977067b02d3376fc70c9f624dd33867183cee7a958ed5d7cd15103bdee260e0bef595f336af74433441cd45abbe54b5089b3cab08a652d4ef6220a69fc1
+EBUILD opendkim-2.6.8.ebuild 6380 SHA256 1251c1d8ced6ad6b0c2c51fe20699623fc5d10c41bd0b3cd73eca9b31fbd8f2a SHA512 68914959f5e82083e36e41731a2121f08e3dabd97c46849e611a09cd757017dd1f853ccaa95216ee988010634e9933767f4caae34e46cb161847d5be245ab221 WHIRLPOOL 3a3bca5c1a51066bcd91dd7e6bc29a0c364a7fdfff9c027268a11f847dcab07300e09d2d88bdd04b3fd696f4abc06275e2408f5e7535d01a5b2b6e23bd76cb63
+MISC ChangeLog 8492 SHA256 9b7e9c06b78ed898946473491248c31bfbbb34690c3e32c780a0423168099ebe SHA512 cf557932894617b7b3b4faade8871ce8dc84b430b26bf5a8ff9ad2ca203cd4c2feaece2f9101eced46915672199e3e7c04de3b94c84f53ce4e9fa109827a01e5 WHIRLPOOL 53d02cbe9040690563b6eff9c6a8b3575be8db59470e17af2ecc824f9a06d8f30a3d0c89bf4851b2f8307ae51f67702209ef92a7f17306f668d301db05b0a8a6
 MISC metadata.xml 1325 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb SHA512 ae25f27a0c0cc5c3460b150f3eb6369e34b3051984b58da6a81847b5e90edc62e91fdd8f0d428576ef73614db095dc3a415237cccc1cc3cc806f9d99ff588df5 WHIRLPOOL d8b1221d484e12c31d76a20e8a7e6e0d033e16884e7dd14f657d4383f24f8f9294bc51dea4f512896a4183f9299c2faef31e7540d95c418000245090a3a0cdfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQh9g5AAoJEHfx8XVYajsf4lAP/1nKlgjTZzvfFN3sg4LI5Xq3
-YmdNe/Qo1xLAtirC//EqrZuzkNdCHAjH0nl4wtDt8BWscyzh95BOxkhCEQ6/0aOi
-4yaXTuvEc8eIwqBUlcOyA7H2tpEu3Bybr5+bYrafLxdx5XI4IkIZIjPBuyEdHf5Y
-82CU3xw7spptdAoHJhhdeeBM+nMYfUjBUF3zH1vP5oxalL20UZ/KDU22NUs1Uo28
-1qHfhl41QH/SWRLE64Vrm7z0atH60CDepG4IrECB6Lu0rhPTgVKM7AyRzWQqfnrs
-PrY1mU7x57E2r0NVhChIAbRkIPjxksK+X3jyAbin7pCwKwZJu+8TqUkQHCp74S4p
-nt6HX3d2A5oguChTL5p1qPq0FVDhlyP7LnmzRh+5mBfyaDCTUeq7Jsjj/qnw42Re
-5tvS1ryF0l/7+peXXUaM85m8VxvfDzALZwV+LSxInYzpWhr9NfJ+xQBC5xlGIynN
-4G3yCP7daH8BpBTsMBmRKiCFzie52N4GfB+sb1FBRzxBQAfkq12+ySgO+pxp4C4Z
-G3/v/Zt8KdjQ+AnEDmDHAvTOS7yCsfR9CfB+a9sFvu+2kZjG7fMA13W7DDuESVG+
-iGB1uiBIuCHLwqRRhUCb+3NNmhedSoXRy6K0xnJYXFqn16WVrFnFPa6a7TMrMoTM
-SnkcSkpQbUXReo+vuaiX
-=Fpoq
+iQIcBAEBCAAGBQJQioFeAAoJEHfx8XVYajsf4ZQP/Re57hAyCyVkD+4LWHCIxZ2r
+EHNvoe4Gly9ulbrHTA43e2RF7rGc2IV6mhhVnxwYxb/WSxT8TvCFWk8rKGGNlfFz
+FLPF1sBIeZU6beU5RMRrV0B7XoTQ5jMwlDPPUxrPO2LLgdSmW9SX/FhPL8qFfP7c
+bXKDy3HxSTZMtO0vC2AiGbetJTzhajgOMQuONyb83yyoaonNs8IEIo+h+W7BTHMf
+v569IQ6cWfpmrdfRvSEmze5QLwWOTwfQFxwnwskaqK+FEf3Gm6kvHZF84nkMH/6v
+N5uQAizMh0HP/SMD8ViAUEUj4Os6mh/wfgyvJq6rsrQMfUjfuzjClrB2T2xl3VJb
+0i+tE6Kqd2a7kKLmi1SoQOORHLX4vdGCkL/BzICh4ouNiKcZAHlvJfRBpBZtRQgD
+WikxMFe/k3AKSUVRt6D0lz+JkHPJ6iCIalw0AtUB7XHFLqXxwYxrdBkiEnoDXbct
+xP12SJ/lHAZQXipdCh7pKOwOfCBRbvMpANsSeo70fUzYSX7QdxR8gYkTmS4J3cjU
+OLuEU7dQWK/4glApmU24yN1xkMbbD+XWdEyeJR5PAvMTuzTluiC8/317Wgr2SRI3
+tDLytuEx+UX4SwYhZUhyrpGlpcv/pXtLI2Ftcs8BSKmI/2ptblfZc1xJU8hgXX1H
+mpfd4cl0x4Jc6cBT6C9z
+=yHSA
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.6.8.ebuild b/mail-filter/opendkim/opendkim-2.6.8.ebuild
new file mode 100644
index 000000000000..b20c45a87b13
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.6.8.ebuild
@@ -0,0 +1,204 @@
+# 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.8.ebuild,v 1.1 2012/10/26 12:26:05 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}
+	sys-process/psmisc"
+
+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"
+		myconf+=" --enable-stats"
+	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"
+}