version bump

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

3 files changed, 211 insertions, 16 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index e83790c8e26b..13af9872f6c3 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.38 2012/06/11 12:45:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.39 2012/06/27 19:54:30 eras Exp $
+
+*opendkim-2.6.1 (27 Jun 2012)
+
+  27 Jun 2012; Eray Aslan <eras@gentoo.org> +opendkim-2.6.1.ebuild:
+  version bump
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> opendkim-2.5.2-r1.ebuild:
   Stable for amd64, wrt bug #420663
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 84ededa7263a..c00c8231e6b1 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX opendkim-2.4.0-ipv6.patch 765 RMD160 607f7d55c6bf6d4453651f899927e36682ec2673 SHA1 bc7a1fcae1aff97366e60612e2052ef7b03be14d SHA256 ab04590e0ca8543e0bff17f243134e265f36095a4a23d044521c9a07701b897d
 AUX opendkim.init.r2 1533 RMD160 11dc7939f7f7c2890504cd06295f598f45f35ae1 SHA1 b68137fb885ae39170dfcebc78cce699813286d0 SHA256 0e8fab90020c109f602d8367a6501bfb3b397a50f020b6fade5024e2facf593c
 DIST opendkim-2.4.2.tar.gz 1374662 RMD160 b19cc3522b2f4d2a63d9088ea611e687453e82a5 SHA1 6946d3d805e2c73256a97b1cdc9af3251fd89c6f SHA256 930a9ef845822ba310666dfc918d306d1ffa44cc0a8d9f56d7c0b0426d668f3f
@@ -8,22 +5,13 @@ DIST opendkim-2.4.3.tar.gz 1381956 RMD160 73908fb7cf8f7c99b1d98499249d0283d0d595
 DIST opendkim-2.5.1.tar.gz 1468303 RMD160 76a716307bfd30bc2f81c3545f1d4f7ceca99332 SHA1 fd257d2e52673c73e1e15c5254c9db864a53fbb0 SHA256 afd6a762859ff6616103df03757e59c7a1053a241dd28ab21e5e38d44152a8fa
 DIST opendkim-2.5.2.tar.gz 1475225 RMD160 1fe0ea26cd00728226d1788e72f48366b3fafb03 SHA1 778f27162501879dec6ac3c957055d5bc9a1ac42 SHA256 fb6994ea4bbd7e93772517cd3ee0b4ec338ed502a920fa2fa98b34869db167a9
 DIST opendkim-2.6.0.tar.gz 1127009 RMD160 e8cf31b9c8112731e8c295a9cdb76e8490bca7fa SHA1 7b3aaf0c7ceb303fd60476af2034cfc76eb3c1df SHA256 1fd20a436af5005fb9870ec112315b9866642271250f0439cf0f0ac061051e41
+DIST opendkim-2.6.1.tar.gz 1125780 RMD160 318cda12538c59abc2f12b1ebea21871ae7dc778 SHA1 9d89f5d3fe9d79dac68a80b6c28f05b8e8506251 SHA256 a6cb55b1ae51cc6b37bfe09325c6e4c2309aabca0a447ea0baddbe8a159b25b6
 EBUILD opendkim-2.4.2.ebuild 6333 RMD160 34908883b4fb9eaa26ae38aee7c78af8be9302af SHA1 1275401d7a326783bb9d0fb164c2109bad395625 SHA256 829a5515d98166fc63c07ffa4f962bff6fede1d4e395bf8a00ea40a28fc60eef
 EBUILD opendkim-2.4.3.ebuild 6386 RMD160 272990ea203845dce688b448167373bd8d8d2438 SHA1 286b504e28be8aef5448c8e44e45713441b23615 SHA256 5a997081adfa28ba728b2b1a9afc1b548094eef3265aaa5b5efb225b936fde67
 EBUILD opendkim-2.5.1.ebuild 6417 RMD160 2de1862824b8f0077b308a00a8358f5856a2eec9 SHA1 96dd7814340db7adfbd8c7d5f40b3496c387f25a SHA256 ed7d3943d30ab25c860936471b8648e7de5cdd7e35f25fd6590448af7d59eb07
 EBUILD opendkim-2.5.2-r1.ebuild 6379 RMD160 2f426fe50f1575434d4a5af38cf086d73f71b486 SHA1 bf60d00f0b7a05b11d7fe1d98c0c667788bac47a SHA256 cd34c24014b6449c36f60652ea0a24d5b5ebda76961a1d9f29232aed6e1b44fa
 EBUILD opendkim-2.5.2.ebuild 6417 RMD160 4ea2a19ce134742b96ad7a7e8715e01b6b79fc0c SHA1 2349165879263f07ebfc272a5a696db302e6819b SHA256 be1714a3256996a41cdf787d92e0aaf394c7631f410a924694e89b4442d606f4
 EBUILD opendkim-2.6.0.ebuild 6348 RMD160 fc22e99bbd26b043b7d4ec068debed563e46c94e SHA1 2a572b29e5932926b2a106605ef0a1a5ec4f0106 SHA256 16414fae7170e523be6a92cf2118a48296456f325ed57b0eefd164ae9d5a3444
-MISC ChangeLog 7214 RMD160 7f4a3c91422ac18105a7f084e3992a2f3b306559 SHA1 ed8670e40f640208f5b78906f22417c629c580be SHA256 8e76dbd5878d7375dc2e2ef5c4da222db4b1d4fe77e7c5dccbc35836821ed322
+EBUILD opendkim-2.6.1.ebuild 6332 RMD160 0193e5d91b66c5984123a5ef94394e49a897994c SHA1 21984e23f9a67cead50c1384c89e58bbdda4c1a2 SHA256 2960caca3efcbfd1e791576aea7fbe591b32c1b518f6ea1a72f1cb69a60cec57
+MISC ChangeLog 7330 RMD160 8d134878b490026487333018b51b0aa733b2a429 SHA1 1eb02dbc0f0d1f7c18bdaeb22ea194fab6baef4f SHA256 e957f297582d17df1367ad6bac6a5cba5d1b277c271a19517ac6967963e37688
 MISC metadata.xml 1325 RMD160 ff2a0c1e342165fc1bb643bf9712047549e0cfc6 SHA1 69c0c291ac7e94c65a86e27f401b9520346f43f9 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJP1ehdAAoJEOTDgjZ80txd4ZQH/0D/JsUoaQBsg1YCngmzNTF3
-IxXP6vGgRV9FN+a1U09hzhAVT3/LbNXX6++vg/hKg1RUGnnEJntutAgui0YkwEu+
-fJBwm1gOBwf5Xe6G4x9Acdm8tPMxXcWZRTO5azI7sjaToPE6UY3dvoMy1on+x2R3
-DMn8KTtn1zbreMjf4cWYlLUBgDJbM77HZlnELyKadu/oxiGMzrz3HJWUc22fkCsX
-NpdcA0rdqNUy03P9+vW+2Rf5z6fqjRoDsZaP4bknMkb8rs1jbhFugCut0icjE7QF
-U5WlCVUG13HC8pXE3O8WymzMq1QzwxMao3DJrvjh74bJDwtz2eE7Ig0lXNIrxdE=
-=afIn
------END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.6.1.ebuild b/mail-filter/opendkim/opendkim-2.6.1.ebuild
new file mode 100644
index 000000000000..3a0b007c389a
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.6.1.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.1.ebuild,v 1.1 2012/06/27 19:54:30 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"
+}