version bump

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 186 insertions, 2 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index aeb00363ea54..11cd72883132 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.17 2010/06/15 12:00:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.18 2010/07/16 13:25:56 dragonheart Exp $
+
+*opendkim-2.1.3 (16 Jul 2010)
+
+  16 Jul 2010; Daniel Black <dragonheart@gentoo.org> +opendkim-2.1.3.ebuild:
+  version bump
 
   15 Jun 2010; Daniel Black <dragonheart@gentoo.org> opendkim-2.0.3.ebuild,
   opendkim-2.0.4.ebuild, opendkim-2.1.0.ebuild, files/opendkim.init:
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index ff78746a87ae..420f1e9f3f79 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -2,8 +2,10 @@ AUX opendkim.init 1403 RMD160 515d7ac2956c79602cad27a6866ee99f0bafc3d3 SHA1 f9b4
 DIST opendkim-2.0.3.tar.gz 964034 RMD160 964659db05799a555a5a5ba8427cc63044862abb SHA1 c26fcf1edd70f1aac767f687043b13a3597cb19d SHA256 7d2ef1e97f2b878ddd902ecf97763da60f439f799f4fc8ec5b0c8d216e84ee38
 DIST opendkim-2.0.4.tar.gz 965804 RMD160 30bf63ca214942b48d2d4d40f6b1971752ddbf52 SHA1 34b6e315bed100c11b073860406eb77ca320dc82 SHA256 ce1807613a9d194d3c0dce949f8e26bc7b2f1e1c6c908728cdec748c54cda40e
 DIST opendkim-2.1.0.tar.gz 1004640 RMD160 17d799c2dacfd0114addcd707817294ee49cc106 SHA1 fa19ffd96e0629abc65dd410eeb076429d5fd016 SHA256 70dca767cbd029f5c02879e0ccb399c6c886ae6bbb2c196f0775020c8cc2a039
+DIST opendkim-2.1.3.tar.gz 1011019 RMD160 09a215481eda0dee4f5248b1f1981ccf17f800f2 SHA1 81911d2a2ff15f49c039b0c90d6209e5ec7f76a3 SHA256 c889f18ec98ff9454bc211eaad4c746365a763500127ca022e03c087a7028eba
 EBUILD opendkim-2.0.3.ebuild 5736 RMD160 d7713b03df6153e580fe8749253c538749e41275 SHA1 d3ea1826d28665e96f5c66e999255728ec345475 SHA256 d1c191ed2162dce6acf2f0562294f527bf64ff76b5f2aee3a7f5903003a05b39
 EBUILD opendkim-2.0.4.ebuild 5736 RMD160 ce7bf287659cac4780f752a8ef68d96e0f14247c SHA1 7aa3735fb93721fc8584736248f4f050c9b2680c SHA256 580cfbda211266594e83d5a0cedfbc31874d39084b4c3a6db03e0e197f8467d1
 EBUILD opendkim-2.1.0.ebuild 5776 RMD160 8dcd9883ac320a8414f440ae7d6164792f3b8762 SHA1 baf2c827d352a7b40fa91dfa70c43f8de408f6f5 SHA256 23fb3bc45a86cf38e48bdb908161060b1d88e2fe62965ef589cdfd5521058a67
-MISC ChangeLog 4211 RMD160 a2c7d3c332f9e5161eb3cdfe8bd6cd69c3bf1820 SHA1 862ede9ea7aeb488fcc27b918e52635d6fbf8249 SHA256 0527b56237e9a174a85817cfe08ba9c12c945702676170b5d974a91f1143380b
+EBUILD opendkim-2.1.3.ebuild 5713 RMD160 45985ba2d0d6c391283479f277f57212fff38ca2 SHA1 49d809aa4ab3fee8a3564dc0d1a56ad29a91fc1b SHA256 3c55f96bfe414a8343b1ea22b9ecc67e6fa7861fbd290edc5ac2163a3e073888
+MISC ChangeLog 4335 RMD160 782361b502088e6d50d2d391aeba1bb0945ed0f0 SHA1 87091e2fbd5dffd7e6e8d686074e8bc81a025357 SHA256 95d620e3b2fd697cec920b74308ac96e18d61eb470eaced2b3eb5b3f9fc19fc1
 MISC metadata.xml 1444 RMD160 25d767047ea540eeb22f7f2356e83548be5954f9 SHA1 a9d03f567205963ded4a26eb9f9b61f13c6a5b58 SHA256 8fb69e68d1fd09bde49461b53470ec8047de2fa2af497278a5fe514a3dd828f4
diff --git a/mail-filter/opendkim/opendkim-2.1.3.ebuild b/mail-filter/opendkim/opendkim-2.1.3.ebuild
new file mode 100644
index 000000000000..dbfeec4857ef
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.1.3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.1.3.ebuild,v 1.1 2010/07/16 13:25:56 dragonheart Exp $
+
+EAPI="2"
+
+inherit eutils
+
+# 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 +db opendbx ldap lua sasl unbound"
+
+# FUTURE: diffheaders (libtre error) - bug #296813
+
+DEPEND="dev-libs/openssl
+	db? ( >=sys-libs/db-3.2 )
+	|| ( mail-filter/libmilter mail-mta/sendmail )
+	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 )"
+#	diffheaders? ( dev-libs/tre )
+RDEPEND="${DEPEND}"
+
+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:/etc/mail:/etc/opendkim:g' \
+	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
+		   opendkim/opendkim.conf.sample
+}
+
+src_configure() {
+	local conf
+	if use asyncdns ; then
+		if use unbound; then
+			conf=$(use_with unbound)
+		else
+			conf="$(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)"
+		fi
+	else
+		conf="$(use_with unbound) $(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)"
+	fi
+	if use ldap; then
+		conf="${conf} $(use_with sasl)"
+	fi
+	econf $(use_enable db bodylength_db) \
+		$(use_enable db popauth) \
+		$(use_enable db query_cache) \
+		$(use_enable db report_intervals) \
+		$(use_enable db stats) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_with ldap openldap) \
+		$(use_enable ldap ldap_caching) \
+		${conf} \
+		--docdir=/usr/share/doc/${PF} \
+		--without-domainkeys \
+		--enable-capture_unknown_errors \
+		--enable-dkim_reputation \
+		--enable-identity_header \
+		--enable-redirect \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-select_canonicalization \
+		--enable-selector_header \
+		--enable-sender_macro \
+		--enable-vbr \
+		--enable-ztags
+#		$(use_enable diffheaders) \
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# file collision
+	rm "${D}"/usr/share/man/man3/ar.3
+
+	newinitd "${FILESDIR}/opendkim.init" opendkim
+	dodir /etc/opendkim /var/run/opendkim /var/lib/opendkim
+	fowners milter:milter /var/run/opendkim /etc/opendkim /var/lib/opendkim
+
+	# default configuration
+	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
+		grep ^[^#] "${S}"/opendkim/opendkim.conf.sample \
+			> "${D}"/etc/opendkim/opendkim.conf
+		echo \# Socket local:/var/run/opendkim/opendkim.sock >> \
+			"${D}"/etc/opendkim/opendkim.conf
+		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf.basic
+		if use db; then
+			echo Statistics /var/lib/opendkim/stats.db >> \
+				"${D}"/etc/opendkim/opendkim.conf
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "If you want to sign your mail messages, you will have to 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.sh -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"
+
+	# 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"
+}