version bump

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

4 files changed, 196 insertions, 5 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index d9467ac6754b..c24e71613f27 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2010/01/21 09:53:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.9 2010/03/05 19:29:31 dragonheart Exp $
+
+*opendkim-2.0.0 (05 Mar 2010)
+
+  05 Mar 2010; Daniel Black <dragonheart@gentoo.org> +opendkim-2.0.0.ebuild,
+  metadata.xml:
+  version bump
 
   21 Jan 2010; Daniel Black <dragonheart@gentoo.org>
   files/opendkim-1.2.2-repcalc.patch:
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 23d6d473693b..0c67c1371ae8 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -3,7 +3,9 @@ AUX opendkim-1.2.2-repcalc.patch 240 RMD160 ed9f5f87d51ef6deb622ebac3e83a7d32613
 AUX opendkim.init 1417 RMD160 df83c4df3b5a6eaa86ff21f8557bcb41fe5cbf2a SHA1 5d70122b00fd11f2a1b26537faca50bda7647f45 SHA256 a79ff9fed5ee3834aa905f6df613035b1121a3b3e264362a74558d315d3c30d9
 DIST opendkim-1.1.2.tar.gz 856455 RMD160 c79918192ed26f771286f1c88efe29ac71e66d73 SHA1 1609c6ffb201e0aa99ddb6c3194f252916074abd SHA256 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
 DIST opendkim-1.2.2.tar.gz 879000 RMD160 662bd8abad2c798f0fc4b6769b82b953f1274f66 SHA1 daee04bf5e755c6e910068e56ea38caba16f67de SHA256 dc123a9e1546ec404535a57ecf717728e5cf89681f7cf749ad27ec0942857b06
+DIST opendkim-2.0.0.tar.gz 986884 RMD160 d85a88e4d493f86e0e14af8cec350f532b282aaf SHA1 bb33854bac14409a0b68539c38c2e5e2b9b07ccf SHA256 1d8b96760949821eaaae40aefa5a1b0b3194dfcd0cfaa76d630ff3d1488824ca
 EBUILD opendkim-1.1.2.ebuild 4978 RMD160 60f9c9d991c192797740c81d9ac886b954281bb8 SHA1 df683fb692d2ee36f9c5d031796f7498da9dc340 SHA256 9362279db968010a95e7e4ebc59646e480cbda64df5c723306936d7c70336f13
 EBUILD opendkim-1.2.2-r1.ebuild 5358 RMD160 d619d2d89ff7a4fc8c42f2a9d43ee84ae71bd67a SHA1 3ad33d92f77ef417765d500ffb2b1ebf5c66d392 SHA256 69e8898ff0b9a8d5afb15046244b5f4332677926133fe3b0f9926bf6ac75dd89
-MISC ChangeLog 2295 RMD160 deb531813094c2c707dba4e4ff75e3faa6da9f6f SHA1 1f1bf535ee10553af6bf8f43e57357d9624c760d SHA256 9b45eb6df544be46d52513fa8f9f47656141364cde39fcae4af307d15fc377fe
-MISC metadata.xml 1147 RMD160 1e2c3412cab1d2ee93187c986f28677f2942b2de SHA1 85d023ab129fc596fa12fa1136ef09c245c9f236 SHA256 ecd0edb859c78f775b0c44dd57c4e674240345c8e1289f0ea54cb4761e1ddc60
+EBUILD opendkim-2.0.0.ebuild 5658 RMD160 a729fb5402140fd05dc813991670ecff5024e458 SHA1 0a2128e0322246db46f77510636eda46fc0c9fcb SHA256 bec6780218c628e02bae7f6aa87a09a875a4e7e7a74f1849b66d28984a1888b9
+MISC ChangeLog 2435 RMD160 984b972593c8d42f078b1ef91a3eec88a4cfa3a0 SHA1 7729df35d3c16e51830a0eb3324c852ae7dde799 SHA256 dce342bb65a4c5d71756044739a39cf0e9c64dae8b6ab9148dcab74c050c7898
+MISC metadata.xml 1536 RMD160 d79b495319a3dbd055605591c2038fc1cdc4cc00 SHA1 e0ca8fd4345d31bbf6049fcb7c4101d95353b413 SHA256 7b2afa62ff1ebfb509298c51f5c13be598a29fe8123c01546ee20dd1b280282a
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 6451a00c2a66..eaf8652479a3 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -9,12 +9,12 @@
 <longdescription>A program implementing the Milter API that signs and verifies
 using the DKIM standard. This is a fork of Sendmail's DKIM-milter</longdescription>
 <use>
+	<flag name='asyncdns'>Use inbuilt asynchronous DNS library for
+	queries</flag>
 	<flag name='db'>Include features like stats, querycache, popauth, report
 	intervals and bodylengthdb that include berkdb</flag>
 	<flag name='diffheaders'>On verification failure, compare the
 	original and the received headers to look for possible munging</flag>
-	<flag name='asyncdns'>Use inbuilt asynchronous DNS library for
-	queries</flag>
 	<flag name='unbound'>Use the unbound dnssec libary to perform DKIM DNS
 	queries.</flag>
 	<flag name='multiplesigs'>Allow addition of multiple signatures when key
@@ -22,6 +22,13 @@ using the DKIM standard. This is a fork of Sendmail's DKIM-milter</longdescripti
 	<flag name='opendbx'>Use opendbx backend to faciliate dataset driven
 	OpenDKIM configuration options like stats, bodylengthdb, etc. against a wide
 	variety of databse types</flag>
+	<flag name='sasl'>Used to authenticate to a LDAP server in various ways if
+	required.</flag>
+	<flag name='ldap'>Enable openldap as a dataset facilitator or keys,
+	determining domains to sign for, and any other dataset that opendkim
+	supports.</flag>
+	<flag name='lua'>Enables control over signature verification, filtering and
+	policy to be controlled by user defined lua scripts.</flag>
 
 </use>
 </pkgmetadata>
diff --git a/mail-filter/opendkim/opendkim-2.0.0.ebuild b/mail-filter/opendkim/opendkim-2.0.0.ebuild
new file mode 100644
index 000000000000..238574cfc653
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.0.0.ebuild
@@ -0,0 +1,176 @@
+# 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.0.0.ebuild,v 1.1 2010/03/05 19:29:31 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' \
+		   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) \
+		${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
+	#mv "${D}"/usr/share/doc/opendkim "${D}"/usr/share/doc/${PF}
+
+	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"
+}