From 677b7ba5c317778df2ad7e70df94b9b7eec4adbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Sep 2021 04:21:55 +0100 Subject: gentoo resync : 10.09.2021 --- sys-auth/nss_ldap/Manifest | 5 - sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch | 432 --------------------- .../nss_ldap/files/nss_ldap-265-installdir.patch | 35 -- sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch | 31 -- sys-auth/nss_ldap/nss_ldap-265-r5.ebuild | 144 ------- sys-auth/nss_ldap/nss_ldap-265-r9.ebuild | 147 ------- 6 files changed, 794 deletions(-) delete mode 100644 sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch delete mode 100644 sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch delete mode 100644 sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch delete mode 100644 sys-auth/nss_ldap/nss_ldap-265-r5.ebuild delete mode 100644 sys-auth/nss_ldap/nss_ldap-265-r9.ebuild (limited to 'sys-auth/nss_ldap') diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest index 5b65c97b5b36..f105dd2c96c7 100644 --- a/sys-auth/nss_ldap/Manifest +++ b/sys-auth/nss_ldap/Manifest @@ -3,9 +3,6 @@ AUX nss_ldap-254-soname.patch 604 BLAKE2B 14328e1fb893c11a67e0fc10026035da5e908b AUX nss_ldap-257-nss_max_group_depth.patch 3551 BLAKE2B 6bb9db4af1ae8b74fefdb99119c41ab1e91b6bf73e9637c0b1ed436c432c00fd827cc0acbb2463bf60fc533ad3d4856f86ecdb607ab1a0030203b2a3d3d015bf SHA512 7810f8c053c8f6b01cc61bb1953441d457bc6d90b4e985d03f6c7e8a7ef60225c86dfa0248fe1107955418a3ed205b52510fd2bee07fefc1c559300a1417d1de AUX nss_ldap-257.2-gssapi-headers.patch 2343 BLAKE2B d82b77be7a5f449e2367719262aa9effca16af1338c276cbb03a705b3ae0d5f2a3ab931aca16883819ca81c59811e5e01dfe0fd4252f4b5de48cd5e1adc73063 SHA512 51acfb4879c242582fc6f4d8543b96ff5e2e36e5bfacc3e8d8f1648f77a16957bbb7da0fa8d09ee1eea0ea19d81b0511ce72cc1c91ca2c68709203ec60369dde AUX nss_ldap-264-disable-automagic.patch 4357 BLAKE2B 6ed58c1478d7aaeaa29002af980149c48b53ce7aa3fa2762194cd5b632ba16adea568023db019c8043c1bda6a82b6e1a13f63cffbf89b928003c1d74af4ad36d SHA512 4d7fc328f90dfc189ee0784db0298434b9a91ed5a9b2828dd94c2632c2116193e22df737de9ff7044746b337c47744284371aa4f32b83be61c5f0ec86edb7d35 -AUX nss_ldap-265-fbsd.patch 13987 BLAKE2B c6a68bff90547ce503e8319639ae0ebc027ed9376e2d1d05ca5aa66e7e955e7025279aed0892860c8a75d6008a50f6863d512379171048b085589c6b0457630d SHA512 efb2e6c955b43743a06b7ddbda9bdf4c3a58f881a45f5d3166c87afd265399bc6da2014c17e3ef4b10a8a66532f38190fab8ddd3f970f155905372f09f6ff3e2 -AUX nss_ldap-265-installdir.patch 1626 BLAKE2B 733cb83d77595cc445f74ba0f9508a6fa32ee84f20f552fd06f1d936770d902ef3b7bfb0fc91ebd4e10ac159b4dcff314ab47165f4736802c027924a76c78322 SHA512 7e86ff4fff320ef8132fff6f317dc58641845327c4de9be3b0d41004d27dab41fcc8752987682cee0b8e22230ab1034f0cf45a84ec405706aa37d499bbcc70b8 -AUX nss_ldap-265-libdir.patch 1311 BLAKE2B 238efa51862e9399c1f0c98476085079542f4b742d95e7ea4afd1397845339183a398487d9c72595ecae1a789b63590d6461b2250a92c7d460cacd3267fdcbf9 SHA512 61bfd43b42ff62b6afa11f3c61195b8182b94646a986fe170381e717d4d1edd333b98814e6bade6c52b6c09111bc563ba13aa224e2437092306c1057e9c46bf6 AUX nss_ldap-265-missing-entries-oneshot.patch 3734 BLAKE2B 8ecc35b20719222a747c511242ba826ce29adfbaf74d20883ede0b7b17aa712cf7ce05a23e9e9a9e6cf47a5098f728e43d666d2681a6df60076d60c4b1626957 SHA512 07136f98f5b195f4b794ede35d314db205b89e63168b14489964ad676714ecf861acdd5810fc99c2e784115af4e0e0a20f849672e7f6643dbb6e14db11c9cb05 AUX nss_ldap-265-pthread.patch 18698 BLAKE2B 1a158ddca1dbc99536b2d637a938c6ab121bb217b6b4b6f9755139ea8aec860023ec5fdcdbcebd925b99d9d440fc4a06da364646cd30f6654e41cbedb18e74df SHA512 2afc8a8ee20043985b739923a4c7472f0e13c6854de6d3023ac6c843d3ba6ecf4cf7ee21da4d8dad907f27ab476eec646fa4603d8be725f079f60a4a220c025d AUX nss_ldap-265-r10-libdir.patch 1345 BLAKE2B 7187c42328e8778a19cd7aae58ffd35b7c1d16e84377d2ddd585ac68ca249ffec94dced5d87cd0e6f339f8d79aa58939d905f3b265810d7d30fb147de85a10a8 SHA512 538dda411d4ba282966245c17791161880a637dcbbc78412deb28ebfefd4b73478b8a6b2c6b05f368c2c64a88b975fb47d4a488342a371d79472ceeb6f8b2c63 @@ -13,6 +10,4 @@ AUX nss_ldap-265-reconnect-timeouts.patch 2806 BLAKE2B b254a9959892a0a8ecb6e5377 AUX nsswitch.ldap.diff 575 BLAKE2B 9578535ea6cff87ac21fa8f3a0a1b8d727c657a53318b378dd86b4dded15bac950e241af59b15b6898a1ed089d1c481f0615ca7de3ae4e07a231432920af7b52 SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0 DIST nss_ldap-265.tar.gz 280976 BLAKE2B 31b233ef7680204abfb62408141609b9489e133327c787c59afedd9ac41194189bde26d1f3b0a885622f57ec769ddee2bdf7d274b9584d4d5002d1c016c86892 SHA512 c4584682968861dd5880992fe7d11c6005d94f0c17252ab1cda04380fd7a81b419ba7e87d0efa44c24c5ce5bf76b9fd8331034dddb4f1400f132eb2192472077 EBUILD nss_ldap-265-r10.ebuild 3794 BLAKE2B 619898f3f824d9854863f0c7eedc44fe783e08cd9ad81045b04d55ef7e46cf6f0fa10c8667a7641b48c3c54618ef7d1699b8fad2e9a5ebe7965f99a762c96d9e SHA512 22637b6f2cb2f4b73aa11ab8816c51ea6080629141a5ab34165ffdebb4b770a2dc781d8893d22b85aa7115d29d0aaa4fbd2e21942e31cb04893cc946467aadc3 -EBUILD nss_ldap-265-r5.ebuild 3982 BLAKE2B 0bb870135f045e18d4e7cfd70b3c1577920efd6a7ec7b662fd6085e5084246a39bd6a0e8ed87a14d86df761f4b508a302a918814f01cb099c84aa43c3150e91f SHA512 c3187609058fb57f6e4270b322226fd2c8a10cebf206e98e0ce800f097d6ce8da7d1a9269a950bacdc247f20a1bcca1cfddc3b97b50240a4375009cbd62c0df0 -EBUILD nss_ldap-265-r9.ebuild 3752 BLAKE2B 7bfae69ea1425d23eb9983823ac07f863364f5e98cdb1d3a0e2e1b53128036e94206a111f75477846d2f5bf2b783c709e49c7aea5db03b937e65ab03dd37e70b SHA512 e8d4e98e5b556c33ce6c542c0a2d16fcf3eef00daaaf1765c5914e60800e54be4c378c75707ffd7519112de7d16859bce694a15faca492e2659892a29f77923a MISC metadata.xml 418 BLAKE2B 0ee38489c1ce6a94df354e507b4e89255abe13a587b6b8887eb234eb1463da037194ad6f3e834e9ce4c5ef6e00c3082706a4b602a2ad39b9ea3eafff71596b22 SHA512 0395ea328ffe10ee708706b9e524ef863716dcb4d762a05546a64c2dbde75ab1ff3ec853c6973e421e0d3a7c837df96adf502aacce726016c4302ab466e1e7a8 diff --git a/sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch b/sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch deleted file mode 100644 index 1ae1171f88e5..000000000000 --- a/sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch +++ /dev/null @@ -1,432 +0,0 @@ ---- Makefile.am.orig 2009-11-06 05:28:08.000000000 -0500 -+++ Makefile.am 2010-01-12 23:24:17.000000000 -0500 -@@ -9,8 +9,12 @@ - if AIX - INST_GID=system - else -+if FreeBSD -+INST_GID=wheel -+else - INST_GID=root - endif -+endif - - EXTRA_DIST = CVSVersionInfo.txt ChangeLog \ - AUTHORS ANNOUNCE NEWS INSTALL README LICENSE.OpenLDAP COPYING\ -@@ -23,7 +27,7 @@ - ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \ - ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \ - dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c \ -- vers.c -+ vers.c bsdnss.c - - nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@ - -@@ -103,11 +107,10 @@ - $(mkinstalldirs) $(DESTDIR)$(dir $(NSS_LDAP_PATH_CONF)); \ - $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \ - fi -- $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; - - uninstall-local: - @$(NORMAL_UNINSTALL) - - vers.c: $(top_srcdir)/CVSVersionInfo.txt -- CVSVERSIONDIR=$(top_srcdir) ./vers_string -v -+ $(top_srcdir)/vers_string -v - - ---- configure.in.orig 2007-10-29 06:30:12.000000000 -0700 -+++ configure.in 2008-09-26 20:38:20.000000000 -0700 -@@ -97,11 +97,15 @@ - linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;; - *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;; - esac -+case "$target_os" in -+freebsd*) TARGET_OS=FreeBSD ;; -+esac - - AM_CONDITIONAL(GCC, test "$GCC" = "yes") - AM_CONDITIONAL(GLIBC, test "$target_os" = "linux" -o "$target_os" = "linux-gnu") - AM_CONDITIONAL(AIX, test "$TARGET_OS" = AIX) - AM_CONDITIONAL(HPUX, test "$TARGET_OS" = HPUX) -+AM_CONDITIONAL(FreeBSD, test "$TARGET_OS" = FreeBSD) - - AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$nss_ldap_so_LD") - -@@ -153,7 +157,6 @@ - aix*) AC_CHECK_HEADERS(irs.h usersec.h) ;; - hpux*) AC_CHECK_HEADERS(nsswitch.h) ;; - *) AC_CHECK_HEADERS(nss.h) -- AC_CHECK_HEADERS(nsswitch.h) - AC_CHECK_HEADERS(irs.h) ;; - esac - AC_CHECK_HEADERS(thread.h) -@@ -232,7 +235,6 @@ - AC_CHECK_FUNCS(gethostbyname) - AC_CHECK_FUNCS(nsdispatch) - AC_CHECK_LIB(pthread_nonshared, main) --AC_CHECK_FUNCS(pthread_atfork) - AC_CHECK_FUNCS(pthread_once) - AC_CHECK_FUNCS(ether_aton) - AC_CHECK_FUNCS(ether_ntoa) - ---- ldap-ethers.c.orig 2009-11-06 10:28:08.000000000 +0000 -+++ ldap-ethers.c 2009-12-23 17:01:14.000000000 +0000 -@@ -217,9 +217,9 @@ - } - - snprintf(fullmac, sizeof(fullmac), "%02x:%02x:%02x:%02x:%02x:%02x", -- addr->ether_addr_octet[0], addr->ether_addr_octet[1], -- addr->ether_addr_octet[2], addr->ether_addr_octet[3], -- addr->ether_addr_octet[4], addr->ether_addr_octet[5]); -+ addr->octet[0], addr->octet[1], -+ addr->octet[2], addr->octet[3], -+ addr->octet[4], addr->octet[5]); - - LA_INIT(a); - LA_STRING(a) = ether_ntoa(addr); -@@ -343,14 +343,14 @@ - if (i != 6) - return NULL; - for (i = 0; i < 6; i++) -- ep.ether_addr_octet[i] = t[i]; -+ ep.octet[i] = t[i]; - - return &ep; - } - #endif /* !HAVE_ETHER_ATON */ - - #ifndef HAVE_ETHER_NTOA --#define EI(i) (unsigned int)(e->ether_addr_octet[(i)]) -+#define EI(i) (unsigned int)(e->octet[(i)]) - static char *ether_ntoa (const struct ether_addr *e) - { - static char s[18]; - ---- ldap-ethers.h.orig 2009-11-06 10:28:08.000000000 +0000 -+++ ldap-ethers.h 2009-12-23 17:02:06.000000000 +0000 -@@ -32,7 +32,7 @@ - - #ifndef HAVE_STRUCT_ETHER_ADDR - struct ether_addr { -- u_char ether_addr_octet[6]; -+ u_char octet[6]; - }; - #endif - ---- ldap-nss.c.orig Sat May 27 16:23:40 2006 -+++ ldap-nss.c Sat May 27 16:23:52 2006 -@@ -69,7 +69,7 @@ - #endif - - /* Try to handle systems with both SASL libraries installed */ --#if defined(HAVE_SASL_SASL_H) && defined(HAVE_SASL_AUXPROP_REQUEST) -+#if defined(HAVE_SASL_SASL_H) - #include - #elif defined(HAVE_SASL_H) - #include - ---- ldap-pwd.c.orig 2008-10-30 21:50:15.000000000 +0100 -+++ ldap-pwd.c 2008-12-06 00:37:30.216966282 +0100 -@@ -21,7 +21,10 @@ - static char rcsId[] = - "$Id$"; - -+#include -+#include - #include "config.h" -+ - - #ifdef HAVE_PORT_BEFORE_H - #include -@@ -90,9 +93,13 @@ - size_t tmplen; - char *tmp; - -- if (_nss_ldap_oc_check (e, "shadowAccount") == NSS_SUCCESS) -- { -+/* if (_nss_ldap_oc_check (e, "shadowAccount") == NSS_SUCCESS) -+ * { -+ */ - /* don't include password for shadowAccount */ -+ if (geteuid() != 0) -+ { -+ /* don't include password for non-root users */ - if (buflen < 3) - return NSS_TRYAGAIN; - -@@ -163,6 +170,15 @@ - } -+ -+#ifdef HAVE_LOGIN_CLASSES -+ stat = -+ _nss_ldap_assign_attrval (e, AT (loginClass), &pw->pw_class, &buffer, -+ &buflen); -+ if (stat != NSS_SUCCESS) -+ (void) _nss_ldap_assign_emptystring (&pw->pw_class, &buffer, &buflen); -+#endif -+ - - stat = - _nss_ldap_assign_attrval (e, AT (homeDirectory), &pw->pw_dir, &buffer, - &buflen); - if (stat != NSS_SUCCESS) - ---- ldap-schema.c 2009-08-29 09:21:43.000000000 -0400 -+++ ldap-schema.c 2009-08-28 12:09:52.000000000 -0400 -@@ -334,6 +334,9 @@ - #ifdef HAVE_PASSWD_PW_EXPIRE - (*pwd_attrs)[i++] = AT (shadowExpire); - #endif /* HAVE_PASSWD_PW_EXPIRE */ -+#ifdef HAVE_LOGIN_CLASSES -+ (*pwd_attrs)[i++] = AT (loginClass); -+#endif - (*pwd_attrs)[i] = NULL; - } - ---- ldap-schema.h 2009-08-29 09:21:43.000000000 -0400 -+++ ldap-schema.h 2009-08-29 06:37:18.000000000 -0400 -@@ -24,7 +24,7 @@ - #define _LDAP_NSS_LDAP_LDAP_SCHEMA_H - - /* max number of attributes per object class */ --#define ATTRTAB_SIZE 15 -+#define ATTRTAB_SIZE 16 - - /** - * function to initialize global lookup filters. -@@ -153,6 +153,10 @@ - #define AT_gecos "gecos" - #define AT_homeDirectory "homeDirectory" - -+#ifdef HAVE_LOGIN_CLASSES -+/* FreeBSD extension -Jacob Myers */ -+#define AT_loginClass "loginClass" -+#endif - /* - * ( nisSchema.2.1 NAME 'shadowAccount' SUP top AUXILIARY - * DESC 'Additional attributes for shadow passwords' - ---- /dev/null 2013-04-13 01:27:01.290932001 +0200 -+++ bsdnss.c 2013-04-14 03:17:47.794195349 +0200 -@@ -0,0 +1,219 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern enum nss_status _nss_ldap_getgrent_r(struct group *, char *, size_t, -+ int *); -+extern enum nss_status _nss_ldap_getgrnam_r(const char *, struct group *, -+ char *, size_t, int *); -+extern enum nss_status _nss_ldap_getgrgid_r(gid_t gid, struct group *, char *, -+ size_t, int *); -+extern enum nss_status _nss_ldap_setgrent(void); -+extern enum nss_status _nss_ldap_endgrent(void); -+extern enum nss_status _nss_ldap_initgroups_dyn(const char *, gid_t, long int *, -+ long int *, gid_t **, long int, int *); -+ -+extern enum nss_status _nss_ldap_getpwent_r(struct passwd *, char *, size_t, -+ int *); -+extern enum nss_status _nss_ldap_getpwnam_r(const char *, struct passwd *, -+ char *, size_t, int *); -+extern enum nss_status _nss_ldap_getpwuid_r(gid_t gid, struct passwd *, char *, -+ size_t, int *); -+extern enum nss_status _nss_ldap_setpwent(void); -+extern enum nss_status _nss_ldap_endpwent(void); -+ -+extern enum nss_status _nss_ldap_gethostbyname_r (const char *name, struct hostent * result, -+ char *buffer, size_t buflen, int *errnop, -+ int *h_errnop); -+ -+extern enum nss_status _nss_ldap_gethostbyname2_r (const char *name, int af, struct hostent * result, -+ char *buffer, size_t buflen, int *errnop, -+ int *h_errnop); -+extern enum nss_status _nss_ldap_gethostbyaddr_r (struct in_addr * addr, int len, int type, -+ struct hostent * result, char *buffer, -+ size_t buflen, int *errnop, int *h_errnop); -+ -+NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getgrgid_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getgrent_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_setgrent); -+NSS_METHOD_PROTOTYPE(__nss_compat_endgrent); -+static NSS_METHOD_PROTOTYPE(__freebsd_getgroupmembership); -+ -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwnam_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwuid_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); -+NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); -+ -+NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyname); -+NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyname2); -+NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyaddr); -+ -+static ns_mtab methods[] = { -+{ NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_ldap_getgrnam_r }, -+{ NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_ldap_getgrgid_r }, -+{ NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_ldap_getgrent_r }, -+{ NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_ldap_setgrent }, -+{ NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_ldap_endgrent }, -+{ NSDB_GROUP, "getgroupmembership", __freebsd_getgroupmembership, NULL }, -+ -+{ NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_ldap_getpwnam_r }, -+{ NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_ldap_getpwuid_r }, -+{ NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, _nss_ldap_getpwent_r }, -+{ NSDB_PASSWD, "setpwent", __nss_compat_setpwent, _nss_ldap_setpwent }, -+{ NSDB_PASSWD, "endpwent", __nss_compat_endpwent, _nss_ldap_endpwent }, -+ -+{ NSDB_HOSTS, "gethostbyname", __nss_compat_gethostbyname, _nss_ldap_gethostbyname_r }, -+{ NSDB_HOSTS, "gethostbyaddr", __nss_compat_gethostbyaddr, _nss_ldap_gethostbyaddr_r }, -+{ NSDB_HOSTS, "gethostbyname2", __nss_compat_gethostbyname2, _nss_ldap_gethostbyname2_r }, -+ -+{ NSDB_GROUP_COMPAT, "getgrnam_r", __nss_compat_getgrnam_r, _nss_ldap_getgrnam_r }, -+{ NSDB_GROUP_COMPAT, "getgrgid_r", __nss_compat_getgrgid_r, _nss_ldap_getgrgid_r }, -+{ NSDB_GROUP_COMPAT, "getgrent_r", __nss_compat_getgrent_r, _nss_ldap_getgrent_r }, -+{ NSDB_GROUP_COMPAT, "setgrent", __nss_compat_setgrent, _nss_ldap_setgrent }, -+{ NSDB_GROUP_COMPAT, "endgrent", __nss_compat_endgrent, _nss_ldap_endgrent }, -+ -+{ NSDB_PASSWD_COMPAT, "getpwnam_r", __nss_compat_getpwnam_r, _nss_ldap_getpwnam_r }, -+{ NSDB_PASSWD_COMPAT, "getpwuid_r", __nss_compat_getpwuid_r, _nss_ldap_getpwuid_r }, -+{ NSDB_PASSWD_COMPAT, "getpwent_r", __nss_compat_getpwent_r, _nss_ldap_getpwent_r }, -+{ NSDB_PASSWD_COMPAT, "setpwent", __nss_compat_setpwent, _nss_ldap_setpwent }, -+{ NSDB_PASSWD_COMPAT, "endpwent", __nss_compat_endpwent, _nss_ldap_endpwent }, -+ -+}; -+ -+ -+ns_mtab * -+nss_module_register(const char *source, unsigned int *mtabsize, -+ nss_module_unregister_fn *unreg) -+{ -+ *mtabsize = sizeof(methods)/sizeof(methods[0]); -+ *unreg = NULL; -+ return (methods); -+} -+ -+int __nss_compat_gethostbyname(void *retval, void *mdata, va_list ap) -+{ -+ enum nss_status (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); -+ const char *name; -+ struct hostent *result; -+ char buffer[1024]; -+ size_t buflen = 1024; -+ int errnop; -+ int h_errnop; -+ int af; -+ enum nss_status status; -+ fn = mdata; -+ name = va_arg(ap, const char*); -+ af = va_arg(ap,int); -+ result = va_arg(ap,struct hostent *); -+ status = fn(name, result, buffer, buflen, &errnop, &h_errnop); -+ status = __nss_compat_result(status,errnop); -+ h_errno = h_errnop; -+ return (status); -+} -+ -+int __nss_compat_gethostbyname2(void *retval, void *mdata, va_list ap) -+{ -+ enum nss_status (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); -+ const char *name; -+ struct hostent *result; -+ char buffer[1024]; -+ size_t buflen = 1024; -+ int errnop; -+ int h_errnop; -+ int af; -+ enum nss_status status; -+ fn = mdata; -+ name = va_arg(ap, const char*); -+ af = va_arg(ap,int); -+ result = va_arg(ap,struct hostent *); -+ status = fn(name, result, buffer, buflen, &errnop, &h_errnop); -+ status = __nss_compat_result(status,errnop); -+ h_errno = h_errnop; -+ return (status); -+} -+ -+int __nss_compat_gethostbyaddr(void *retval, void *mdata, va_list ap) -+{ -+ struct in_addr *addr; -+ int len; -+ int type; -+ struct hostent *result; -+ char buffer[1024]; -+ size_t buflen = 1024; -+ int errnop; -+ int h_errnop; -+ enum nss_status (*fn)(struct in_addr *, int, int, struct hostent *, char *, size_t, int *, int *); -+ enum nss_status status; -+ fn = mdata; -+ addr = va_arg(ap, struct in_addr*); -+ len = va_arg(ap,int); -+ type = va_arg(ap,int); -+ result = va_arg(ap, struct hostent*); -+ status = fn(addr, len, type, result, buffer, buflen, &errnop, &h_errnop); -+ status = __nss_compat_result(status,errnop); -+ h_errno = h_errnop; -+ return (status); -+} -+ -+static int -+__gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *groupc) -+{ -+ int ret, dupc; -+ -+ /* skip duplicates */ -+ for (dupc = 0; dupc < MIN(maxgrp, *groupc); dupc++) { -+ if (groups[dupc] == gid) -+ return 1; -+ } -+ -+ ret = 1; -+ if (*groupc < maxgrp) /* add this gid */ -+ groups[*groupc] = gid; -+ else -+ ret = 0; -+ (*groupc)++; -+ return ret; -+} -+ -+static int __freebsd_getgroupmembership(void *retval, void *mdata, va_list ap) -+{ -+ int err; -+ enum nss_status s; -+ const char *user = va_arg(ap, const char *); -+ gid_t group = va_arg(ap, gid_t); -+ gid_t *groups = va_arg(ap, gid_t *); -+ int limit = va_arg(ap, int); -+ int *size = va_arg(ap, int*); -+ gid_t *tmpgroups; -+ long int lstart, lsize; -+ int i; -+ -+ tmpgroups = malloc(limit * sizeof(gid_t)); -+ if (tmpgroups == NULL) -+ return NS_TRYAGAIN; -+ -+ /* insert primary membership */ -+ __gr_addgid(group, groups, limit, size); -+ -+ lstart = 0; -+ lsize = limit; -+ s = _nss_ldap_initgroups_dyn(user, group, &lstart, &lsize, -+ &tmpgroups, 0, &err); -+ if (s == NSS_STATUS_SUCCESS) { -+ for (i = 0; i < lstart; i++) -+ __gr_addgid(tmpgroups[i], groups, limit, size); -+ s = NSS_STATUS_NOTFOUND; -+ } -+ -+ free(tmpgroups); -+ -+ return __nss_compat_result(s, err); -+} diff --git a/sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch b/sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch deleted file mode 100644 index daf507ad594a..000000000000 --- a/sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: nss_ldap-265/Makefile.am -=================================================================== ---- nss_ldap-265.orig/Makefile.am -+++ nss_ldap-265/Makefile.am -@@ -38,17 +38,13 @@ NSS_LDAP_LDFLAGS = @NSS_LDAP_LDFLAGS@ - DEFS = @DEFS@ - #INCLUDES = -I$(top_builddir) -I$(srcdir) - --if GCC --MULTI_OS_DIRECTORY=$(shell $(CC) $(CFLAGS) -print-multi-os-directory) --else - MULTI_OS_DIRECTORY=. --endif - - if GLIBC --LIBC_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|') -+LIBC_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|') - NSS_LDAP_LIBC_VERSIONED = libnss_ldap-$(LIBC_VERS).so - --NSS_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|') -+NSS_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|') - NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS) - endif - -@@ -83,8 +79,8 @@ if GLIBC - $(mkinstalldirs) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED) - (cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED)) -- $(mkinstalldirs) $(DESTDIR)/usr$(libdir) -- (cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .) -+ $(mkinstalldirs) $(DESTDIR)$(libdir:/lib=/usr/lib) -+ (cd $(DESTDIR)/$(libdir:/lib=/usr/lib); ln -sf ../../lib/$(NSS_LDAP_NSS_VERSIONED) .) - else - $(mkinstalldirs) $(DESTDIR)$(libdir) - if HPUX diff --git a/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch b/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch deleted file mode 100644 index d3609b604a23..000000000000 --- a/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -38,17 +38,13 @@ - DEFS = @DEFS@ - #INCLUDES = -I$(top_builddir) -I$(srcdir) - --if GCC --MULTI_OS_DIRECTORY=$(shell $(CC) $(CFLAGS) -print-multi-os-directory) --else - MULTI_OS_DIRECTORY=. --endif - - if GLIBC --LIBC_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|') -+LIBC_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|') - NSS_LDAP_LIBC_VERSIONED = libnss_ldap-$(LIBC_VERS).so - --NSS_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|') -+NSS_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|') - NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS) - endif - -@@ -83,8 +79,6 @@ - $(mkinstalldirs) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED) - (cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED)) -- $(mkinstalldirs) $(DESTDIR)/usr$(libdir) -- (cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .) - else - $(mkinstalldirs) $(DESTDIR)$(libdir) - if HPUX diff --git a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild deleted file mode 100644 index ca216ce28544..000000000000 --- a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit fixheadtails epatch multilib multilib-minimal 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.4.38-r1[${MULTILIB_USEDEP}] - sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - !> ${S}/config.h - echo "#define HAVE_NET_ROUTE_H 1" >> ${S}/config.h - echo "#define HAVE_RESOLV_H 1" >> ${S}/config.h - fi -} - -multilib_src_install() { - if use kernel_FreeBSD; then - emake -j1 DESTDIR="${D}" install - else - emake -j1 DESTDIR="${D}" install \ - INST_UID=${PORTAGE_USER:-root} INST_GID=${PORTAGE_GROUP:-root} - fi -} - -multilib_src_install_all() { - # dumb /usr/lib* -> /lib* symlinks gone wrong - rm -rf "${ED}"/usr/usr - - 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-r9.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild deleted file mode 100644 index b111e7f4dccc..000000000000 --- a/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools fixheadtails multilib-minimal prefix - -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" -IUSE="debug kerberos ssl sasl split-usr" - -DEPEND=" - >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] - sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${DEPEND} - !>"${ED}"/etc/ldap.conf || die - echo >>"${ED}"/etc/ldap.conf || die - sed -i "${ED}"/etc/ldap.conf \ - -e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \ - || die - - dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \ - CVSVersionInfo.txt README nsswitch.ldap certutil - - docinto docs - dodoc -r 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'!" -} -- cgit v1.2.3