Net::DNS nextid() changed to be id(). Ensure that we are patched for it.

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, unsigned Manifest commit)

6 files changed, 129 insertions, 16 deletions

diff --git a/mail-mta/qpsmtpd/ChangeLog b/mail-mta/qpsmtpd/ChangeLog
index 4549fdddb5eb..efa88e85622e 100644
--- a/mail-mta/qpsmtpd/ChangeLog
+++ b/mail-mta/qpsmtpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/qpsmtpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.18 2013/02/15 14:25:49 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.19 2013/04/15 23:19:22 robbat2 Exp $
+
+*qpsmtpd-0.84-r2 (15 Apr 2013)
+
+  15 Apr 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/qpsmtpd-0.84-Net-DNS-id.patch, +qpsmtpd-0.84-r2.ebuild,
+  qpsmtpd-0.84-r1.ebuild, qpsmtpd-0.84.ebuild, qpsmtpd-9999.ebuild:
+  Net::DNS nextid() changed to be id(). Ensure that we are patched for it.
 
   15 Feb 2013; Eray Aslan <eras@gentoo.org>
   -files/qpsmtpd-0.40-badhelo_disconnect.patch,
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
new file mode 100644
index 000000000000..6331e98cb48b
--- /dev/null
+++ b/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
@@ -0,0 +1,28 @@
+Net::DNS function nextid() changed to id().
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-async qpsmtpd-0.84/qpsmtpd-async
+--- qpsmtpd-0.84.orig/qpsmtpd-async	2009-04-03 05:48:34.000000000 +0000
++++ qpsmtpd-0.84/qpsmtpd-async	2013-04-15 23:01:49.952857659 +0000
+@@ -145,7 +145,7 @@
+         # print "Next DNS ID: $Net::DNS::Resolver::global{id}\n";
+     };
+     if ($@) {
+-        # print "Next DNS ID: " . Net::DNS::Header::nextid() . "\n";
++        # print "Next DNS ID: " . Net::DNS::Header::id() . "\n";
+     }
+     
+     # Fixup lost kqueue after fork
+diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-forkserver qpsmtpd-0.84/qpsmtpd-forkserver
+--- qpsmtpd-0.84.orig/qpsmtpd-forkserver	2010-04-08 05:29:52.000000000 +0000
++++ qpsmtpd-0.84/qpsmtpd-forkserver	2013-04-15 23:01:49.952857659 +0000
+@@ -285,7 +285,7 @@
+     # all children should have different seeds, to prevent conflicts
+     srand();
+     for (0 .. rand(65536)) {
+-	Net::DNS::Header::nextid();
++	Net::DNS::Header::id();
+     }
+   
+     close $_ for $select->handles;
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild
index 496b7d2b6260..2b11ecc8fdbc 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild,v 1.1 2013/02/15 14:19:53 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild,v 1.2 2013/04/15 23:19:22 robbat2 Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
-	dev-perl/Net-DNS
+	<dev-perl/Net-DNS-0.690.0
 	virtual/perl-MIME-Base64
 	dev-perl/MailTools
 	dev-perl/IPC-Shareable
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
new file mode 100644
index 000000000000..715fc6c534c9
--- /dev/null
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild,v 1.1 2013/04/15 23:19:22 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils perl-app user
+
+DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
+HOMEPAGE="http://smtpd.develooper.com"
+SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="postfix ipv6 syslog"
+
+RDEPEND=">=dev-lang/perl-5.8.0
+	>=dev-perl/Net-DNS-0.690.0
+	virtual/perl-MIME-Base64
+	dev-perl/MailTools
+	dev-perl/IPC-Shareable
+	dev-perl/Socket6
+	dev-perl/Danga-Socket
+	dev-perl/ParaDNS
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	syslog? ( virtual/perl-Sys-Syslog )
+	virtual/inetd"
+
+pkg_setup() {
+	enewgroup smtpd
+	local additional_groups
+	if use postfix; then
+		additional_groups="${additional_groups},postdrop"
+	fi
+	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
+	#epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
+	epatch "${FILESDIR}"/${PN}-0.83-accept-empty-email.patch
+	epatch "${FILESDIR}"/${PN}-0.84-Net-DNS-id.patch
+}
+
+src_install() {
+	perl-module_src_install
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
+
+	dodir /usr/share/qpsmtpd
+	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+
+	insinto /etc/qpsmtpd
+	doins config.sample/*
+
+	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
+	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+	cat >"${D}"/etc/qpsmtpd/logging <<-EOF
+		#logging/syslog loglevel LOGINFO priority LOG_NOTICE
+		#logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
+	EOF
+	if use syslog; then
+		sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging
+	else
+		sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging
+	fi
+
+	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
+
+	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd || die "Installing conf.d file"
+	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd || die "Installing init.d file"
+
+	dodoc CREDITS Changes README README.plugins STATUS
+
+	diropts -m 0755 -o smtpd -g smtpd
+	dodir /var/spool/qpsmtpd /var/log/qpsmtpd
+	keepdir /var/spool/qpsmtpd /var/log/qpsmtpd
+
+}
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
index b144b8c0e857..c40211810f01 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild,v 1.3 2012/11/30 23:10:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild,v 1.4 2013/04/15 23:19:22 robbat2 Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
-	dev-perl/Net-DNS
+	<dev-perl/Net-DNS-0.690.0
 	virtual/perl-MIME-Base64
 	dev-perl/MailTools
 	dev-perl/IPC-Shareable
diff --git a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
index bae9d0210824..2e11f1f1ae34 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild,v 1.5 2013/02/15 14:19:53 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild,v 1.6 2013/04/15 23:19:22 robbat2 Exp $
 
 EAPI=2
 
-inherit eutils git-2 perl-app user
+inherit eutils perl-app user git-2
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
-EGIT_REPO_URI="git://git.develooper.com/qpsmtpd.git
-	http://git.develooper.com/qpsmtpd.git"
+# This is a spotted development fork with many improvements
+EGIT_REPO_URI="git://github.com/qpsmtpd-dev/qpsmtpd-dev.git
+       https://github.com/qpsmtpd-dev/qpsmtpd-dev.git"
 
 LICENSE="MIT"
 SLOT="0"
@@ -17,13 +18,14 @@ KEYWORDS=""
 IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
-	dev-perl/Net-DNS
+	>=dev-perl/Net-DNS-0.690.0
 	virtual/perl-MIME-Base64
 	dev-perl/MailTools
 	dev-perl/IPC-Shareable
 	dev-perl/Socket6
 	dev-perl/Danga-Socket
 	dev-perl/ParaDNS
+	dev-perl/UNIVERSAL-isa
 	ipv6? ( dev-perl/IO-Socket-INET6 )
 	syslog? ( virtual/perl-Sys-Syslog )
 	virtual/inetd"
@@ -37,11 +39,6 @@ pkg_setup() {
 	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
-	epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
-}
-
 src_install() {
 	perl-module_src_install