commit: 6865ff63b9736767a4cd2d9c2e9b63d1752a0a04
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 19:14:01 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 19:14:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6865ff63
sys-auth/nss_ldap: massive cleanup, nothing deps on this directly
Package-Manager: Portage-2.3.14, Repoman-2.3.6
sys-auth/nss_ldap/Manifest | 5 -
.../files/nss_ldap-239-tls-security-bug.patch | 42 ----
.../files/nss_ldap-252-reconnect-timeouts.patch | 65 ------
.../nss_ldap-254-nss_getgrent_skipmembers.patch | 226 ---------------------
sys-auth/nss_ldap/nss_ldap-258.ebuild | 79 -------
sys-auth/nss_ldap/nss_ldap-259.ebuild | 79 -------
sys-auth/nss_ldap/nss_ldap-261.ebuild | 83 --------
sys-auth/nss_ldap/nss_ldap-262.ebuild | 83 --------
sys-auth/nss_ldap/nss_ldap-264-r1.ebuild | 101 ---------
sys-auth/nss_ldap/nss_ldap-264.ebuild | 98 ---------
sys-auth/nss_ldap/nss_ldap-265-r1.ebuild | 113 -----------
sys-auth/nss_ldap/nss_ldap-265-r2.ebuild | 121 -----------
sys-auth/nss_ldap/nss_ldap-265-r4.ebuild | 140 -------------
sys-auth/nss_ldap/nss_ldap-265.ebuild | 105 ----------
14 files changed, 1340 deletions(-)
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 67377836631..b0122d9234a 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -1,6 +1 @@
-DIST nss_ldap-258.tar.gz 274694 BLAKE2B
6374596d0e6675c89bde561cfcdc26622bfedbacd163183c4838fbb1cf1939078be895dcdd07127503171110bb241ff3e7e40f616865a58caae6931fe2882db0
SHA512
0a92076214e6ffaa60929a9fdc34fe7c9a584a0789d54ea505e65a69eda88a3ee0382ea5a90c581073c95671fa3a50b8a8a529e30f4260afacb3820695773ecb
-DIST nss_ldap-259.tar.gz 274878 BLAKE2B
0d5db5d077f2560b9145c6a19d2af3ede831f2073df562b40b129db995950ab359744ba2fb7156f74720a46edc320dbd44e9be1c5d4fbc515d892ae676876969
SHA512
d20514df1b8dba4ad67cf5d130aa4a2e1b0aea1ee09832bc27078f26a62ecf56b0294b5fcd3425b5b6969889afc99f7fc335a34994034dcfb10f3ab5385d3393
-DIST nss_ldap-261.tar.gz 276065 BLAKE2B
d6854f149aadfdbd19d15de9a3085c7932c7b618af490ce738e92c61c6ca6a8de903d776d1e8d60eae9a3043f510e321cfe7f73dcf21d435b1ea9786e0fc84fc
SHA512
b44f4ad62f3d3b237370b6393ff38ab5f26608bd8996607f828e3ab32d7dbb96ae2e40398b5b1cea9a232a29ea6c30ee56d5e9b386a514b194ac2b3e94da59da
-DIST nss_ldap-262.tar.gz 274927 BLAKE2B
6db4e236485df7d15daeb613df64e384e4cbd96239c37942267005e8b29fdc991d31be32024e0f073f09c0a9cbb3272672f7f2f8d4c35a97003b0d557283aa02
SHA512
ac4781f36b0dbc9a8e00206b13598d247a3501ca0f7e1cc7e7bcc11675186199b2ea0975ce2feb311b07b50aad36efed5ba297e7c93dc741b806a94d8d051152
-DIST nss_ldap-264.tar.gz 278134 BLAKE2B
0c3e969b444a1a836220e1c6cef3598b6e39a5ed5a8365fa6583df2977118b10cfea46ce19fa98c1c5bbbefcc62f3e745287c6c7fb7fe54010dd4c86dd205106
SHA512
e7decde11377f10ec98fd360a38cbf08b9af7e328e967e417367e9e501faf0868be67a6f8fc1dd9b1fe7ee2ae720ee791ed481e21e80f686e750351b3ea6e689
DIST nss_ldap-265.tar.gz 280976 BLAKE2B
31b233ef7680204abfb62408141609b9489e133327c787c59afedd9ac41194189bde26d1f3b0a885622f57ec769ddee2bdf7d274b9584d4d5002d1c016c86892
SHA512
c4584682968861dd5880992fe7d11c6005d94f0c17252ab1cda04380fd7a81b419ba7e87d0efa44c24c5ce5bf76b9fd8331034dddb4f1400f132eb2192472077
diff --git a/sys-auth/nss_ldap/files/nss_ldap-239-tls-security-bug.patch
b/sys-auth/nss_ldap/files/nss_ldap-239-tls-security-bug.patch
deleted file mode 100644
index 1dbd8dc889a..00000000000
--- a/sys-auth/nss_ldap/files/nss_ldap-239-tls-security-bug.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ldap-nss.c 2004-09-28 03:20:11.000000000 +0100
-+++ ldap-nss.c.new 2005-07-04 01:32:12.000000000 +0100
-@@ -330,6 +330,39 @@
-
- timelimit = __session.ls_config->ldc_bind_timelimit;
-
-+#ifdef HAVE_LDAP_START_TLS_S
-+ if (__session.ls_config->ldc_ssl_on == SSL_START_TLS)
-+ {
-+ int version;
-+
-+ if (ldap_get_option
-+ (__session.ls_conn, LDAP_OPT_PROTOCOL_VERSION,
-+ &version) == LDAP_OPT_SUCCESS)
-+ {
-+ if (version < LDAP_VERSION3)
-+ {
-+ version = LDAP_VERSION3;
-+ ldap_set_option (__session.ls_conn, LDAP_OPT_PROTOCOL_VERSION,
-+ &version);
-+ }
-+ }
-+
-+ debug ("==> start_tls");
-+ if (ldap_start_tls_s (__session.ls_conn, NULL, NULL) == LDAP_SUCCESS)
-+ {
-+ debug ("TLS startup succeeded");
-+ }
-+ else
-+ {
-+ debug ("TLS startup failed");
-+ do_close ();
-+ debug ("<== do_open");
-+ return NSS_UNAVAIL;
-+ }
-+ debug ("<== start_tls");
-+ }
-+#endif /* HAVE_LDAP_START_TLS_S */
-+
- return do_bind (ld, timelimit, who, cred, with_sasl);
- }
- #else
diff --git a/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch
b/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch
deleted file mode 100644
index 285a34e3df4..00000000000
--- a/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-This patch changes the default timeouts, so that they are much lower, and do
-not cause major delays when booting a system. This is a workaround until the
-core /etc/{passwd,group} contain all of the data needed for a system boot.
-
-Also add a note that 'ssl on' is broken and TLS should be used instead.
-
-Signed-off-by: Robin H. Johnson <[email protected]>
-
-diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap-nss.h nss_ldap-250/ldap-nss.h
---- nss_ldap-250.orig/ldap-nss.h 2006-04-26 18:19:00.000000000 -0700
-+++ nss_ldap-250/ldap-nss.h 2006-06-14 01:58:01.933005492 -0700
-@@ -96,9 +96,9 @@
- * unacceptable, in which case you may wish to adjust
- * the constants below.
- */
--#define LDAP_NSS_TRIES 5 /* number of sleeping reconnect
attempts */
--#define LDAP_NSS_SLEEPTIME 4 /* seconds to sleep; doubled until max
*/
--#define LDAP_NSS_MAXSLEEPTIME 64 /* maximum seconds to sleep */
-+#define LDAP_NSS_TRIES 4 /* number of sleeping reconnect
attempts */
-+#define LDAP_NSS_SLEEPTIME 1 /* seconds to sleep; doubled until max
*/
-+#define LDAP_NSS_MAXSLEEPTIME 16 /* maximum seconds to sleep */
- #define LDAP_NSS_MAXCONNTRIES 2 /* reconnect attempts before sleeping */
-
- #if defined(HAVE_NSSWITCH_H) || defined(HAVE_IRS_H)
-diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap.conf nss_ldap-250/ldap.conf
---- nss_ldap-250.orig/ldap.conf 2006-04-26 18:19:00.000000000 -0700
-+++ nss_ldap-250/ldap.conf 2006-06-14 02:12:02.008444745 -0700
-@@ -283,7 +283,8 @@
- # OpenLDAP SSL mechanism
- # start_tls mechanism uses the normal LDAP port, LDAPS typically 636
- #ssl start_tls
--#ssl on
-+###ssl on
-+# Gentoo note: Don't use 'ssl on' in 249/250. They are broken in some cases!
Use start_tls instead.
-
- # OpenLDAP SSL options
- # Require and verify server certificate (yes/no)
-@@ -315,3 +316,27 @@
- # Override the default Kerberos ticket cache location.
- #krb5_ccname FILE:/etc/.ldapcache
-
-+# Timeout behavior
-+# Upstream nss_ldap hard-codes these values:
-+#nss_reconnect_tries 5 # number of times to double the
sleep time
-+#nss_reconnect_sleeptime 4 # initial sleep value
-+#nss_reconnect_maxsleeptime 64 # max sleep value to cap at
-+#nss_reconnect_maxconntries 2 # how many tries before sleeping
-+# This leads to a delay of 124 seconds (4+8+16+32+64=124) per lookup if the
-+# server is not available.
-+
-+# For Gentoo's distribution of nss_ldap, as of 250-r1, we use these values
-+# (The hardwired constants in the code are changed to them as well):
-+nss_reconnect_tries 4 # number of times to double the sleep
time
-+nss_reconnect_sleeptime 1 # initial sleep value
-+nss_reconnect_maxsleeptime 16 # max sleep value to cap at
-+nss_reconnect_maxconntries 2 # how many tries before sleeping
-+# This leads to a delay of 15 seconds (1+2+4+8=15)
-+
-+# If you are impatient, and know your LDAP server is reliable, fast or local,
-+# you may wish to use these values instead:
-+#nss_reconnect_tries 1 # number of times to double the
sleep time
-+#nss_reconnect_sleeptime 1 # initial sleep value
-+#nss_reconnect_maxsleeptime 1 # max sleep value to cap at
-+#nss_reconnect_maxconntries 3 # how many tries before sleeping
-+# This leads to a delay of 1 second.
diff --git
a/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch
b/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch
deleted file mode 100644
index 68809bcf1b1..00000000000
--- a/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -c -r nss_ldap-250/ChangeLog nss_ldap-250.1/ChangeLog
-*** nss_ldap-250/ChangeLog Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ChangeLog Wed Aug 16 16:58:57 2006
-***************
-*** 1,6 ****
---- 1,13 ----
- $Id$
- ===============================================================
-
-+ 250.1 Paul B. Henson <[email protected]>
-+
-+ * add nss_getgrent_skipmembers parameter to ldap.conf,
-+ if enabled will not request member attributes for
-+ group lookups, greatly increasing performance in the
-+ face of large groups
-+
- 250 Luke Howard <[email protected]>
-
- * don't use static _nss_ldap_no_members buffer,
-diff -c -r nss_ldap-250/ldap-nss.c nss_ldap-250.1/ldap-nss.c
-*** nss_ldap-250/ldap-nss.c Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ldap-nss.c Wed Aug 16 16:51:49 2006
-***************
-*** 1258,1264 ****
-
- cfg = __config;
-
-! _nss_ldap_init_attributes (cfg->ldc_attrtab);
- _nss_ldap_init_filters ();
-
- #ifdef HAVE_LDAP_SET_OPTION
---- 1258,1264 ----
-
- cfg = __config;
-
-! _nss_ldap_init_attributes (cfg->ldc_attrtab,
cfg->ldc_getgrent_skipmembers);
- _nss_ldap_init_filters ();
-
- #ifdef HAVE_LDAP_SET_OPTION
-diff -c -r nss_ldap-250/ldap-nss.h nss_ldap-250.1/ldap-nss.h
-*** nss_ldap-250/ldap-nss.h Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ldap-nss.h Wed Aug 16 16:51:59 2006
-***************
-*** 390,395 ****
---- 390,396 ----
- time_t ldc_mtime;
-
- char **ldc_initgroups_ignoreusers;
-+ int ldc_getgrent_skipmembers;
- };
-
- typedef struct ldap_config ldap_config_t;
-diff -c -r nss_ldap-250/ldap-schema.c nss_ldap-250.1/ldap-schema.c
-*** nss_ldap-250/ldap-schema.c Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ldap-schema.c Wed Aug 16 16:54:52 2006
-***************
-*** 273,279 ****
-
- static void init_pwd_attributes (const char ***pwd_attrs);
- static void init_sp_attributes (const char ***sp_attrs);
-! static void init_grp_attributes (const char ***grp_attrs);
- static void init_hosts_attributes (const char ***hosts_attrs);
- static void init_services_attributes (const char ***services_attrs);
- static void init_network_attributes (const char ***network_attrs);
---- 273,279 ----
-
- static void init_pwd_attributes (const char ***pwd_attrs);
- static void init_sp_attributes (const char ***sp_attrs);
-! static void init_grp_attributes (const char ***grp_attrs, int
ldc_getgrent_skipmembers);
- static void init_hosts_attributes (const char ***hosts_attrs);
- static void init_services_attributes (const char ***services_attrs);
- static void init_network_attributes (const char ***network_attrs);
-***************
-*** 289,299 ****
- * attribute table initialization routines
- */
- void
-! _nss_ldap_init_attributes (const char ***attrtab)
- {
- init_pwd_attributes (&attrtab[LM_PASSWD]);
- init_sp_attributes (&attrtab[LM_SHADOW]);
-! init_grp_attributes (&attrtab[LM_GROUP]);
- init_hosts_attributes (&attrtab[LM_HOSTS]);
- init_services_attributes (&attrtab[LM_SERVICES]);
- init_network_attributes (&attrtab[LM_NETWORKS]);
---- 289,299 ----
- * attribute table initialization routines
- */
- void
-! _nss_ldap_init_attributes (const char ***attrtab, int
ldc_getgrent_skipmembers)
- {
- init_pwd_attributes (&attrtab[LM_PASSWD]);
- init_sp_attributes (&attrtab[LM_SHADOW]);
-! init_grp_attributes (&attrtab[LM_GROUP], ldc_getgrent_skipmembers);
- init_hosts_attributes (&attrtab[LM_HOSTS]);
- init_services_attributes (&attrtab[LM_SERVICES]);
- init_network_attributes (&attrtab[LM_NETWORKS]);
-***************
-*** 357,363 ****
- }
-
- static void
-! init_grp_attributes (const char ***grp_attrs)
- {
- int i = 0;
- static const char *__grp_attrs[ATTRTAB_SIZE + 1];
---- 357,363 ----
- }
-
- static void
-! init_grp_attributes (const char ***grp_attrs, int ldc_getgrent_skipmembers)
- {
- int i = 0;
- static const char *__grp_attrs[ATTRTAB_SIZE + 1];
-***************
-*** 366,374 ****
-
- (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, cn);
- (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, userPassword);
-! (*grp_attrs)[i++] = (char *) AT (memberUid);
-! if (_nss_ldap_test_config_flag (NSS_LDAP_FLAGS_RFC2307BIS))
-! (*grp_attrs)[i++] = (char *) AT (uniqueMember);
- (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, gidNumber);
- (*grp_attrs)[i] = NULL;
- }
---- 366,377 ----
-
- (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, cn);
- (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, userPassword);
-! if (!ldc_getgrent_skipmembers)
-! {
-! (*grp_attrs)[i++] = (char *) AT (memberUid);
-! if (_nss_ldap_test_config_flag (NSS_LDAP_FLAGS_RFC2307BIS))
-! (*grp_attrs)[i++] = (char *) AT (uniqueMember);
-! }
- (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, gidNumber);
- (*grp_attrs)[i] = NULL;
- }
-diff -c -r nss_ldap-250/ldap-schema.h nss_ldap-250.1/ldap-schema.h
-*** nss_ldap-250/ldap-schema.h Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ldap-schema.h Wed Aug 16 16:54:07 2006
-***************
-*** 30,36 ****
- * function to initialize global lookup filters.
- */
- void _nss_ldap_init_filters ();
-! void _nss_ldap_init_attributes (const char ***attrtab);
-
- /**
- * make filters formerly declared in ldap-*.h globally available.
---- 30,36 ----
- * function to initialize global lookup filters.
- */
- void _nss_ldap_init_filters ();
-! void _nss_ldap_init_attributes (const char ***attrtab, int
ldc_getgrent_skipmembers);
-
- /**
- * make filters formerly declared in ldap-*.h globally available.
-diff -c -r nss_ldap-250/nss_ldap.5 nss_ldap-250.1/nss_ldap.5
-*** nss_ldap-250/nss_ldap.5 Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/nss_ldap.5 Wed Aug 16 17:07:19 2006
-***************
-*** 445,450 ****
---- 445,458 ----
- to return NSS_STATUS_NOTFOUND if called with a listed users as
- its argument.
- .TP
-+ .B nss_getgrent_skipmembers <yes|no>
-+ Specifies whether or not to populate the members list in
-+ the group structure for group lookups. If very large groups
-+ are present, enabling this option will greatly increase
-+ perforance, at the cost of some lost functionality. You should
-+ verify no local applications rely on this information before
-+ enabling this on a production system.
-+ .TP
- .B nss_srv_domain <domain>
- This option determines the DNS domain used for performing SRV
- lookups.
-diff -c -r nss_ldap-250/util.c nss_ldap-250.1/util.c
-*** nss_ldap-250/util.c Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/util.c Wed Aug 16 16:52:55 2006
-***************
-*** 660,665 ****
---- 660,666 ----
- result->ldc_reconnect_maxsleeptime = LDAP_NSS_MAXSLEEPTIME;
- result->ldc_reconnect_maxconntries = LDAP_NSS_MAXCONNTRIES;
- result->ldc_initgroups_ignoreusers = NULL;
-+ result->ldc_getgrent_skipmembers = 0;
-
- for (i = 0; i <= LM_NONE; i++)
- {
-***************
-*** 1137,1142 ****
---- 1138,1156 ----
- break;
- }
- }
-+ else if (!strcasecmp (k, NSS_LDAP_KEY_GETGRENT_SKIPMEMBERS))
-+ {
-+ if (!strcasecmp (v, "on") || !strcasecmp (v, "yes")
-+ || !strcasecmp (v, "true"))
-+ {
-+ result->ldc_getgrent_skipmembers = 1;
-+ }
-+ else if (!strcasecmp (v, "off") || !strcasecmp (v, "no")
-+ || !strcasecmp (v, "false"))
-+ {
-+ result->ldc_getgrent_skipmembers = 0;
-+ }
-+ }
- else if (!strcasecmp (k, NSS_LDAP_KEY_CONNECT_POLICY))
- {
- if (!strcasecmp (v, "oneshot"))
-diff -c -r nss_ldap-250/util.h nss_ldap-250.1/util.h
-*** nss_ldap-250/util.h Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/util.h Wed Aug 16 16:49:52 2006
-***************
-*** 83,88 ****
---- 83,89 ----
- #define NSS_LDAP_KEY_PAGESIZE "pagesize"
- #define NSS_LDAP_KEY_INITGROUPS "nss_initgroups"
- #define NSS_LDAP_KEY_INITGROUPS_IGNOREUSERS "nss_initgroups_ignoreusers"
-+ #define NSS_LDAP_KEY_GETGRENT_SKIPMEMBERS "nss_getgrent_skipmembers"
-
- /* more reconnect policy fine-tuning */
- #define NSS_LDAP_KEY_RECONNECT_TRIES "nss_reconnect_tries"
diff --git a/sys-auth/nss_ldap/nss_ldap-258.ebuild
b/sys-auth/nss_ldap/nss_ldap-258.ebuild
deleted file mode 100644
index 18dbf9fd7de..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-258.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/nsswitch.ldap.diff
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf || die "failed to clean up initial version
marker"
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
- eautoreconf
-}
-
-src_compile() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- econf \
- --with-ldap-lib=openldap \
- --libdir=/$(get_libdir) \
- --enable-schema-mapping \
- --enable-paged-results \
- --enable-rfc2307bis \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install || die "make install failed"
-
- insinto /etc
- doins ldap.conf
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-259.ebuild
b/sys-auth/nss_ldap/nss_ldap-259.ebuild
deleted file mode 100644
index 477b68d5378..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-259.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/nsswitch.ldap.diff
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf || die "failed to clean up initial version
marker"
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
- eautoreconf
-}
-
-src_compile() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- econf \
- --with-ldap-lib=openldap \
- --libdir=/$(get_libdir) \
- --enable-schema-mapping \
- --enable-paged-results \
- --enable-rfc2307bis \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install || die "make install failed"
-
- insinto /etc
- doins ldap.conf
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-261.ebuild
b/sys-auth/nss_ldap/nss_ldap-261.ebuild
deleted file mode 100644
index e69f1f77726..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-261.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/nsswitch.ldap.diff
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf || die "failed to clean up initial version
marker"
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
- # Upstream forgets the version number sometimes
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
- sed -i \
- -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- "${S}"/configure.in
- eautoreconf
-}
-
-src_compile() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- econf \
- --with-ldap-lib=openldap \
- --libdir=/$(get_libdir) \
- --enable-schema-mapping \
- --enable-paged-results \
- --enable-rfc2307bis \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install || die "make install failed"
-
- insinto /etc
- doins ldap.conf
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-262.ebuild
b/sys-auth/nss_ldap/nss_ldap-262.ebuild
deleted file mode 100644
index e69f1f77726..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-262.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/nsswitch.ldap.diff
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf || die "failed to clean up initial version
marker"
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
- # Upstream forgets the version number sometimes
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
- sed -i \
- -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- "${S}"/configure.in
- eautoreconf
-}
-
-src_compile() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- econf \
- --with-ldap-lib=openldap \
- --libdir=/$(get_libdir) \
- --enable-schema-mapping \
- --enable-paged-results \
- --enable-rfc2307bis \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install || die "make install failed"
-
- insinto /etc
- doins ldap.conf
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild
b/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild
deleted file mode 100644
index 673937695e2..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_prepare() {
- epatch "${FILESDIR}"/nsswitch.ldap.diff
-
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf || die "failed to clean up initial version
marker"
-
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
-
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
- # Bug #214750, no automagic deps
- epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
- # Upstream forgets the version number sometimes
- #sed -i \
- # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- # "${S}"/configure.in
-
- # Include an SONAME
- epatch "${FILESDIR}"/${PN}-254-soname.patch
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- # --enable-schema-mapping \
- econf \
- --with-ldap-lib=openldap \
- --libdir=/$(get_libdir) \
- --enable-paged-results \
- --enable-rfc2307bis \
- $(use_enable ssl) \
- $(use_enable sasl) \
- $(use_enable kerberos krb) \
- ${myconf} || die "configure failed"
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install || die "make install failed"
-
- insinto /etc
- doins ldap.conf
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-264.ebuild
b/sys-auth/nss_ldap/nss_ldap-264.ebuild
deleted file mode 100644
index 6f18e950d28..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-264.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_prepare() {
- epatch "${FILESDIR}"/nsswitch.ldap.diff
-
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf || die "failed to clean up initial version
marker"
-
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
-
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
- # Bug #214750, no automagic deps
- epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
- # Upstream forgets the version number sometimes
- #sed -i \
- # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- # "${S}"/configure.in
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- # --enable-schema-mapping \
- econf \
- --with-ldap-lib=openldap \
- --libdir=/$(get_libdir) \
- --enable-paged-results \
- --enable-rfc2307bis \
- $(use_enable ssl) \
- $(use_enable sasl) \
- $(use_enable kerberos krb) \
- ${myconf} || die "configure failed"
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install || die "make install failed"
-
- insinto /etc
- doins ldap.conf
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
b/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
deleted file mode 100644
index dd2baf6e1bf..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_prepare() {
- epatch "${FILESDIR}"/nsswitch.ldap.diff
-
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf || die "failed to clean up initial version
marker"
-
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
-
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
- # Bug #214750, no automagic deps
- epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
- # Upstream forgets the version number sometimes
- #sed -i \
- # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- # "${S}"/configure.in
-
- # Include an SONAME
- epatch "${FILESDIR}"/${PN}-254-soname.patch
-
- sed -i \
- -e 's, vers_string , ./vers_string ,g' \
- "${S}"/Makefile.am
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- # --enable-schema-mapping \
- econf \
- --with-ldap-lib=openldap \
- --libdir=/$(get_libdir) \
- --enable-paged-results \
- --enable-rfc2307bis \
- $(use_enable ssl) \
- $(use_enable sasl) \
- $(use_enable kerberos krb) \
- ${myconf} || die "configure failed"
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install || die "make install failed"
-
- insinto /etc
- doins ldap.conf
-
- # Append two blank lines and some skip entries
- echo >>"${D}"/etc/ldap.conf
- echo >>"${D}"/etc/ldap.conf
- sed -i "${D}"/etc/ldap.conf \
- -e '$inss_initgroups_ignoreusers
ldap,openldap,mysql,syslog,root,postgres' \
- || die "failed to sed /etc/ldap.conf"
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
b/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
deleted file mode 100644
index a44456c8aac..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit fixheadtails eutils multilib autotools prefix
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_prepare() {
- if use prefix; then
- epatch "${FILESDIR}"/${P}-installdir.patch
- eprefixify Makefile.am
- fi
-
- # bug 438692
- epatch "${FILESDIR}"/${P}-pthread.patch
-
- epatch "${FILESDIR}"/nsswitch.ldap.diff
-
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf
-
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
-
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
- # Bug #214750, no automagic deps
- epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
- # Upstream forgets the version number sometimes
- #sed -i \
- # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- # "${S}"/configure.in
-
- # Include an SONAME
- epatch "${FILESDIR}"/${PN}-254-soname.patch
-
- sed -i \
- -e 's, vers_string , ./vers_string ,g' \
- "${S}"/Makefile.am
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- # --enable-schema-mapping \
- econf \
- --with-ldap-lib=openldap \
- --libdir="${EPREFIX}/$(get_libdir)" \
- --with-ldap-conf-file="${EPREFIX}/etc/ldap.conf" \
- --enable-paged-results \
- --enable-rfc2307bis \
- $(use_enable ssl) \
- $(use_enable sasl) \
- $(use_enable kerberos krb) \
- ${myconf}
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install \
- INST_UID=${PORTAGE_USER:-root} INST_GID=${PORTAGE_GROUP:-root}
-
- insinto /etc
- doins ldap.conf
-
- # Append two blank lines and some skip entries
- echo >>"${ED}"/etc/ldap.conf
- echo >>"${ED}"/etc/ldap.conf
- sed -i "${ED}"/etc/ldap.conf \
- -e '$inss_initgroups_ignoreusers
ldap,openldap,mysql,syslog,root,postgres'
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild
b/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild
deleted file mode 100644
index 598a8cb53f3..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit fixheadtails eutils multilib autotools prefix
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_prepare() {
- if use prefix; then
- epatch "${FILESDIR}"/${P}-installdir.patch
- eprefixify Makefile.am
- fi
-
- # bug 438692
- epatch "${FILESDIR}"/${P}-pthread.patch
-
- epatch "${FILESDIR}"/nsswitch.ldap.diff
-
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf
-
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
-
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
- # Bug #214750, no automagic deps
- epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
- # Upstream forgets the version number sometimes
- #sed -i \
- # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- # "${S}"/configure.in
-
- # Include an SONAME
- epatch "${FILESDIR}"/${PN}-254-soname.patch
-
- #fix broken oneshot connections
- epatch "${FILESDIR}/nss_ldap-265-missing-entries-oneshot.patch"
-
- sed -i \
- -e 's, vers_string , ./vers_string ,g' \
- "${S}"/Makefile.am
-
- if use kernel_FreeBSD; then
- #fix broken fbsd support
- EPATCH_OPTS="-p0 -d ${S}" epatch
"${FILESDIR}/nss_ldap-265-fbsd.patch"
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- # --enable-schema-mapping \
- econf \
- --with-ldap-lib=openldap \
- --libdir="${EPREFIX}/$(get_libdir)" \
- --with-ldap-conf-file="${EPREFIX}/etc/ldap.conf" \
- --enable-paged-results \
- --enable-rfc2307bis \
- $(use_enable ssl) \
- $(use_enable sasl) \
- $(use_enable kerberos krb) \
- ${myconf}
-
- if use kernel_FreeBSD; then
- # configure.in does not properly handle include dependencies
- echo "#define HAVE_NETINET_IF_ETHER_H 1" >> ${S}/config.h
- echo "#define HAVE_NET_ROUTE_H 1" >> ${S}/config.h
- echo "#define HAVE_RESOLV_H 1" >> ${S}/config.h
- fi
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- if use kernel_FreeBSD; then
- emake -j1 DESTDIR="${D}" install || die "make install failed"
- else
- emake -j1 DESTDIR="${D}" install \
- INST_UID=${PORTAGE_USER:-root}
INST_GID=${PORTAGE_GROUP:-root}
- fi
-
- insinto /etc
- doins ldap.conf
-
- # Append two blank lines and some skip entries
- echo >>"${ED}"/etc/ldap.conf
- echo >>"${ED}"/etc/ldap.conf
- sed -i "${ED}"/etc/ldap.conf \
- -e '$inss_initgroups_ignoreusers
ldap,openldap,mysql,syslog,root,postgres'
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-265.ebuild
b/sys-auth/nss_ldap/nss_ldap-265.ebuild
deleted file mode 100644
index 5321586830a..00000000000
--- a/sys-auth/nss_ldap/nss_ldap-265.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html";
-SRC_URI="http://www.padl.com/download/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
- sasl? ( dev-libs/cyrus-sasl )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
- !<net-fs/autofs-4.1.3"
-
-src_prepare() {
- epatch "${FILESDIR}"/nsswitch.ldap.diff
-
- # Applied by upstream
- #epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
- epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
- # Applied by upstream
- #EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
- EPATCH_OPTS="-p1 -d ${S}" epatch
"${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf || die "failed to clean up initial version
marker"
-
- # fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
- # fix build borkage
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i
- done
-
- epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
- # Bug #214750, no automagic deps
- epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
- # Upstream forgets the version number sometimes
- #sed -i \
- # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- # "${S}"/configure.in
-
- # Include an SONAME
- epatch "${FILESDIR}"/${PN}-254-soname.patch
-
- sed -i \
- -e 's, vers_string , ./vers_string ,g' \
- "${S}"/Makefile.am
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- use debug && myconf="${myconf} --enable-debugging"
- use kerberos && myconf="${myconf}
--enable-configurable-krb5-ccname-gssapi"
- # --enable-schema-mapping \
- econf \
- --with-ldap-lib=openldap \
- --libdir=/$(get_libdir) \
- --enable-paged-results \
- --enable-rfc2307bis \
- $(use_enable ssl) \
- $(use_enable sasl) \
- $(use_enable kerberos krb) \
- ${myconf} || die "configure failed"
-}
-
-src_install() {
- dodir /$(get_libdir)
-
- emake -j1 DESTDIR="${D}" install || die "make install failed"
-
- insinto /etc
- doins ldap.conf
-
- dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
- CVSVersionInfo.txt README nsswitch.ldap certutil
- docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
- elog "If you use a ldaps:// string in the 'uri' setting of"
- elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
