Version bump

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

3 files changed, 216 insertions, 16 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index c44f66278f76..bd6c42356704 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.68 2013/06/27 18:09:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.69 2013/07/16 05:43:06 eras Exp $
+
+*opendkim-2.8.4 (16 Jul 2013)
+
+  16 Jul 2013; Eray Aslan <eras@gentoo.org> +opendkim-2.8.4.ebuild:
+  Version bump
 
   27 Jun 2013; Agostino Sarubbo <ago@gentoo.org> opendkim-2.8.3.ebuild:
   Stable for x86, wrt bug #474226
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index b86bafac647d..b9b41f7972d9 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX opendkim-2.7.4-DisableCryptoInit.patch 3747 SHA256 83c0fac5ed1393cdfda695637f337a2a43bcd45476f11ed7db1bc422a080f421 SHA512 c8c352a56150cf0e8a2ce4b0020c03d60da1e8c184e830b325348e1e9272df8634e014a4ae6b62d4c8c596d855ecdf163eb4c09104e31084d1643364bcf093f8 WHIRLPOOL d6ad3a4ea0c2ba7b41d06750beb3fb19dd26f29f44f1ffc6855e93f8a5e8af631c35c9b782d32a7fcb83361e881ea6dffb22d59035d9b3148cf39b37ee62f1db
 AUX opendkim-2.7.4-bsd.patch 18006 SHA256 a4cfb4d26dc7d27134f66f7b1e78b40f6c0c77f3986af787001c094c4734f95f SHA512 9ee24d02d2662b2898dd073b7ec882889fe9568d2afca8751c6ad6c68af60523d77ca79557f540607a68cb159bf0df7266122ed8fe3a3b67ca4e578b325b4892 WHIRLPOOL 8408536bd7fd080eedc99b3b133562d5049a63a61420b5a38759237dce09af8ab257f524152ca870de18c13113b6370bc5c0f8fe06fc43d89101ecbcfbb157e9
@@ -12,28 +12,30 @@ DIST opendkim-2.8.0.tar.gz 1175377 SHA256 a7b369b2182031d53257cbbac7ed99d70b00eb
 DIST opendkim-2.8.1.tar.gz 1176501 SHA256 4fefda01a7fd7ecf37d3cd309c05ba714d97ac61a4eda145b6213bf8e4b536e8 SHA512 c6970ef51a822a6ae2eecca6704f95a307319dd087d9e1b4930f1a7b1f7db49043930f5ef1a62aaf3af0a366094339b2b811b2f585f9f4601c95cb382dc21af3 WHIRLPOOL 5d5ae9e703bbbddf6e0779f9625ed807074affffec03e07e32d41926fe5e1079f6928e4a937f38b7cef3950354fc4a3496dd237917a3e37aa9dd43f95448ea7d
 DIST opendkim-2.8.2.tar.gz 1181815 SHA256 6ccb6a4a8906e18e2c487669bf0a24e7b8e7fd791da38ff45a5ab25264f071bc SHA512 4e3315407092472f06f34af31a440fa2cb4533b73ce19446ed0999251c327610918a6a31fc785aafc4043d01e168b705339e287a758ae655019226f783834776 WHIRLPOOL 82edbb68fa8a4bd8ff3661a8b47b6b05cee5321283d7b9d899719a438a43970b8801d7047478dac5c881a10660ccaa0eb46d9ffb21760efec4b1da5e0a8b3e4f
 DIST opendkim-2.8.3.tar.gz 1182214 SHA256 eb36003b0d2d7514312c65db2b45afd9ce4d02744fbf4b2fe6f8e1e2893ce989 SHA512 bf2b824a4b8c7b32755fefa0d6a5fd608da59f254722d2ad52b6eda4a8710e4d22b95cfe2a85df711e3e9a0b62fd319f88afa7a86d319be4568d0de0f9c6634f WHIRLPOOL 52ad1d85fb4087c8f1a9afb4ec8cc8550016f85b7578954f1ddc02204c3440c742e3d8175560eebb514180c1deb128d500bd4fa6848fe37f3acae628a38307aa
+DIST opendkim-2.8.4.tar.gz 1177118 SHA256 d6ea32f60e750530359841da1e1bd644e6ccb0d228ad5e0633be6dfb8434b30a SHA512 a65e2cbe46878707072aceb5fa60d70d527fda9679aac5c9083b24f1697ba6fe566d9bd7bfca6a23443f639fc27b843e098b5a6b1750347c045f028dd76dc21d WHIRLPOOL b93310e27bfa38326f431ae44ab88d1c6ffddec2d81be1acfce5e3f275ea0e9f8b67eb25715ffb8d5b2c5311766a8ec0236e1e7ee4dc2ee3d0910946654cb550
 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
 EBUILD opendkim-2.8.1.ebuild 6144 SHA256 975f379bb898affc9147b962c4bc10321480008229d380c6c93c5937660f78b4 SHA512 7ad3b250b70b6af8b96572193af5a5e7267b9947818761d1f1761f5ccb0b0a4dd30f62eb21487d31d698a4ea9d6c0e4bca19d573b2fa6fce0524a2f5cc0e8e97 WHIRLPOOL 3ffb017687e5ad37bab57eeb5f218892b5b71214b32444a0ea5001c1d8d426f73177f8e67908c595575aa9a6d3887b3ae7db11ca5577019ae9f357165e52cb81
 EBUILD opendkim-2.8.2.ebuild 6144 SHA256 e1fe233e1bbb50a6d189882f9a6856966af5dd66ae71cfd302ebf9276701f8b0 SHA512 39fef45003f24e0bbef8a0628b95e7e2009843f70062258b0ebe460b7d56d2839114a200ad37c30f18a77d3fa27f23e7c82aadfbf52999c51b8ef5cb72771f5d WHIRLPOOL 1d2cb3c6a57f7812fd86ced81f50ada2754b7b28a5201a1edf39281c632ca1f461608480aac510f5d50e4bbeabd30c3ad3d20a0f1beff01c6d09408695aab22a
 EBUILD opendkim-2.8.3.ebuild 6132 SHA256 01ed0c2eb238c9214ce406034a93372c01cc956b18a2920b7d786dcab247a35b SHA512 07ad989727a7fb9c8805f3877edf1cf037e8663f5662c244aed414b7b9d7182a4fd4dc65e5b36c52f4e2aa94af07b09348ecde809496d74f631812741f1d7e80 WHIRLPOOL e456e9ee670c60db061ff69ba1d985a8dc9b4bef207e72ce3111de2d942aae78a6cb6048c5c03ec3738a36fb38fb822a253ef1cf748751526c6e0e693978e022
-MISC ChangeLog 12124 SHA256 548d6c770c775b48641760f9e0a924377528b2967e29668777d9608af778a259 SHA512 08bbd32cd12ed43af0fe1b357e972dda46826e6bcb59f8f27f720cc61ca1db5008842430d2002f3a308edf2718ac5576ad42b8539c12b89f486577d1a1a28080 WHIRLPOOL 16803ed34e27a4d81181677ec136108d04ebb289e209f312784705ffe75a212554c797fedd8ffc1af5d264a4877029f0053489247a82e8cad360682ffc30b611
+EBUILD opendkim-2.8.4.ebuild 6114 SHA256 b704751b24db01974aa341076c33d7a41c002b689d7bcc5871110dd00c8c5b9d SHA512 eda7c9aaf549b5cad93933a72ee54f5ecdae96d09a8bb953b58328c384e2de70e7b15ddfa3d94fac657d717d6e0f209624fadaca44272e43d597472acd636b48 WHIRLPOOL ca7e8a59bfbdd615094930602b6eb6f009b72880fbf762b40b85173fec1f2bf9fb3c6610c30c71ad2d7b1520cc4a14ae8333705fd8a5c6705dd02746f710b545
+MISC ChangeLog 12240 SHA256 37bf1fbeb486e79174abe3c95c97aa084c521561f95277edc41fd0d607a6d1ce SHA512 fca2027245c0e97cb7d720400bf59c59e4161a2de5d8b597d92e84d89daba7cb34703f07751241b8ec8c6c2b92c652f8f510e7a63cdfadb17e795dfe86af1393 WHIRLPOOL f6ac8287553c4cc8a46047e3e01658da5dd6a50433a16139c79d8f2ff60644344eb163637cbffde04e77c0a6eef8611acc4a9b70a0533de9960927a780c7e446
 MISC metadata.xml 1332 SHA256 c1e6b0840b71e1fd07b10d983e414abfce8307095c3ff990362fc571d5b2f01d SHA512 2245a94573171993bb958f2beb6a5dfc738ef9878b7795747e3e0bf689801af756540f561b5d0bd7c93ce02fe66efad7a9b018976a81c7bdaf3849b634f22ec2 WHIRLPOOL a3b25a8495638a9815347ccb297848b8ebde0a9f0cf4093507750784c2732995fc0cd048a051197dc4f6d9acd3115d0c2cbb7fa2321933f8c0ab11158feadfd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRzH+6AAoJELp701BxlEWfQI8QAK0yBJ1AX2a7q7KDs6sLoJMF
-pvyKovjMYwPl+5QDlMZ2ItxLoiowq4L57v6/AIc36LmmZQBO9ag7C4ZQ+HnjfWLy
-jQZTY50N7MY6VYg8ho1hPDBnPAVcHztGCnNfbyMbmbytUBjhhjLerAVJaEeBksLz
-HfnfqbswteWMqRzEQ1iqzXk6Vol3yMMZ84HmA68TNvONIHIOUpkElKTGDaGNLnan
-zAIN0FfuJRSoZmWr7IB2vlJmKeGyO6b99XkY7I0EEIwr0JL9qvSeW39ZGHFeHvwW
-VixHlRSOTwG8zmJQHuNDsmh3CxLxHlUou1fBmJACSFIr7Bg1aKABc7yy8hMR/k9o
-MHt25QJ8K+Ebygz24Bk9b+WT8JjWfnUqhiCXWK818ETeJUagdXSJpZcnERbngo7X
-r2fNlDNvR4Zs8Qw3boIeTf45Xyp7+3jweKN3jndoaJpz9WvQ+bhMac5iP1YTpIxF
-tZ2L8X0laIDUV+O2yfNnXUraWPJd5G0uMVP0aNBCTcqOq8ujiQ3bEx7QGXSvDKz1
-ubX21fMxK4yfe4XT5IZQGpO4bkClz2KsyJzaJJtik3MjQSS/OD+IbH9yTIys9dk5
-IdfQ7aUivd0TygEbpCIXhj4z8sanA/c4hvoQhTmbXMcBdT2XtGmVTX7FDopyttwr
-X2DjoG1uZo4l+q9E8QEk
-=AJDn
+iQIcBAEBCAAGBQJR5N11AAoJEHfx8XVYajsfMnQQAKogaPCp2R88PfMEP37ZTWgU
+Wmh5scf3rt2mon9K1SsdfGassWjTV5sHsIhu+94KqhYCcCwKE+Q77WlJh2whS3lx
+2OEtW2Kxu/1oqgScO72jYHyYc1lN2xIqTQ9bp62GStFohSGnequjdZKz1DRMC42I
+60L2cLV137dg23ZaLPrE9z2Umw/ImyJe5lYEUvT7QQ4ppaWWYni1jFmQ7dTAWX+B
+xAvYqJbEELbLjuf/Eo/sDX4OGMjpETp8OSuTFk8kz5igVPDZ4owB/5JHJsffkYQf
+UkNb70DnK4dTcU5aJdECeMdoUtn3xIhGGi0b1lMmqTDVZ07pQV/EgyisfqYsHQup
+/PhQ77FdeD8LoHENDSqP3d5fmDyqrUmQnElBddUwsA03ytm6O6FWwQHY5s2gJFDr
+jOkjoOetfuDpUPXX/7kz2snHtOa/Qn4sT/yVS1E38LpTg3sQ592Bk3MnQ/St9T5F
+et5LIl+9CZf8Hd1dxYtNodd1NHE9YGzNAO1xSEUkJRlD8xZuCCYFuOeQeSoLMxdr
+I9rVmCCvD/BCTzS6mtMN8SYTcp/ReHGovM1bP2+/Kl4vbDeaQIHLizGU9mrBkHSU
+HUk9A3WbRtiPrBTbdM8stJiDngcZgLfocuXwgWEPNao9RBLPpicIqfSGDykI+SoI
+aSmIuj8Edi3pKwkwGLv/
+=wgiV
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.8.4.ebuild b/mail-filter/opendkim/opendkim-2.8.4.ebuild
new file mode 100644
index 000000000000..29b6eb9a0676
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.8.4.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.4.ebuild,v 1.1 2013/07/16 05:43:06 eras Exp $
+
+EAPI=5
+inherit autotools db-use eutils 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 memcached 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 )
+	memcached? ( dev-libs/libmemcached )
+	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
+
+	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) \
+		$(use_with memcached libmemcached) \
+		${myconf} \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--enable-filter \
+		--enable-adsp_lists \
+		--enable-atps \
+		--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-libxml2 \
+		--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-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"
+}