[gentoo-commits] repo/gentoo:master commit in: profiles/, mail-mta/qmail-ldap/files/, mail-mta/qmail-ldap/

[gentoo-commits] repo/gentoo:master commit in: profiles/, mail-mta/qmail-ldap/files/, mail-mta/qmail-ldap/

[Aaron Bauman]

commit:     4eaa6b9b08066ca6cd009ab05572fd183f0a9d19
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 01:02:04 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 01:02:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eaa6b9b

mail-mta/qmail-ldap: drop last-rited package

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 mail-mta/qmail-ldap/Manifest                  |   7 -
 mail-mta/qmail-ldap/files/1.03-warnings.patch |  55 ------
 mail-mta/qmail-ldap/files/samples.ldif        |  32 ----
 mail-mta/qmail-ldap/metadata.xml              |  19 ---
 mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild | 234 --------------------------
 profiles/package.mask                         |   5 -
 6 files changed, 352 deletions(-)

diff --git a/mail-mta/qmail-ldap/Manifest b/mail-mta/qmail-ldap/Manifest
deleted file mode 100644
index c90836062c5..00000000000
--- a/mail-mta/qmail-ldap/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
-DIST qmail-1.03.tar.gz 220668 BLAKE2B 3f48be4a7f3ce49dc4ebe260abf1ba330c3b214ef837cc91b0778f245b7c6bcc87ac174ffc41bd9280500e8d2619f6f8817f994d3d6b4f3b8b2e7c543e576a72 SHA512 f2cc47c3ef4a3595d5953f216811a9b60f505cf8cbfd31ae31a888ee04916936210ef1c23d59e8d280a5f0e1c3794b90ee212b2b0f36361c5eff842598c8aee2
-DIST qmail-ldap-1.03-20060201-controls20060401d.patch 195962 BLAKE2B b0e954d0f9b66183f108d773d9c9df52c3e8966a4944ae63c33fd5c680f62a089781ad15a213f4d412ba1a7b6976b5e41bccaab49270e96d1b692bc71010854d SHA512 7e75089de1f9ed09f2e1397cbe8b8e68ad44cc164af92eefdbbb58d7b11678505afc3f225d8038f68c891c3ec3443ae768c334593c0f347e4b16189a9606b181
-DIST qmail-ldap-1.03-20060201.patch.gz 270788 BLAKE2B 3e7e396c8f34b823f293ebb35dd722b6583406816ad9c99f5a883705e72fe69aa953d9513633c2b5074755d58690eb3ef0ac0318a677ce40731cafa003d98aa0 SHA512 c74dd4b600129cac808c8caef63ee8c969887b5c576cd700bb2d021d4480e3e854d147e3e3b72923abe9c3b8bc108c8f00ed7b842eba1f66a961b39f108df798
-DIST qmail-ldap-1.03-queue-custom-error.patch 2472 BLAKE2B 5d7cccdefc4f486ff8f84f951763a5ae0badc9d71c751d216999c6c7f3de791cf7f4670b279c1898c9d25455ed8de4c1e1e00bb7d81a314ace50c2726f807a49 SHA512 04db0c940e8c2a888298febc59a11ae023c154b0c21183134e5255b994630993d0a9241724f8bc5e64337c5444e2c3059d5cc29561ac70637cb40c3e52c5a3b3
-DIST qmail-ldap-1.03-spp-0.42.patch 13618 BLAKE2B 506a34d5f0b936bd41062d179eeb13d35cd82d40595f0d94e1c0bee14206242308b4be470af5d95b22ec361edbafc7e82789076a3dd011601f64800232f19e0b SHA512 3aecc004ccc34f1974a9d0d471add0424b3663fefa12a2a47b7312a73eb5ad6dba28cf075e73243c5740ee4a403b1e37f2a2cbe62c6c15cd3ea8e0b840e72021
-DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf

diff --git a/mail-mta/qmail-ldap/files/1.03-warnings.patch b/mail-mta/qmail-ldap/files/1.03-warnings.patch
deleted file mode 100644
index 324d4b35730..00000000000
--- a/mail-mta/qmail-ldap/files/1.03-warnings.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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/files/samples.ldif b/mail-mta/qmail-ldap/files/samples.ldif
deleted file mode 100644
index c1a77c4d97c..00000000000
--- a/mail-mta/qmail-ldap/files/samples.ldif
+++ /dev/null
@@ -1,32 +0,0 @@
-#ldapauth, better to use this than your rootdn for security reasons
-dn: uid=ldapauth,ou=People,dc=yhourhost,dc=net
-uid: ldapauth
-cn: ldapuath
-objectClass: account
-objectClass: posixAccount
-objectClass: top
-objectClass: shadowAccount
-shadowLastChange: 12116
-loginShell: /bin/true
-uidNumber: 11184
-gidNumber: 2110
-homeDirectory: /var/qmail/maildirs/
-gecos: ldap authorization,,,
-userPassword: libcrypt_format
-
-#sample user dn
-dn: uid=denverj ,ou=people,dc=yourhost,dc=net
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: qmailUser
-objectClass: person
-cn: John Denver
-givenName: denverj
-sn: denverj
-uid: denverj
-mail: denverj@yourhost.net
-mailMessageStore: /var/qmail/maildirs/denverj/Maildir/
-nohomeDirectory: /var/qmail/maildirs/denverj/
-mailAlternateAddress: denverj@alias.host.net
-userPassword: libcrypt_format
-

diff --git a/mail-mta/qmail-ldap/metadata.xml b/mail-mta/qmail-ldap/metadata.xml
deleted file mode 100644
index 7f6421c8f0b..00000000000
--- a/mail-mta/qmail-ldap/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="cluster">Enable this if you want to have cluster support in
-			qmail-ldap</flag>
-		<flag name="gencertdaily">Generate SSL certificates daily instead of
-			hourly</flag>
-		<flag name="highvolume">Prepare qmail for high volume servers</flag>
-		<flag name="rfc2307">Add support for RFC2307 compliant uid/gid
-			attributes</flag>
-		<flag name="rfc822">Add support for RFC822 compliant mail
-			attributes</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">qmail-spp</remote-id>
-	</upstream>
-</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
deleted file mode 100644
index a2760f2ff32..00000000000
--- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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
-	https://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 qmail-spp rfc2307 rfc822 ssl vanilla zlib"
-RESTRICT="test"
-
-DEPEND="
-	!mail-mta/qmail
-	acct-group/nofiles
-	acct-group/qmail
-	acct-user/alias
-	acct-user/qmaild
-	acct-user/qmaill
-	acct-user/qmailp
-	acct-user/qmailq
-	acct-user/qmailr
-	acct-user/qmails
-	net-nds/openldap
-	net-mail/queue-repair
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp
-	>=sys-apps/ucspi-tcp-0.88-r17
-	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-	virtual/daemontools
-	>=net-mail/dot-forward-0.71-r3
-	${DEPEND}
-"
-
-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
-}
-
-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
-
-	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 /usr/share/doc/${PF}/"
-	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
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index b8f642f11e5..4ac2f4f6628 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -445,11 +445,6 @@ sys-apps/man
 # Removal in 30 days.  Bug #697236.
 net-misc/ipsc
 
-# Michał Górny <mgorny@gentoo.org> (2019-10-10)
-# Unmaintained.  Does not build.  EAPI 0.
-# Removal in 30 days.  Bug #696294.
-mail-mta/qmail-ldap
-
 # Brian Evans <grknight@gentoo.org> (2019-10-01)
 # End of life.  Please upgrade.
 # Removal in 90 days. Bug 651784