diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2008-04-06 19:22:38 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2008-04-06 19:22:38 +0000 |
commit | 9f72d349938de00d32fc24a24ad14fda9af4ff09 (patch) | |
tree | 7753d664b4e5b87cabff30e3838ffbf066e78b32 /mail-mta/qmail-ldap | |
parent | My script worked 'too good' and changed ppc to ~ppc. Reversing this change. (diff) | |
download | gentoo-2-9f72d349938de00d32fc24a24ad14fda9af4ff09.tar.gz gentoo-2-9f72d349938de00d32fc24a24ad14fda9af4ff09.tar.bz2 gentoo-2-9f72d349938de00d32fc24a24ad14fda9af4ff09.zip |
conversion to qmail.eclass
(Portage version: 2.1.4.4)
Diffstat (limited to 'mail-mta/qmail-ldap')
-rw-r--r-- | mail-mta/qmail-ldap/ChangeLog | 10 | ||||
-rw-r--r-- | mail-mta/qmail-ldap/files/1.03-warnings.patch | 55 | ||||
-rw-r--r-- | mail-mta/qmail-ldap/metadata.xml | 10 | ||||
-rw-r--r-- | mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild | 225 |
4 files changed, 293 insertions, 7 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/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 +} |