version bump

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

3 files changed, 228 insertions, 16 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index d95185075a30..9ee8286d6950 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/opendkim
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.30 2011/12/26 12:39:37 eras Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.31 2012/03/19 21:10:26 eras Exp $
+
+*opendkim-2.5.1 (19 Mar 2012)
+
+  19 Mar 2012; Eray Aslan <eras@gentoo.org> +opendkim-2.5.1.ebuild:
+  version bump
 
 *opendkim-2.4.3 (26 Dec 2011)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index ca4f434337ba..514220fb2a87 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -5,24 +5,26 @@ AUX opendkim-2.4.0-ipv6.patch 765 RMD160 607f7d55c6bf6d4453651f899927e36682ec267
 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
 DIST opendkim-2.4.3.tar.gz 1381956 RMD160 73908fb7cf8f7c99b1d98499249d0283d0d59542 SHA1 cde87adf1236c9a9f25277935c26020fb13b1153 SHA256 c3ef73c5aa2bf8a6626b822cea08b72c954376ae892d596346973d11003c0906
+DIST opendkim-2.5.1.tar.gz 1468303 RMD160 76a716307bfd30bc2f81c3545f1d4f7ceca99332 SHA1 fd257d2e52673c73e1e15c5254c9db864a53fbb0 SHA256 afd6a762859ff6616103df03757e59c7a1053a241dd28ab21e5e38d44152a8fa
 EBUILD opendkim-2.4.2.ebuild 6329 RMD160 c6287201212540170e21e86748d492a23b36a306 SHA1 8c8317e18d595669000bc74e71eb32ebdea06fd0 SHA256 1acc8529cd12f7f3bde78f2b45a649641c49576b919396eb9bf81035352dcaa7
 EBUILD opendkim-2.4.3.ebuild 6380 RMD160 56cfc755421aa05df92608449e2c1935b36165fc SHA1 8e45360e57cd7fec57c30f053ba00f7deb3dcaed SHA256 54c23a2d34b4dbdf2319711b8ba0926c1301cda09556f1493ad6e1c1aa1216d4
-MISC ChangeLog 6189 RMD160 cf62ffe4bbee60d6de25875bd28ef54af6e39bbe SHA1 98aeaa61a5e5a00f9e0ea90f24bb79462fcbec5f SHA256 ae815621d62611b7de60d4081b27136b65e07e3f22dccf16f97c294fe8a477a4
+EBUILD opendkim-2.5.1.ebuild 6409 RMD160 3b749b0b41aee38aa4eb6aad16207383571beb26 SHA1 e3bd825f1f3e950804e6e267534bf6a96531296c SHA256 ca9f3772769fbfa6f8edf2017283224778fde2405df78b61eec4c2322c344959
+MISC ChangeLog 6304 RMD160 64eca5101f809872c0cb61ffc137f5035261ab62 SHA1 a09bf05e1a8aa6d3c933a33f9d620ed736b553aa SHA256 ae773782be7deb934c2006789193865b652462efad42b60be206e24eddb20526
 MISC metadata.xml 1325 RMD160 ff2a0c1e342165fc1bb643bf9712047549e0cfc6 SHA1 69c0c291ac7e94c65a86e27f401b9520346f43f9 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO+GsYAAoJEHfx8XVYajsfAUwP/35K/2acdiRB7PxVq160xBG7
-QDUBs5UNyEYaphrVgtU+o798VEmhW38JUJEH2wk0OigKvctoAyLGOBupnwwdMwKy
-+XzxpFavfVSrSagkftqP+DqAHr4dJE784qxxsO0r2Zq4hWeh1a/hybX/mZQ+NHjq
-8ThzRzToBHyrfEoWOobfOX1UQHONzaACicSI2JKI8jzNOJF4iMhpv9qjZ/Fy73cm
-isJ4aT/PKhcBqDclEXiQvS+yRDEOD4JTRgZzi3UAdeyMNGhQz9hTkFXwlHe7B5ih
-LZFrJX0LioIkC7GhrTCv2tmP+qYYvoFt2vk7Hb9TALD3RLoOZFCjYx/o919aJSFu
-SxOP5jG6JKn/LPzlCfynhI0iTvXgXUCatZDG6zjzSpCGaE09gPqCnLThoWWEkoXf
-9vgoVWL0uuJMzV5Lrp+qgviNrmnApioJSoTQ2GHDo4DNsCheWG9cHf42VoZQ4SEg
-CLCp1v4sNOhQUqG2NjRykBcAZzbCnYWVTnuFn7Scq330wN9Ax1zCR7XfOriA6ENz
-ScaIo8gxlx/YQS2cdImxyFWE5jEjFHQxQ12otu35l3XcjYi27EkRLgM1h0Kq2dae
-r5l85yBCSsgePaFbddeqvDhOG1nnupfz9BEoxfS2c9P3YoyTaTYlsERe9WHEfLp5
-ZODEtJGuxFRul4XPs5QO
-=PGOT
+iQIcBAEBCAAGBQJPZ6DIAAoJEHfx8XVYajsfxBQQAJ6YoAeUr6hAVFWuj2htxdJX
+6GxQ/fg6wAsgw3D0d8+o4cRkQ0GbmrTgmRG33HJdBYKn7AHD8+2U2KlQ0UAh7t34
+EYSd+6Y7wyeeup2dSq0k91QZBCHA3UbJh4ZQGqBepp0TzT3JYsyWbVRwOIub/Jz5
+bBZhhlP18azgyEWMhIWRahN2KbauKGJs/G0ovkzOTG0hct7wMaTKRfJ6+4hdVdCH
+rhtNIKGw3SNMMzTrBsuG9EuICN9m7Ltcq7YO+189mzLXHgKQlqD/Z0czhde6HxXY
+wG1/wZDxXbblXbUaS8MMaeFybRR2+QmM7cK/k+BfixMzQUkDPl5sgLWKAobYyjs6
+Qxg+26m/I9AQEtsEC85+5iiuO7tJUpa6vV5pH30KVWARstohMmon40AacUPc2XaZ
+D0j6UZUeUHYprZuMR6NNI/GHkbV2Xbbi8/fcq5YBeGHKWHH//b7NXujI5Ek+xuwM
+tlPEB3HhXycqbOhHraMzg4FTu8OhTiVfiTnFg0KuuWM5CThcwfcjjWpiiYSj10lG
+sWPn0haBeJODdU9m72bvm34mVWFrIIq265VN7GNDSftuKEfD1Vx9DwSFKkwvP1rE
+2s16fL6yxoHJERcKL9S22SwABq9wCpnSrsJZBRrDvjXrIFCX2Stldnc8iob1ArOb
+k5VvRv3jGzrMyJ5KxZ/K
+=zzCN
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.5.1.ebuild b/mail-filter/opendkim/opendkim-2.5.1.ebuild
new file mode 100644
index 000000000000..43311286d5d5
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.5.1.ebuild
@@ -0,0 +1,205 @@
+# 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.5.1.ebuild,v 1.1 2012/03/19 21:10:26 eras Exp $
+
+EAPI=4
+
+inherit eutils db-use autotools
+
+# 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 \
+		   contrib/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 ldap ldap_caching) \
+		$(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-selector_header \
+		--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 contrib/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"
+}