conversion to qmail.eclass

Package-Manager: portage-2.1.4.4

5 files changed, 309 insertions, 9 deletions

diff --git a/mail-mta/qmail-ldap/ChangeLog b/mail-mta/qmail-ldap/ChangeLog
index 3deaf2a82946..95e5932bd1e1 100644
--- a/mail-mta/qmail-ldap/ChangeLog
+++ b/mail-mta/qmail-ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/qmail-ldap
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.24 2007/12/03 21:38:27 robbat2 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.25 2008/04/06 19:22:37 hollow Exp $
+
+*qmail-ldap-1.03-r8 (06 Apr 2008)
+
+  06 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/1.03-warnings.patch, metadata.xml, +qmail-ldap-1.03-r8.ebuild:
+  conversion to qmail.eclass
 
   03 Dec 2007; Robin H. Johnson <robbat2@gentoo.org>
   qmail-ldap-1.03-r7.ebuild:
diff --git a/mail-mta/qmail-ldap/Manifest b/mail-mta/qmail-ldap/Manifest
index 324d72db23b6..71494da0be6c 100644
--- a/mail-mta/qmail-ldap/Manifest
+++ b/mail-mta/qmail-ldap/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.03-warnings.patch 2604 RMD160 006e097882f76f41f16bec1eeb950a2c7d98203e SHA1 4a69a836f7a43b064cd48109f821abb7b04a6a60 SHA256 2b27769cae0a52229787b67ae0f5b7a0fbfbb8377ee43cdaedbef418b27e7444
 AUX 99qmail 137 RMD160 bb1d8b76562c60df05b1e10811d479ca24fdad48 SHA1 d370193dd2be29226fecd399c3bef93aec0011b8 SHA256 b721c405ab3a13803c4647b98a3c0ffbdfb450e4a0f9e5476c1633470b0d6e50
 AUX conf-common 2377 RMD160 d6c31d5512cccc6f0a5d448bc3ed6c76394c34bf SHA1 d7577dc2514d19be0013daa9aa9b8c04f5e3ef25 SHA256 3ee60e82f4f763d450c1363d2e80ce8e776d5ac1019cf8932777d6c5f2c91f83
 AUX conf-pop3d 1212 RMD160 6415fd08587f966769d4f607f6572ad1970eefc3 SHA1 d69bca5a9a8bb9ee772296173140e9976d82b280 SHA256 0fd4429562499b9199bc0769b186314162eae69d4299854a3a3042f9d3d2a998
@@ -28,11 +32,21 @@ AUX tcp.qmqp.sample 571 RMD160 1c8b66938e2d803a3d302f53e8046cc754153d49 SHA1 c63
 AUX tcp.qmtp.sample 997 RMD160 f50e35d5f6b3cfb2e13891dfeb4d3930276e2c05 SHA1 bd63970fba3273489c43af94dfbe6f6b6498c9c5 SHA256 1c6ab973b069b5e0d14246affad8d46760cd379272e2ce470b5673029ddd8ab4
 AUX tcp.smtp.sample 3585 RMD160 9f6e1d529e40a1ba06e8eb5e85135321334627c0 SHA1 40b3a4829837572e44676f4ff0cc7a54391e60d8 SHA256 4f6e2ccfef548c2bfee249299335fa9c9b47e06be84eb8bb8ba564b45868c9ad
 AUX tcprules.d-Makefile.qmail 132 RMD160 275cf670b111f0673be05c5bb6362943af34e1f2 SHA1 176f82b43e224b8d8aae22bc9bb458b263d17325 SHA256 505e202a5a28a036669e51d3fb51d3c02a3a35d76764c5e3f4fa0c43564a89d6
+DIST genqmail-20080406.tar.bz2 10252 RMD160 e6b2982447dbe3e92407435831469fba49fe3c9d SHA1 e825bc226d181105e8723360208d8c3f98142025 SHA256 501ca2120c7619569bd9ac3e0035cb0022bfd0cdc9c720b5c43c9e3a4eb07ce8
 DIST qmail-1.03.tar.gz 220668 RMD160 b851f273f1d365d38efd949b1efcf35768ffa30f SHA1 18fb960481291a0503e93a94df3f6094edb7f27a SHA256 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88
 DIST qmail-ldap-1.03-20060201-controls20060401d.patch 195962 RMD160 1da9243da1d70faf9305d1740dc6ff2aaf98f261 SHA1 c7a3af8f28920487d5b2c6d920976aa6e40908ee SHA256 49b4418d620af20bb2f3a1b3a9413b51c831bfe7c9ea153f0aef3d5dc76a3577
 DIST qmail-ldap-1.03-20060201.patch.gz 270788 RMD160 c5702f1e4ddc9b5c4bd7d9960d6bab8514ef9d97 SHA1 c413cabc489cad971d1492d08400d5c0c291899b SHA256 92ba895df1957109ad856cc1d1554ece4d25d59017e77127dd52d76afd05525a
 DIST qmail-ldap-1.03-queue-custom-error.patch 2472 RMD160 9d653c77c4f3982945f98e031d6b729628ef102a SHA1 1a23226c1725fccd462fe42f8e523f1b234d5912 SHA256 77536616109591ef5f4bc0f309879167a14b3d6ce4778ff3f2dcaee9a424c25a
 DIST qmail-ldap-1.03-spp-0.42.patch 13618 RMD160 508570102eea891b09bcf7e26c33ebe9c19526b3 SHA1 b8f9a133f56565a54a6083656e9b9d86a59e6698 SHA256 0f673a5944347d5e46c7beffd5d9fa760cecb2e61a3291c3392ffa6777cee8c8
+DIST qmail-spp-0.42.tar.gz 18689 RMD160 5511722c52346692488a63bca53106d580a004c7 SHA1 76a94051b017dd331d8c791e466bb2a936ceba41 SHA256 1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d
 EBUILD qmail-ldap-1.03-r7.ebuild 15276 RMD160 f870ab6b60d3fb7621bff003bdbb55403a98116f SHA1 1addef392e820c3fcf38147ef51def99474b3059 SHA256 b25de20426f1329c91febb0f4fccc13b13de4ddb6b303f2ce797d6aee90e2144
-MISC ChangeLog 9507 RMD160 4ba1e4b2623e239531fba579592e095793db36c9 SHA1 13f81d283d727a40609d129d92523bdd8ee1e165 SHA256 b683240b17a4b5d533b9c4161f8c55469d99b4353574aeb715b42b4e223561da
-MISC metadata.xml 274 RMD160 b34739abe171522004ed69a7df6db178429ed47b SHA1 0714382cdd6138d1a7949f730c60df5e8058b483 SHA256 ae84918a025442981b8832fba60cb274de53724bbe092258d8388985d265bf1e
+EBUILD qmail-ldap-1.03-r8.ebuild 5781 RMD160 229a413c1a119c19ce209eb2bc0450febcbb0e22 SHA1 a7efbb2de0fa0b3e8c715cde1000b2c8c9a72ccb SHA256 5efb91cd72560fba37a78af93a4d0fe4ae7d478986b3d2bd5fb6791a5eacd74b
+MISC ChangeLog 9693 RMD160 4fe176d7f51d0e533d3727ea0ec74cf45c96eb29 SHA1 c374363c7f69fdd4fa288446bf421198bc4b7028 SHA256 9b85d5bd7cdf9929e21a2dba383968e9926cbb5667f1ded39eb260f0404d9927
+MISC metadata.xml 253 RMD160 70832184fd802ef3eb31d9402ec9dd7e6cf13a85 SHA1 d739b49808e925f057320dd0638c9869bc43ac7d SHA256 d6dc3563367c333b1d108804be0d00711f6f77429ada8ebd973cb073c6e60f2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH+SMGmPFBzbX68WERAlHNAKCJ+hcPCluGVXC2t05qK1Y5OC8J7QCfV+lw
+zRGoqBuUWobzD60YAkt6IW0=
+=EA3r
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/qmail-ldap/files/1.03-warnings.patch b/mail-mta/qmail-ldap/files/1.03-warnings.patch
new file mode 100644
index 000000000000..324d4b35730b
--- /dev/null
+++ b/mail-mta/qmail-ldap/files/1.03-warnings.patch
@@ -0,0 +1,55 @@
+Files qmail-1.03.orig/auth_imap and qmail-1.03/auth_imap differ
+Files qmail-1.03.orig/auth_pop and qmail-1.03/auth_pop differ
+Files qmail-1.03.orig/auth_smtp and qmail-1.03/auth_smtp differ
+diff -NurpP qmail-1.03.orig/control.c qmail-1.03/control.c
+--- qmail-1.03.orig/control.c	2008-04-06 19:06:15.683511000 +0000
++++ qmail-1.03/control.c	2008-04-06 19:15:47.923622781 +0000
+@@ -1,3 +1,6 @@
++#define _GNU_SOURCE 1
++#include <string.h>
++
+ #include <unistd.h>
+ #include "readwrite.h"
+ #include "open.h"
+@@ -10,10 +13,6 @@
+ #include "scan.h"
+ #include "limit.h"
+ 
+-#if defined(USE_CONTROLDB) || defined(SECUREBIND_SASL) || defined(SECUREBIND_SSL) || defined(SECUREBIND_TLS) || defined(SECUREBIND_ALL)
+-#include <string.h>
+-#endif
+-
+ #ifdef USE_CONTROLDB
+ #include <syslog.h>
+ 
+@@ -48,7 +47,6 @@ int control_ldap_search(const char *fn, 
+ 
+ #if defined(SECUREBIND_SASL) || defined(SECUREBIND_SSL) || defined(SECUREBIND_TLS) || defined(SECUREBIND_ALL)
+ #include <malloc.h>
+-#include <string.h>
+ #include <malloc.h>
+ 
+ #include "subfd.h"
+Files qmail-1.03.orig/control.o and qmail-1.03/control.o differ
+Files qmail-1.03.orig/pbsadd and qmail-1.03/pbsadd differ
+Files qmail-1.03.orig/pbscheck and qmail-1.03/pbscheck differ
+Files qmail-1.03.orig/pbsdbd and qmail-1.03/pbsdbd differ
+Files qmail-1.03.orig/qmail-forward and qmail-1.03/qmail-forward differ
+Files qmail-1.03.orig/qmail-group and qmail-1.03/qmail-group differ
+Files qmail-1.03.orig/qmail-inject and qmail-1.03/qmail-inject differ
+Files qmail-1.03.orig/qmail-ldaplookup and qmail-1.03/qmail-ldaplookup differ
+Files qmail-1.03.orig/qmail-lspawn and qmail-1.03/qmail-lspawn differ
+Files qmail-1.03.orig/qmail-newmrh and qmail-1.03/qmail-newmrh differ
+Files qmail-1.03.orig/qmail-pw2u and qmail-1.03/qmail-pw2u differ
+Files qmail-1.03.orig/qmail-qmqpc and qmail-1.03/qmail-qmqpc differ
+Files qmail-1.03.orig/qmail-qmtpd and qmail-1.03/qmail-qmtpd differ
+Files qmail-1.03.orig/qmail-queue and qmail-1.03/qmail-queue differ
+Files qmail-1.03.orig/qmail-quotawarn and qmail-1.03/qmail-quotawarn differ
+Files qmail-1.03.orig/qmail-remote and qmail-1.03/qmail-remote differ
+Files qmail-1.03.orig/qmail-reply and qmail-1.03/qmail-reply differ
+Files qmail-1.03.orig/qmail-secretary and qmail-1.03/qmail-secretary differ
+Files qmail-1.03.orig/qmail-send and qmail-1.03/qmail-send differ
+Files qmail-1.03.orig/qmail-showctl and qmail-1.03/qmail-showctl differ
+Files qmail-1.03.orig/qmail-smtpd and qmail-1.03/qmail-smtpd differ
+Files qmail-1.03.orig/qmail-todo and qmail-1.03/qmail-todo differ
+Files qmail-1.03.orig/qmail-verify and qmail-1.03/qmail-verify differ
diff --git a/mail-mta/qmail-ldap/metadata.xml b/mail-mta/qmail-ldap/metadata.xml
index 53eec4364115..ea8f365c8d69 100644
--- a/mail-mta/qmail-ldap/metadata.xml
+++ b/mail-mta/qmail-ldap/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>qmail</herd>
-    <maintainer>
-        <email>hollow@gentoo.org</email>
-        <name>Benedikt Böhm</name>
-    </maintainer>
+	<herd>qmail</herd>
+	<maintainer>
+		<email>hollow@gentoo.org</email>
+		<name>Benedikt Böhm</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild
new file mode 100644
index 000000000000..5cbcc4850bd6
--- /dev/null
+++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild,v 1.1 2008/04/06 19:22:37 hollow Exp $
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_LDAP_PV=20060201
+QMAIL_LDAP_F=${P}-${QMAIL_LDAP_PV}.patch.gz
+
+QMAIL_LDAP_SPP_F=${P}-spp-${QMAIL_SPP_PV}.patch
+
+QMAIL_LDAP_CONTROLS_PV=20060401d
+QMAIL_LDAP_CONTROLS_F=${P}-${QMAIL_LDAP_PV}-controls${QMAIL_LDAP_CONTROLS_PV}.patch
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+	http://www.qmail-ldap.org
+	http://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="mirror://qmail/qmail-${PV}.tar.gz
+	http://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+	http://www.nrg4u.com/qmail/${QMAIL_LDAP_F}
+	mirror://gentoo/${QMAIL_LDAP_CONTROLS_F}
+	mirror://gentoo/${P}-queue-custom-error.patch
+	!vanilla? (
+		qmail-spp? (
+			mirror://sourceforge/qmail-spp/${QMAIL_SPP_F}
+			mirror://gentoo/${QMAIL_LDAP_SPP_F}
+		)
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cluster debug gencertdaily highvolume mailwrapper qmail-spp rfc2307 rfc822 ssl vanilla zlib"
+RESTRICT="test"
+
+DEPEND="
+	!mail-mta/qmail
+	net-nds/openldap
+	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
+	${DEPEND}
+"
+PROVIDE="
+	virtual/mta
+	virtual/mda
+"
+
+S="${WORKDIR}"/qmail-${PV}
+
+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 qmail-${PV}.tar.gz
+
+	cd "${S}"
+
+	# main ldap patch
+	# includes: netqmail-1.05, EXTTODO, BIGTODO, TLS/SMTPAUTH, 0.0.0.0 fix
+	epatch "${DISTDIR}"/${QMAIL_LDAP_F}
+
+	# QmailLDAP/Controls patch
+	# includes: RFC2307/822 fixes
+	epatch "${DISTDIR}"/${QMAIL_LDAP_CONTROLS_F}
+	epatch "${FILESDIR}"/${PV}-warnings.patch
+
+	# fix libraries for controls patch
+	sed -i -e 's|NEWLDAPPROGLIBS=.*|& str.a|' Makefile
+
+	ht_fix_file Makefile*
+
+	if ! use vanilla; then
+		# Add custom bounce messages to qmail-queue
+		epatch "${DISTDIR}"/${P}-queue-custom-error.patch
+
+		# qmail-spp patch
+		use qmail-spp && epatch "${DISTDIR}"/${QMAIL_LDAP_SPP_F}
+	fi
+
+	# makefile options
+	local INCLUDES="-I/usr/include"
+	local LDAPLIBS="-L/usr/lib -lldap -llber"
+	local LDAPFLAGS="-DALTQUEUE -DEXTERNAL_TODO -DDASH_EXT -DSMTPEXECCHECK"
+	local CONTROLDB="-DUSE_CONTROLDB -DQLDAP_BAILOUT"
+	local SECUREBIND= RFCFLAGS=
+
+	use cluster    && LDAPFLAGS="${LDAPFLAGS} -DQLDAP_CLUSTER"
+	use highvolume && LDAPFLAGS="${LDAPFLAGS} -DBIGTODO"
+	use zlib       && LDAPFLAGS="${LDAPFLAGS} -DDATA_COMPRESS -D QMQP_COMPRESS"
+
+	use rfc2307    && RFCFLAGS="${RFCFLAGS} -DUSE_RFC2307"
+	use rfc822     && RFCFLAGS="${RFCFLAGS} -DUSE_RFC822"
+
+	use ssl        && SECUREBIND="-DSECUREBIND_TLS -DSECUREBIND_SSL"
+
+	# a lot of sed magic to get Makefile right
+	local EXP=
+
+	EXP="${EXP} s|^#LDAPINCLUDES=.*|LDAPINCLUDES=${INCLUDES}|;"
+	EXP="${EXP} s|^#LDAPLIBS=.*|LDAPLIBS=${LDAPLIBS}|;"
+	EXP="${EXP} s|^#LDAPFLAGS=.*|LDAPFLAGS=${LDAPFLAGS}|;"
+
+	EXP="${EXP} s|^#CONTROLDB=.*|CONTROLDB=${CONTROLDB}|;"
+	EXP="${EXP} s|^#RFCFLAGS=.*|RFCFLAGS=${RFCFLAGS}|;"
+	EXP="${EXP} s|^#SECUREBIND=.*|SECUREBIND=${SECUREBIND}|;"
+
+	# TODO: do we even need this with LDAP?
+	EXP="${EXP} s|^#SHADOWLIBS=.*|SHADOWLIBS=-lcrypt|;"
+
+	# automagic maildir creation
+	EXP="${EXP} s|^#\(MDIRMAKE=.*\)|\1|;"
+	EXP="${EXP} s|^#\(HDIRMAKE=.*\)|\1|;"
+
+	use debug && EXP="${EXP} s|^#\(DEBUG=.*\)|\1|;"
+	use zlib  && EXP="${EXP} s|^#ZLIB=.*|ZLIB=-lz|;"
+
+	if use ssl; then
+		EXP="${EXP} s|^#\(TLS=.*\)|\1|;"
+		EXP="${EXP} s|^#TLSINCLUDES=.*|TLSINCLUDES=${INCLUDES}|;"
+		EXP="${EXP} s|^#TLSLIBS=.*|TLSLIBS=-L/usr/lib -lssl -lcrypto|;"
+		EXP="${EXP} s|^#OPENSSLBIN=.*|OPENSSLBIN=/usr/bin/openssl|;"
+	fi
+
+	qmail_src_postunpack
+
+	sed -i -e "${EXP}" Makefile || die "could not patch Makefile"
+}
+
+src_compile() {
+	qmail_src_compile ldap
+	use qmail-spp && qmail_spp_src_compile
+}
+
+qmail_full_install_hook() {
+	insinto ${QMAIL_HOME}/bin
+	insopts -o root -g qmail -m 0755
+	doins auth_smtp condwrite digest dirmaker pbs{add,check,dbd} \
+		qmail-{forward,group,quotawarn,reply,secretary,verify}
+
+	insopts -o root -g root -m 0750
+	doins qmail-ldaplookup
+
+	insopts -o root -g qmail -m 0711
+	doins qmail-todo
+
+	insopts -o root -g qmail -m 0700
+	doins auth_{imap,pop} qmail-cdb
+}
+
+qmail_man_install_hook() {
+	dodoc EXTTODO POPBEFORESMTP QLDAP* "${FILESDIR}"/samples.ldif
+}
+
+qmail_config_install_hook() {
+	einfo "Installing OpenLDAP schema"
+	insinto /etc/openldap/schema
+	doins qmail.schema qmail-ldap-control/qmailControl.schema
+}
+
+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.lifewithqmail.com/ldap/"
+	elog "  -- Life with qmail-ldap"
+	elog
+	elog "For sample ldifs, please check"
+	elog "/usr/share/doc/${PF}/samples.ldif.gz"
+	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
+}