Version bump

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

3 files changed, 215 insertions, 15 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index 0ca2d2e64285..89e202ae91da 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.63 2013/03/01 12:08:19 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.64 2013/03/22 10:08:04 eras Exp $
+
+*opendkim-2.8.1 (22 Mar 2013)
+
+  22 Mar 2013; Eray Aslan <eras@gentoo.org> +opendkim-2.8.1.ebuild:
+  Version bump
 
   01 Mar 2013; Eray Aslan <eras@gentoo.org> metadata.xml:
   Remove USE flag description
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 2dd53212fa33..08fd059c0c9b 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -9,25 +9,27 @@ AUX opendkim-unbreak_upgrade.patch 1050 SHA256 6518b34662ca366a4616ca1135d5cc529
 AUX opendkim.init.r3 1545 SHA256 63f316ef776ad1a9fe87cff7748fac4574c2355b6205e3ef21285ddb84c8cb33 SHA512 c28b93f230b65ba483302dbb0f6cba0d8b2cf29cce0309521e67f6aa0e4c041b0dd69eaca8152d6b0b1b02dbe1ff9634fef0840856c8e192f17a1c24ffac7166 WHIRLPOOL f42cb79de47d2fdac26ef4a45132e996640da824aadaf0c3e66182160e941322ff78a37c18a32ca50efb0bb4fbf11b622a1ce5931146c47a06156c256d568b81
 DIST opendkim-2.7.4.tar.gz 1158496 SHA256 fa66f7ca52dd3fa94cd869e8fe9e8f849ab83d6a32a8d4ed3cf18b06b4584e76 SHA512 f897cea21832355cac5421a96a906f67aaff1bcc0ceb5e027c73845d7c0cd27ec12862a826534b01339571533cba061b86e1a1bad91c405488bada729e2846cb WHIRLPOOL afe329829211cedacc7d27b5a4d03469e1fe8935cabc0b51158a69862ef993d6438499a206628dafc31c7904b9b95d1eeb31edf6583249cf54396793af68bdbc
 DIST opendkim-2.8.0.tar.gz 1175377 SHA256 a7b369b2182031d53257cbbac7ed99d70b00ebc442dfb832dc7d78d5d7b0c31c SHA512 35730e100307e5bdca9fd1c79e13371bd46e73b6a97f7244edaa4fe1bc693a0825ed2bab349155af11d472da7e0635e558f1c755468efdddeef073b3abc0041b WHIRLPOOL a85a69e31eef3eb4e37cc5c6285ef189367d4d4e3ceef6966ccde008d99d897ca862950316cec9e42ad0566fc9814e2cbd6a9f7dbfc2fdc2cf6909bfd83699b8
+DIST opendkim-2.8.1.tar.gz 1176501 SHA256 4fefda01a7fd7ecf37d3cd309c05ba714d97ac61a4eda145b6213bf8e4b536e8 SHA512 c6970ef51a822a6ae2eecca6704f95a307319dd087d9e1b4930f1a7b1f7db49043930f5ef1a62aaf3af0a366094339b2b811b2f585f9f4601c95cb382dc21af3 WHIRLPOOL 5d5ae9e703bbbddf6e0779f9625ed807074affffec03e07e32d41926fe5e1079f6928e4a937f38b7cef3950354fc4a3496dd237917a3e37aa9dd43f95448ea7d
 EBUILD opendkim-2.7.4-r1.ebuild 6135 SHA256 8254b24c351dd750cad24c36622e0ced17bdf5eff0fc3407f068c28c92c7a816 SHA512 da2633e235431cdf6f496a07bdfde3435878120c7c3e838cf2766920197a54ba62ceb8bb4ed3dc1f936911768ac3c1f10c727bb9e1dfda21a888a3857ecf087f WHIRLPOOL 01df0472e302dda26923157c311ff6aaf90d78e4ca295ead74983ed063cc02868977ea47c918efdd1e8757bfdcb08001864ee4163c85bdee93c6f58fe6f1c5f6
 EBUILD opendkim-2.8.0-r1.ebuild 6198 SHA256 03687582317507bc7ebe711dbcf1262531b7622b8ee856a4beac432d1d8e8b83 SHA512 8707024a6fd283a8aa6278cbbbaf78d4ec4632197ccb4f7a2dad5dc2a2b91282a55e26adc3aea4c02621c203d823f0e24089c2e7d7cf1c7f4d1ed33d76bd165f WHIRLPOOL 5eaeb92acc9884e4f19b15485527452e2d377292ddcbf1cad07a5c408f3ef4e885f35d2805e0c6467a3486c506c4e51e44a5d26ab96f32abfc8042ba089f5403
 EBUILD opendkim-2.8.0.ebuild 6144 SHA256 95556dda451ef7676e445bd75824b28ea52e9aa47b1ab69cf2bb1038053e5ac6 SHA512 d532de8f9f4d595bada1169f139904f7946f22a4fbd4ee37b910af336a338b015d0ad560e73bb2bfd22ad78ca6a78e391f8b71cc9a554a3bbee6c6429f01b43b WHIRLPOOL a2406e9bf001dd0fbd1c10a32ab44e0d071e54baad1e8973ad858f69ca3b28c6f7dc288a6bc3c9fd3726c3296713deb01cc00e77f3341b1e7ace2e42b449b824
-MISC ChangeLog 11548 SHA256 4e751e4017891593d7c36a9cb5a4b6fba678d82e6c1d2b7b02c3ebc0ee7db6da SHA512 1a0be23c7a671c5154cb1775530a5eb325ee8d28f55a317b34ee9b9255e085d28b4187901e29f2216f1022997ac8322f0c1ab766d4f53aba701887d347bbf0f1 WHIRLPOOL aafb5bef51cb9fdcf4382b5d2754d8c2f323d73213ead428bf6f79bfd3db29d58786d2ac994a149c187a3a06208a062c0f7b4f27c32059a5da66a60ceae09b82
+EBUILD opendkim-2.8.1.ebuild 6144 SHA256 975f379bb898affc9147b962c4bc10321480008229d380c6c93c5937660f78b4 SHA512 7ad3b250b70b6af8b96572193af5a5e7267b9947818761d1f1761f5ccb0b0a4dd30f62eb21487d31d698a4ea9d6c0e4bca19d573b2fa6fce0524a2f5cc0e8e97 WHIRLPOOL 3ffb017687e5ad37bab57eeb5f218892b5b71214b32444a0ea5001c1d8d426f73177f8e67908c595575aa9a6d3887b3ae7db11ca5577019ae9f357165e52cb81
+MISC ChangeLog 11663 SHA256 8eb6483e463e16499179ba2bc4e054198d7691131a5e63b06d80e61fb5a81f57 SHA512 ab3e9450258116492cfb511518c1389f9aff70b19d01bf90e59d1f5529705914ba4afb6eeecf8b3538be56e31e215fe9f7fdeeda7a79fc3cf4e3979482371d50 WHIRLPOOL 29af3bc5191891677fde58e4553daecfccdc08d04ad85e7fb9f59d7309088840791ca1dfa8fbb97b4c31ac6ef40039a4746fe374dda8d957271c910649019aa4
 MISC metadata.xml 1245 SHA256 3b854e66f72c45f87e959cf70e606154ac932e08b9a81f5299915ce1ebb68333 SHA512 b2538e90b379f37b4b4ea0999f111e7c2d8152935fce91335b0acc068fe706a6d7838a2aeabd33e4cfbf1274f16e9f6dbc2148a6bf745349f99a3aef3af2a028 WHIRLPOOL 231c181382b82e4a209b88b9284203f05e4e017fed77caa5036996360c8e0794e652616c363354d8dad57bd49f0d1807f50c0928e001ca500541aecfe23cc792
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRMJo0AAoJEHfx8XVYajsfAl8P/3NsGn4lIj2vyj1UGrRVfesz
-FFLsNh1EhA0K9aNAobUeUBOP8m+HA5l6BCk0p+DXG7ZusgAYDsmZ+mhKTDxY4fCl
-rGQ6emvlTmfxFiV4J8mRos3ez/u4VXymyGZvYGdlHPfxvRpZ3X8j1oiyQPyYk0z3
-EtsHaYWMtoYFp5kWhvj6HOKXrQX/CwHtbEJPsHiIW4x4nLeQE/FcJZ+BdF02Is5i
-UyLXvMIytVtP2c4DAR8/i1dW/vogPPQZNUbGO9HYjUEpBx9sNa7z8aalvGJ7gE0M
-Uq9mbTILmkYyI9a3JJYBNxLcjjmE6PvxmwzW1ZOB0uUN/D5pQzWoWRBU2wuRW0y3
-O/quCAD1BZLkCFSiyXW7BteGP1AV/VmdJQpM+5bcQgIDA///GZx/92J8yYY4mZUc
-DLbDK5k19FAXJ5H/esyCAub7p13znk/qvho4/YY4K9WoOAh0NKEG3MgwGxm4LahR
-lhl/CN/7FQJ6gEtGFIGqUecG96wxdJfyZPGKnWy7tYJNdc+EHdPsbSeASzKjg3MQ
-eog/Q56hHa/S3Egbxh04wXrqt+dWzSvT0wtJiWIkqNV6fpkeleYLhltmp3bc9LL2
-xXEz7k6Rp/wcbPp4OXuhZZkjscUpYdg/qhDmanNGXSEdXIZTkPj+RQ9bIqqUkOtF
-sbZoughONM/9ul6atfFh
-=Qa0a
+iQIcBAEBCAAGBQJRTC2GAAoJEHfx8XVYajsf8qwQAI15kcPZLRLyHJ3PPpc90m3c
+TeweQKTxkW1h6UZEKtkjVnT8UaSZQUef+on9qI4xO0LNM4HRe1ErK9hhZxu40Tk2
+8mtmY9D1hfgnjTo7CdqSqjBlePd3a5vzlFKrCFgBEb9KgGiUJQf+LpL5uJGDzkKr
+qAHy++JvNQptWmGgWzCWfn/kbaCXnj1SMB0/V4vAjXSFamPz8YtoObOasBk60zl7
+OM9u9ubsWzeeNNO6NCNTyhakOUzFXOw1MneteuomljXRnU9rEWmCCUaIKmmIoya2
+iuf5n37EZlgox0L5EvcsfBdGc1SVhXvEtLIAoy+O2eQdY1YaNanPzMvwwfSBJouv
+l8Buu9UUjzbzf7YZlqstBU6sFQhDpUbCY/j12U/oaM+q1yZ+IMVlMI0ttxKX3W6H
+c/CKJSBUqiaHqj6zdYCsJLYD0HSHKvU8IjLvOMQVmCuzWokRg0uFg/6FFoBC5R8L
+L1iZ+nzjBNuypTPceLramAhjjtdtoZjfjNNaNGPrxSmLcamIIOi7X8AMv2hAs7MW
+JxjCErsz6Z75wBLGGvWF81Em22PtIHc5NCM3Xpf69AC6VMuocmBksQNpmHOHNuTt
+Lq/jvc+WNah+PRhZ+wbGcBUBtSRmh7nw82zYhPcwLYdW94Lq9Bw5UwMEafKgZTyA
+PMYxjSoGS3yEmTbPuoC7
+=M3Z1
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.8.1.ebuild b/mail-filter/opendkim/opendkim-2.8.1.ebuild
new file mode 100644
index 000000000000..f928e61fa43e
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.8.1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.8.1.ebuild,v 1.1 2013/03/22 10:08:04 eras Exp $
+
+EAPI=5
+inherit eutils db-use autotools user
+
+# for betas
+#MY_P=${P/_b/.B}
+#S=${WORKDIR}/${PN}-2.8.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="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	dev-libs/libbsd
+	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 )
+	!unbound? ( net-libs/ldns )
+	gnutls? ( >=net-libs/gnutls-2.11.7 )"
+
+RDEPEND="${DEPEND}
+	sys-process/psmisc"
+
+REQUIRED_USE="sasl? ( ldap )"
+
+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
+
+	# don't go over the sock length and fail
+	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
+		opendkim/tests/t-sign-ss-macro-value-file.lua || die
+
+	epatch "${FILESDIR}/${PN}-2.8.0-unbreak_upgrade.patch"
+	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 unbound; then
+		myconf+=" --with-unbound"
+	else
+		myconf+=" --with-ldns"
+	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) \
+		$(use_with gnutls) \
+		${myconf} \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--enable-filter \
+		--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 \
+		--with-test-socket=/tmp/opendkim-S
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dosbin stats/opendkim-reportstats
+	newinitd "${FILESDIR}/opendkim.init.r3" 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() {
+	if [[ -z ${REPLACING_VERSION} ]]; then
+		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."
+	fi
+}
+
+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
+		keysize=1024
+		# 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"
+}