Version bump - bug #370407. Herd from no-herd to net-mail

(Portage version: 2.1.10.3/cvs/Linux x86_64)

6 files changed, 301 insertions, 3 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index b36e7e9712b9..4e0fbcbd3cf1 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2010/11/30 11:27:37 dragonheart Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.22 2011/06/27 07:03:04 eras Exp $
+
+*opendkim-2.4.0 (27 Jun 2011)
+
+  27 Jun 2011; Eray Aslan <eras@gentoo.org> +opendkim-2.4.0.ebuild,
+  +files/opendkim-2.4.0-ipv6.patch, +files/opendkim-2.4.0-oversign.patch,
+  +files/opendkim.init.r2, metadata.xml:
+  Version bump - bug #370407. Herd from no-herd to net-mail
 
 *opendkim-2.2.2 (30 Nov 2010)
 
diff --git a/mail-filter/opendkim/files/opendkim-2.4.0-ipv6.patch b/mail-filter/opendkim/files/opendkim-2.4.0-ipv6.patch
new file mode 100644
index 000000000000..334087d9de71
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.4.0-ipv6.patch
@@ -0,0 +1,18 @@
+Don't assume ipv6 is available
+--- opendkim/tests/t-peer.lua	2011-03-19 06:11:53.000000000 +0200
++++ opendkim/tests/t-peer.lua	2011-06-27 09:42:25.342413931 +0300
+@@ -37,14 +37,6 @@
+ 	{ "localhost", "192.168.1.130", SMFIR_CONTINUE },
+ 	{ "localhost", "192.168.1.131", SMFIR_CONTINUE },
+ 	{ "localhost", "192.168.1.132", SMFIR_ACCEPT },
+--- ipv6 tests
+-	{ "localhost", "9001:db8::8:800:200c:417a", SMFIR_CONTINUE },
+-	{ "localhost", "2001:db8::91", SMFIR_ACCEPT },
+-	{ "localhost", "2001:db8::fff0", SMFIR_CONTINUE },
+-	{ "localhost", "2001:db8::fff1", SMFIR_CONTINUE },
+-	{ "localhost", "2001:db8::fff2", SMFIR_CONTINUE },
+-	{ "localhost", "2001:db8::fff3", SMFIR_CONTINUE },
+-	{ "localhost", "2001:db8::fff4", SMFIR_ACCEPT }
+ 	}
+ 
+ for index = 1, table.getn(test)
diff --git a/mail-filter/opendkim/files/opendkim-2.4.0-oversign.patch b/mail-filter/opendkim/files/opendkim-2.4.0-oversign.patch
new file mode 100644
index 000000000000..1b725990d744
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.4.0-oversign.patch
@@ -0,0 +1,14 @@
+diff --git a/libopendkim/dkim.c b/libopendkim/dkim.c
+index 075bb0c..cd4facc 100644
+--- a/libopendkim/dkim.c
++++ b/libopendkim/dkim.c
+@@ -4352,6 +4352,9 @@ dkim_init(void *(*caller_mallocf)(void *closure, size_t nbytes),
+ 	libhandle->dkiml_timeout = DEFTIMEOUT;
+ 	libhandle->dkiml_senderhdrs = (u_char **) dkim_default_senderhdrs;
+ 	libhandle->dkiml_alwayshdrs = NULL;
++#ifdef _FFR_OVERSIGN
++	libhandle->dkiml_oversignhdrs = NULL;
++#endif /* _FFR_OVERSIGN */
+ 	libhandle->dkiml_nalwayshdrs = 0;
+ 	libhandle->dkiml_mbs = NULL;
+ 	libhandle->dkiml_querymethod = DKIM_QUERY_UNKNOWN;
diff --git a/mail-filter/opendkim/files/opendkim.init.r2 b/mail-filter/opendkim/files/opendkim.init.r2
new file mode 100644
index 000000000000..5450daffa12a
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim.init.r2
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/files/opendkim.init.r2,v 1.1 2011/06/27 07:03:04 eras Exp $
+
+CONFFILE=/etc/opendkim/${SVCNAME}.conf
+
+depend() {
+	use dns logger net
+}
+
+check_cfg() {
+
+	PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}")
+	local PIDDIR="${PIDFILE%/*}"
+	if [ ! -d  "${PIDDIR}" ] ; then
+		checkpath -q -d -o milter:milter -m 0755 "${PIDDIR}" || return 1
+	fi
+	if [ ! -f "${CONFFILE}" ] ; then
+		eerror "Configuration file ${CONFFILE} is missing"
+		return 1
+	fi
+	if [ -z "${PIDFILE}" ] ; then
+		eerror "Configuration file needs PidFile setting - recommend adding 'PidFile /var/run/opendkim/${SVCNAME}.pid' to ${CONFFILE}"
+		return 1
+	fi
+
+	if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then
+		eerror "${SVCNAME} service cannot run with Background key set to yes!"
+		return 1
+	fi
+}
+
+start() {
+	check_cfg || return 1
+	
+	# Remove stalled Unix socket if no other process is using it
+	local UNIX_SOCKET=$(sed -ne 's/^[[:space:]]*Socket[[:space:]]\+\(unix\|local\)://p' "${CONFFILE}")
+
+	if [ -S "${UNIX_SOCKET}" ] && ! fuser -s "${UNIX_SOCKET}"; then
+		rm "${UNIX_SOCKET}"
+	fi
+
+	ebegin "Starting OpenDKIM"
+	start-stop-daemon --start --pidfile "${PIDFILE}" \
+		--exec /usr/sbin/opendkim -- -x "${CONFFILE}"
+	eend $?
+}
+
+stop() {
+	check_cfg || return 1
+	ebegin "Stopping OpenDKIM"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 89aa37d7279b..34807ec2df47 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>net-mail</herd>
 <maintainer>
   <email>dragonheart@gentoo.org</email>
     <name>Daniel Black</name>
@@ -27,6 +27,8 @@ using the DKIM standard. This is a fork of Sendmail's DKIM-milter</longdescripti
 	supports.</flag>
 	<flag name='lua'>Enables control over signature verification, filtering and
 	policy to be controlled by user defined lua scripts.</flag>
+	<flag name='poll'>Use poll() instead of select() for the provided
+	asynchronous resolver library.</flag>
 
 </use>
 </pkgmetadata>
diff --git a/mail-filter/opendkim/opendkim-2.4.0.ebuild b/mail-filter/opendkim/opendkim-2.4.0.ebuild
new file mode 100644
index 000000000000..ee0398b38ce9
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.4.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.4.0.ebuild,v 1.1 2011/06/27 07:03:04 eras Exp $
+
+EAPI=4
+
+inherit eutils db-use
+
+# 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 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 )"
+
+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
+
+		   epatch "${FILESDIR}/${P}-oversign.patch"
+		   epatch "${FILESDIR}/${P}-ipv6.patch"
+}
+
+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-report_intervals"
+		myconf+=" --enable-stats"
+	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 statsext) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_enable ldap ldap_caching) \
+		$(use_enable poll) \
+		${myconf} \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-filter \
+		--without-domainkeys \
+		--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
+}
+
+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"
+}