Version bump - bug #543146

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

3 files changed, 222 insertions, 17 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index e747f63c4e4f..1a5c7852d954 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/opendkim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.85 2014/12/29 08:25:20 eras Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.86 2015/05/12 10:07:47 eras Exp $
+
+*opendkim-2.10.2 (12 May 2015)
+
+  12 May 2015; Eray Aslan <eras@gentoo.org> +opendkim-2.10.2.ebuild:
+  Version bump - bug #543146
 
 *opendkim-2.10.0 (29 Dec 2014)
 *opendkim-2.9.3 (29 Dec 2014)
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 85ca918320e5..dae0dab92d6f 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -4,27 +4,31 @@ Hash: SHA256
 AUX opendkim.init.r3 1545 SHA256 63f316ef776ad1a9fe87cff7748fac4574c2355b6205e3ef21285ddb84c8cb33 SHA512 c28b93f230b65ba483302dbb0f6cba0d8b2cf29cce0309521e67f6aa0e4c041b0dd69eaca8152d6b0b1b02dbe1ff9634fef0840856c8e192f17a1c24ffac7166 WHIRLPOOL f42cb79de47d2fdac26ef4a45132e996640da824aadaf0c3e66182160e941322ff78a37c18a32ca50efb0bb4fbf11b622a1ce5931146c47a06156c256d568b81
 AUX opendkim.service 439 SHA256 8636aee39d924067d1f1673291d1501cec3e6fdee0de16533a1e3616471b35ed SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834 WHIRLPOOL 4b7c42b130a31120efba7aa04f90cacd8c6b760204577e2914901eddc6cb425b1c06253d60f43673d28f9992e4b078010f444a390569544573601b3fdbf66e76
 DIST opendkim-2.10.0.tar.gz 1213007 SHA256 4a747c9028e1cba40b5f8ba64ec5fbcf9f7d27a8a41fec4b4a398e2a6001c747 SHA512 c1ef4a8e80ed8a6e64e9a9a4f6d2ec684622fb4248d1d1c9b696f14ec9f4163e7b37f1a936ec8d522b6531b91fc869ca875fd6ff58c96c75ba41c919bed40d53 WHIRLPOOL 8443c330265dd47774ed476e4a88da10e586dc27fe6f7d98bec8f88c9129e04df334bf2d4dcfa0c65ca9b5287d8fa478b9d9bd6da9672add32074d0d6d9da0bf
+DIST opendkim-2.10.2.tar.gz 1209812 SHA256 ff5dc58ca8ad94de9b999bde3c53f49ac040dc09ad4b295ea22984d8d7df4f82 SHA512 b3c3e5fa3c265082d6f68def987a6805edba3798b37390c1e8099e2cecc71a9f6080481036991f654fa02b1a09d6b2107156aa533d14d0bfc0cb2d09bc7e398c WHIRLPOOL a3ca0262d1d2b3d01e28406224afa3ae914fd9f21bb455b34070d5821dbd8211696204fd7143b2e3046a6d3afa098a1d179e7be2433126fa8c763459cb448032
 DIST opendkim-2.9.2.tar.gz 1229383 SHA256 1f0c66afbe48f6223d2ab985b2c27594ae45035e3e81eba887d8ec6e5e1282c0 SHA512 f6fe77897927a93c9f57d09e5e9f43b1e73e2b21a586461b5665fb430eee1362b33d9601c8643d50d5a53c8e01b03c7af331f28cd992c9163f959723f21ebf63 WHIRLPOOL b61212d272d07c367c7d9ecb951466b66759b6d449047c10947681ea6889a1f2b2c12986e6c11a59620fb8ace3c0a177235f65f58c54c993909f61dee5cf3c3a
 DIST opendkim-2.9.3.tar.gz 1230406 SHA256 79a84fc17fa6aa9428ed449b1b2b773b0a4cb4ac7fa69b01b178fe0b4691c533 SHA512 9ed79f4cc595ef6dded8c1c1af77404ed629d88d2dad11c72fc0ff961bb9ab62037e010b29b651bc2cdcbdbabf001199b12544330a3af851b61d05518cf92053 WHIRLPOOL 5f24ecb5084babcd572f9cce9645aba92f1a68643bd4928b5040f3cad21f299380af746ad2dcefacc5803438a06c021a85da2be80ecf91308e7519d2df93cf51
 EBUILD opendkim-2.10.0.ebuild 6208 SHA256 9ddbc15d9b2416077bf82205699a5417a64bf0b52c84a7ef0598085561007457 SHA512 56d964432ca020f352d834053815ebffa107b7a734511164f5cb3c28f290abd0b9e2db65353a3f93f401f7c995ec861d6559c4a9e763d45966772aee036000b6 WHIRLPOOL e4010d1b72028481dd84772dcf88c7b7c19b2808bbfad29e2e3274da671c979ab62716b238b538c73ae798dc68be3431179867014fcb07c4f17a25d94ea51d60
+EBUILD opendkim-2.10.2.ebuild 6211 SHA256 9e2b2990ba7d1a0144a6ef0c5d76452af5c6f69eed5d064436881d79f976f864 SHA512 6ce68e5487c028956b8c3ef01711de02ab0f53b82e63d774cab256f7636737f6391d047c9afb0bab7b1d0eb903ddcd7a43e13a2ec758f431ceb54dab53b98c76 WHIRLPOOL 890e639878322c84d2363a128a6c21f5a322ff27241ea06052ba8b52da86ee1607e264b3c6704cfa3b54ae9f348e96f82ec6728350841ad3154f7a67c2f9b119
 EBUILD opendkim-2.9.2-r1.ebuild 6237 SHA256 e6ea67d53781c8b4f35cfd983fb779395420097bf558a4dabbcaf21db540b55d SHA512 38465631a7e619973209b6aec1afffc0dbbd07eb8218a5ba811b1596da64a92d96c3cd43bfb6fcd89f3b8d29d39f387f7124788e91ad0162b218380cb3002a20 WHIRLPOOL 0088c2c4bd969b202cc809fb42c1880be37e1236fbdcb0d588a2ee100dc75d7866df754cefaa5874ddf8d851b48db88dbf2cba6623d428db07d026ce4cc5825f
 EBUILD opendkim-2.9.3.ebuild 6231 SHA256 24fd9d2d6d2543644ff9da5a86e0ec875d6a92125f76649a56ee6fba377d3391 SHA512 bc47ddd421a69953757b10bd7e965b6194465be2bcca401e9942fca45d645b0f47749751313433c8292e8385b475c7f67cda0e819bf1ce61c3220dfdb1709a25 WHIRLPOOL 3f22a2ea86bf3543d802cc7e2c26393d58ab8797814247ce3b26ee1093802a3fdd6b48d8e1c3c98094428aa1d59c9a9a30c8f1dd3b6c779f4111dc05715c4f2b
-MISC ChangeLog 14639 SHA256 de74fbeed29fa489de78f958945d0bb6a340c54493c07a6463b04883b83adf3d SHA512 237bd1f98aa040bb01cf1f415f70bff3ab71c95bb2cbbc15da1b0f007f0ac9de17c034378bad25f7820dc903e4dfbc18ea8d6e333cd21c24bbb893b2d82fb63e WHIRLPOOL cdb51fec6465d401597b839e9bc99cd8bfb93b2380f175fdf1e878ee203de1d66803ff3773b24f346867c09de50488a9370719b9d134d200f4e2bee79d0fc483
+MISC ChangeLog 14770 SHA256 89ad45a5691d72311f15ea448d21112fcad5c21cf1d13c7828b864a9b69356ee SHA512 358a00fcb659e3704ba584275209d548bf6815617c115834d2230f8f1a4336ce2e41fda53f410497095b993a5bc1a0f0c5d96d1ba08a2ad3165e82f3b63aa71e WHIRLPOOL 00fbda8d402b5a567eeda4d517f51ab9cb4a0b6db85f00972641105f4462dc03536dc73555ecf5a27016ae8364dbbac823f4778491eceff3b4be3b419ac6f77f
 MISC metadata.xml 1403 SHA256 85ffb9c9df1fd60d7f22db45e8d4b1edb2b882dd0fb2004a646651e4f7e675a8 SHA512 b7529c54897e04109deeeb30414ab175de5989baeeb398042995fa193ec0302bbc74a43037550c4a2dc60e490443eeaa4bcb038229b1ea179f70e32e27bdf37a WHIRLPOOL 862f684ef7c3d6f40d5b95eca699e003f0085c62cef406c54a307d4be3d8a847582c2bc3c68eb0208e072b506162a27bde6115fcfad548b1865bee7f033ae371
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUoQ/8AAoJEHfx8XVYajsfPSgP/RqNZWufnl1aWeN6HNmBQG6r
-nZ1loHpnu/M9+gEKH9GXW1NOb8N9qb7yCkAVswTmE3O1L0MNQ6c/AMuBvnxTgxC1
-XLjPK8F7ifYe2uvG26e82QCNC+eQtSRI8M+fhKJ6LOn930QBoYCcmp1wHSBma6uy
-G5/LQIF7luUCfQTrEq85VF07Vm0g3VtEgfXnGferY6Yw8v2C/PMzSz/PqKpIspIh
-RWM5ewHKEtgomRrD+AcYKycTYeQ92Qni2fNJ6d9ZcQ2Fae+QocgnWkwj75C2Hqne
-L0OD4YoCeA+y8vYcsPPw/lieiHynMdsu9ZBOcCVDAJcPZEPvqZciqBubSk5toxmj
-7/SyyJX0ZGhNkF3MsKya7z6jMhClx4Bqj37bGBkQnzSmBk+nmrMO8+UjITa/PhkY
-3RspnMd5qtjokvcvzKEgecRMyW2DCqBdrtDXOlondLMyqKRg8wp0VDEySjXVap+2
-2m+SwseX/e2kc+cp5sGpl9NK7XxmstaRjjZVcL1wl5TKEAZXTFu5yEx8acJC5Zth
-/HT9XgcgXtb1fPuE4//miUezs9zcshoWEkklL3Ig6WpKbtf5x1rJt5/VY/AISePq
-oEC7BpcSatkAdhO+ZyxUfrgzuGBYqOM1s6M0uqx4P3ZabNVF99DJX+6s8IpuXwtH
-v25FAv9yWt49dKtfIoeD
-=Y5PS
+iQJ8BAEBCABmBQJVUdFtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsf0DwP+wZhkN/3+2wx/S9GHJt/J6h0
+NyeuK07QyW5gDs2x1JirxQ3VE2lWLr6fPPhPn7FZtaEd316UMNvR7h5SWsfg2Usq
+GDHtmn9oC9KrC3HN6BS0U/imWUlcFo3GbmgBm4Bi1l6w31ABFRTxTR+qB1A1B4r2
+L6xEqN7bV6RIAHP09uwTe40xSjSEMtKmbKxZwvcaMy8j0cgn13gEBze+HsarTXQa
+pajBLoUSAb3XH2mYdnrbaOOgpSG6A+vEeoN48vecwArPN/14CXManDXWVDOqFwlO
+mXxVa7i6J/pTRkKGMGyGMsTaj0EPAXN7D5iOnbwPcjo+nD4dgiKwcgf/VUr7WVxP
+xQj0gK3GRvu0HMG+2aYfF2VzMOKZGB04eKk4NOXUoo+XzOcT3gOeSs90w4l1WZa/
+gTg3HSiCxoW2RwfK6iyaV/cJRoNoGSrS/leOxYJOyXJ9sCJmAsXPduQNu5GESomk
+gfzHHAwxJnh+3ZIp/GTm6BJdNYIY+rKaTEdO6IqJoMImhuEM4/qDVZbiGHooHgfV
+wa0+79stT0PDWdL3veFY8q76TllLUm1/w6m2YDmIIXkTKoIDco23JhPSDzHzAyPG
+G7ugGmhwaKOkxiz1IluPHQ1gXz9qr8hMHAEVYygc1QuIcPXg4q2ePmgZOKlwifh6
+EZssn4vGoV/W3mI0/U9I
+=omFn
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.10.2.ebuild b/mail-filter/opendkim/opendkim-2.10.2.ebuild
new file mode 100644
index 000000000000..c427d119c5ae
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.10.2.ebuild,v 1.1 2015/05/12 10:07:47 eras Exp $
+
+EAPI=5
+inherit autotools db-use eutils systemd 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 ~arm ~x86"
+IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +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 )
+	lmdb? ( dev-db/lmdb )
+	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
+	selinux? ( sec-policy/selinux-dkim )
+"
+
+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 /run/opendkim/opendkim.pid:' \
+		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		   stats/opendkim-reportstats{,.in} || die
+
+	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
+		|| die
+
+	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
+	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
+
+	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_with lmdb) \
+		$(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-atps \
+		--enable-identity_header \
+		--enable-rate_limit \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
+		--enable-sender_macro \
+		--enable-vbr \
+		--disable-live-testing
+		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
+		#--disable-rpath
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dosbin stats/opendkim-reportstats
+
+	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
+	systemd_dounit "${FILESDIR}/opendkim.service"
+
+	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 TrustAnchorFile /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"
+}