From cd9405c026abc0e98762bb25dc633c854e02a204 Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <gianni.ceccarelli@net-a-porter.com>
Date: Tue, 17 Sep 2013 18:24:09 +0000
Subject: bump netqmail

---
 mail-mta/netqmail/netqmail-1.06-r2.ebuild | 42 +++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 13 deletions(-)

(limited to 'mail-mta/netqmail/netqmail-1.06-r2.ebuild')

diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
index 792badd..0338155 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -1,16 +1,21 @@
-# Copyright 1999-2010 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/netqmail/netqmail-1.06.ebuild,v 1.5 2010/08/24 13:04:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.06-r2.ebuild,v 1.13 2013/06/09 16:01:23 ago Exp $
+
+EAPI=5
 
 GENQMAIL_PV=20080406
 QMAIL_SPP_PV=0.42
 
 QMAIL_TLS_PV=20070417
 QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
 
 QMAIL_BIGTODO_PV=103
 QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
 
+QMAIL_LARGE_DNS='qmail-103.patch'
+
 inherit eutils qmail
 
 DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
@@ -21,6 +26,8 @@ HOMEPAGE="
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
 	http://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+	http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+	http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
 	!vanilla? (
 		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
 		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
@@ -30,27 +37,29 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"
 
 DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
 	ssl? ( dev-libs/openssl )
+	sys-apps/groff
 "
 RDEPEND="
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
 	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/nbsmtp
+	!mail-mta/msmtp[mta]
 	!mail-mta/nullmailer
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!mail-mta/ssmtp
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
 	>=sys-apps/ucspi-tcp-0.88-r17
 	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
 	virtual/daemontools
@@ -78,17 +87,24 @@ src_unpack() {
 	use qmail-spp && qmail_spp_src_unpack
 
 	unpack ${P}.tar.gz
-	cd "${S}"
+}
 
+src_prepare() {
 	epatch "${FILESDIR}"/${PV}-exit.patch
 	epatch "${FILESDIR}"/${PV}-readwrite.patch
-	epatch ${FILESDIR}/outgoingip.patch
-	epatch ${FILESDIR}/bigdns.patch
+	epatch "${FILESDIR}"/outgoingip.patch
+	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+	epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
 
 	ht_fix_file Makefile*
 
 	if ! use vanilla; then
-		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_F}
+		# This patch contains relative paths and needs to be cleaned up.
+		sed 's~^--- ../../~--- ~g' \
+			<"${DISTDIR}"/${QMAIL_TLS_F} \
+			>"${T}"/${QMAIL_TLS_F}
+		use ssl        && epatch "${T}"/${QMAIL_TLS_F}
+		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
 		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
 		if use qmail-spp; then
@@ -97,6 +113,9 @@ src_unpack() {
 			else
 				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
 			fi
+			cd "${WORKDIR}"
+			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
+			cd -
 		fi
 	fi
 
@@ -125,9 +144,6 @@ pkg_postinst() {
 	qmail_rootmail_fixup
 	qmail_tcprules_build
 
-	# for good measure
-	env-update
-
 	qmail_config_notice
 	qmail_supervise_config_notice
 	elog
-- 
cgit v1.2.3