version bump; conversion to qmail.eclass; fixes #123897, #137207

Package-Manager: portage-2.1.4.4

5 files changed, 182 insertions, 7 deletions

diff --git a/mail-mta/netqmail/ChangeLog b/mail-mta/netqmail/ChangeLog
index dc066ea5f006..b9fdc20f12b8 100644
--- a/mail-mta/netqmail/ChangeLog
+++ b/mail-mta/netqmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/netqmail
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.44 2008/02/27 21:03:39 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.45 2008/04/06 17:16:39 hollow Exp $
+
+*netqmail-1.06 (06 Apr 2008)
+
+  06 Apr 2008; Benedikt Böhm <hollow@gentoo.org> +files/1.06-exit.patch,
+  metadata.xml, +netqmail-1.06.ebuild:
+  version bump; conversion to qmail.eclass; fixes #123897, #137207
 
   27 Feb 2008; Tupone Alfredo <tupone@gentoo.org> files/tcp.qmtp.sample,
   files/tcp.smtp.sample:
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 4134ffaa3f61..04b97976a58f 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.06-exit.patch 551 RMD160 4e37d5e052d949ce682691141a835e209de302a5 SHA1 9de0b915ab9bda742aabece4288538e4ff6b00c9 SHA256 400ab4719d145e29b08d266b38766b80d894d5473e4c4f3b5e436916a36a4333
 AUX 99qmail 137 RMD160 bb1d8b76562c60df05b1e10811d479ca24fdad48 SHA1 d370193dd2be29226fecd399c3bef93aec0011b8 SHA256 b721c405ab3a13803c4647b98a3c0ffbdfb450e4a0f9e5476c1633470b0d6e50
 AUX conf-common 2375 RMD160 d91ae642ba445e73232339f83e6664a2b311ec47 SHA1 49fed2319b8a91651f185a68832045d8be053beb SHA256 c51efbf910e000659ce38c0fa6c1647bad966a9e53a3a3f58d5049c7fec4c126
 AUX conf-pop3d 1205 RMD160 041ee68f4681a963550ea7a96600236057ba5df6 SHA1 36f2e571d0c8a6c2880753df574993c68fed0b28 SHA256 92100277f9858cd65711fcae9662ef72d40a769b84f2ed9814e2062102836d76
@@ -30,18 +31,21 @@ AUX tcp.qmtp.sample 994 RMD160 54cff0d4a0355e6a043388c95d5c3320e70116ed SHA1 55e
 AUX tcp.smtp.sample 3582 RMD160 ee13640487ce1660969ea53760ec86eb12083887 SHA1 e629f07c1e19a1448a8dbc76a180e81a099ce372 SHA256 93a85748d29a997a208c557d059682cfac74bc532cd5efc561afdc02b2925d10
 AUX tcprules.d-Makefile.qmail 132 RMD160 275cf670b111f0673be05c5bb6362943af34e1f2 SHA1 176f82b43e224b8d8aae22bc9bb458b263d17325 SHA256 505e202a5a28a036669e51d3fb51d3c02a3a35d76764c5e3f4fa0c43564a89d6
 DIST big-todo.103.patch 5546 RMD160 a16a429796d869b8217e42b7ddb607c95d9bbcd8 SHA1 ba5c3923ff972a4f3ddd5ae1519938a4716612d1 SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72
+DIST genqmail-20080406.tar.bz2 10252 RMD160 e6b2982447dbe3e92407435831469fba49fe3c9d SHA1 e825bc226d181105e8723360208d8c3f98142025 SHA256 501ca2120c7619569bd9ac3e0035cb0022bfd0cdc9c720b5c43c9e3a4eb07ce8
 DIST netqmail-1.05-tls-smtpauth-20060105.patch 147837 RMD160 18a3edd3ea7e7a8e4d6cadbd3c0bd5e8cb041caa SHA1 1a0fb2367504a4c0f2196e13f753437f47d4b621 SHA256 326af9647e752e158f7672ca3fb592fe23c5f44502ddfcd6b5b6bc6c7ecf4c27
 DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 RMD160 81a00e06fa67a4073b1a5bf5195fbbac675cd46b SHA1 d24cb13cf1371044fc2dfe20471478f59b5524e5 SHA256 573de07d57ac6941a42dda645079213cf36fcbb7f3a8c254b8447709e5e5cd60
 DIST netqmail-1.05.tar.gz 252264 RMD160 e5bd8557c58a2686233449254b146e74389a7652 SHA1 fe4cbe97bd2f18a5ca1b36e4fbbd6c524256a829 SHA256 59788abf252e2da224542c1c8b727311335c61d990f24f4edf28f6eb5483f676
+DIST netqmail-1.06.tar.gz 260941 RMD160 d31598afa862abb35bc1feb8d038ab619b5a17a2 SHA1 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b SHA256 8e7d98d15211fc9f9c28109e942e2268f42a6672d68df92a42f2afa90ff00532
 DIST qmail-spp-0.42.tar.gz 18689 RMD160 5511722c52346692488a63bca53106d580a004c7 SHA1 76a94051b017dd331d8c791e466bb2a936ceba41 SHA256 1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d
 EBUILD netqmail-1.05-r4.ebuild 13065 RMD160 33165c43b34129289e2d8826bb2c974754b520bb SHA1 2420f7103d3be0f9ffca7e733ec8b876578bda47 SHA256 ee774b0d2fb1f63b0be9c015debba19d8ea0a5ee458028589a804cfa7fb391b2
 EBUILD netqmail-1.05-r8.ebuild 13659 RMD160 7755297ca3d6fcdabb76d8b7b27d58169d04f468 SHA1 2381a6b7faf0207193dcaaf83445d802de5ccd42 SHA256 477da6e45564259e29e39dc0700d43de75a4b1c9404a8cc8558e56a2c7cac62b
-MISC ChangeLog 6462 RMD160 d7a5cde781977e84e2b476a021d2d00eeeda33ab SHA1 4eb0e3affdcb81f6be5b6f62af7381d5fee18f09 SHA256 d4e11d0b4c820ce6f5a433adffb66b4f2a67b3f6ed663aa89748427fd7752fd1
-MISC metadata.xml 162 RMD160 e8b1596bd80fdd5ce687342b0653673b405fac9e SHA1 1666b772e3058a2dc2f324d78d427bd6e72e3296 SHA256 c5b40cf3b02aa7c5748cb931bb65b00058081dd7b959f6d7c9ecc6eaf73cfd57
+EBUILD netqmail-1.06.ebuild 3330 RMD160 88122ed7837dd31d84640585faca09c671d801d2 SHA1 7dfefec42ac2331d4f01e16c8cf91564809d5fea SHA256 76e08ef0ef8fb823c219db37bf594a644ded317330fbc228fed2b1b92617825e
+MISC ChangeLog 6673 RMD160 db0df96a28127e0266aa511eff98f844c6c37a7f SHA1 22bd9cbff18f7b4fc8a40967412095d8da0b3b5c SHA256 bc6ceb63088c162684a4e5574a2c98c40572b3ea549476326f26b9e581fe5c70
+MISC metadata.xml 159 RMD160 aa4ad961079c26af99cc726320fc79401e65ea9a SHA1 35fb9f5820b650eb060f5c4ece62c60de1bab0e9 SHA256 b0c15ada9b1606aa2ff9da86e0b7f0bbcd31f202958e29b4d862bf81a1a374e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHxdA08qKy9+b2Hl0RAjAJAJ45scC8g0/GEgIOJvf0uDaojNRbGgCgq2/+
-R1r/hhFimEwVVbPGo9rQYM0=
-=SL8X
+iD8DBQFH+QV9mPFBzbX68WERAmcTAJ9o1cIbYovTQ+ifRYPc6Qav96ymAwCeKo/n
+4LMZ2XiDi6aIIZLItRk8UtM=
+=Qbl3
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/netqmail/files/1.06-exit.patch b/mail-mta/netqmail/files/1.06-exit.patch
new file mode 100644
index 000000000000..e0e7dea0f324
--- /dev/null
+++ b/mail-mta/netqmail/files/1.06-exit.patch
@@ -0,0 +1,18 @@
+Index: netqmail-1.06/qmail-pw2u.c
+===================================================================
+--- netqmail-1.06.orig/qmail-pw2u.c
++++ netqmail-1.06/qmail-pw2u.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include "substdio.h"
+Index: netqmail-1.06/qmail-qmtpd.c
+===================================================================
+--- netqmail-1.06.orig/qmail-qmtpd.c
++++ netqmail-1.06/qmail-qmtpd.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include "stralloc.h"
+ #include "substdio.h"
+ #include "qmail.h"
diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 5e8b5c82f323..0cb478b8c6ca 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>qmail</herd>
+	<herd>qmail</herd>
 </pkgmetadata>
diff --git a/mail-mta/netqmail/netqmail-1.06.ebuild b/mail-mta/netqmail/netqmail-1.06.ebuild
new file mode 100644
index 000000000000..a32bb9975ebf
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2008 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.1 2008/04/06 17:16:39 hollow Exp $
+
+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_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+	http://netqmail.org
+	http://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+	http://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+	!vanilla? (
+		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="authcram gencertdaily highvolume mailwrapper qmail-spp ssl vanilla"
+RESTRICT="test"
+
+DEPEND="
+	!mail-mta/qmail
+	net-mail/queue-repair
+	ssl? ( dev-libs/openssl )
+"
+RDEPEND="
+	mailwrapper? ( net-mail/mailwrapper )
+	!mailwrapper? ( !virtual/mta )
+	>=sys-apps/ucspi-tcp-0.88-r17
+	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+	>=sys-process/daemontools-0.76-r6
+	>=net-mail/dot-forward-0.71-r3
+	virtual/checkpassword
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	${DEPEND}
+"
+PROVIDE="
+	virtual/mta
+	virtual/mda
+"
+
+pkg_setup() {
+	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+		eerror
+		eerror "The QMAIL_PATCH_DIR variable for custom patches"
+		eerror "has been removed from ${PN}. If you need custom patches"
+		eerror "you should create a copy of this ebuild in an overlay."
+		eerror
+		die "QMAIL_PATCH_DIR is not supported anymore"
+	fi
+
+	qmail_create_users
+}
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-exit.patch
+
+	ht_fix_file Makefile*
+
+	if ! use vanilla; then
+		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_F}
+		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
+
+		if use qmail-spp; then
+			if use ssl; then
+				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
+			else
+				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
+			fi
+		fi
+	fi
+
+	qmail_src_postunpack
+
+	# Fix bug #33818 but for netqmail (Bug 137015)
+	if ! use authcram; then
+		einfo "Disabled CRAM_MD5 support"
+		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c
+	else
+		einfo "Enabled CRAM_MD5 support"
+	fi
+}
+
+src_compile() {
+	qmail_src_compile
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+}
+
+pkg_postinst() {
+	qmail_queue_setup
+	qmail_rootmail_fixup
+	qmail_tcprules_build
+
+	# for good measure
+	env-update
+
+	qmail_config_notice
+	qmail_supervise_config_notice
+	elog
+	elog "If you are looking for documentation, check those links:"
+	elog "http://www.gentoo.org/doc/en/qmail-howto.xml"
+	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
+	elog "http://www.lifewithqmail.com/"
+	elog "  -- Life with qmail"
+	elog
+}
+
+pkg_preinst() {
+	qmail_tcprules_fixup
+}
+
+pkg_config() {
+	# avoid some weird locale problems
+	export LC_ALL=C
+
+	qmail_config_fast
+	qmail_tcprules_config
+	qmail_tcprules_build
+
+	use ssl && qmail_ssl_generate
+}