summaryrefslogtreecommitdiff
path: root/sys-auth
diff options
context:
space:
mode:
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/Manifest.gzbin9753 -> 9752 bytes
-rw-r--r--sys-auth/nss_ldap/Manifest5
-rw-r--r--sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch432
-rw-r--r--sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch35
-rw-r--r--sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch31
-rw-r--r--sys-auth/nss_ldap/nss_ldap-265-r5.ebuild144
-rw-r--r--sys-auth/nss_ldap/nss_ldap-265-r9.ebuild147
-rw-r--r--sys-auth/sssd/Manifest2
-rw-r--r--sys-auth/sssd/sssd-2.5.1.ebuild297
-rw-r--r--sys-auth/yubico-piv-tool/Manifest4
-rw-r--r--sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild2
-rw-r--r--sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild52
12 files changed, 56 insertions, 1095 deletions
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 48130fde4b53..5d8da96e1df5 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
Binary files differ
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 <sasl/sasl.h>
- #elif defined(HAVE_SASL_H)
- #include <sasl.h>
-
---- 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 <sys/types.h>
-+#include <unistd.h>
- #include "config.h"
-+
-
- #ifdef HAVE_PORT_BEFORE_H
- #include <port_before.h>
-@@ -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 <jacob@whotokspaz.org> */
-+#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 <errno.h>
-+#include <stdlib.h>
-+#include <sys/param.h>
-+#include <netinet/in.h>
-+#include <pwd.h>
-+#include <grp.h>
-+#include <nss.h>
-+#include <nsswitch.h>
-+#include <netdb.h>
-+
-+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}
- !<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 , PERL5LIB="@top_srcdir@" @top_srcdir@/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
-}
-
-multilib_src_configure() {
- local myconf=()
- use debug && myconf+=( --enable-debugging )
- use kerberos && myconf+=( --enable-configurable-krb5-ccname-gssapi )
- multilib_is_native_abi && myconf+=( --libdir="${EPREFIX}/$(get_libdir)" )
- # --enable-schema-mapping \
- ECONF_SOURCE=${S} \
- econf \
- --with-ldap-lib=openldap \
- --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
-}
-
-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}
- !<net-fs/autofs-4.1.3
-"
-
-src_prepare() {
- default
-
- # Patch is for Prefix
- # eprefixify is safe on non-Prefix systems, so go unconditional
- # Note: comment this out or make it conditional on 'use prefix'
- # if needs rebasing. Don't remove.
- eapply "${FILESDIR}"/${P}-libdir.patch
- eprefixify Makefile.am
-
- # bug 438692
- eapply -p0 "${FILESDIR}"/${P}-pthread.patch
-
- eapply -p0 "${FILESDIR}"/nsswitch.ldap.diff
-
- # Applied by upstream
- #eapply "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
- eapply -p0 "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
- eapply "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
- # Applied by upstream
- #eapply "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
- eapply "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
- sed -i.orig \
- -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
- "${S}"/ldap.conf \
- || die
-
- # Fix head/tail stuff
- ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
- # Fix build borkage
- local i
- for i in Makefile.{in,am}; do
- sed -i.orig \
- -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
- "${S}"/$i || die
- done
-
- eapply "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
- # Bug #214750, no automagic deps
- eapply "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
- # Upstream forgets the version number sometimes
- #sed -i \
- # -e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
- # "${S}"/configure.in || die
-
- # Include an SONAME
- eapply "${FILESDIR}"/${PN}-254-soname.patch
-
- # Fix broken oneshot connections
- eapply "${FILESDIR}/nss_ldap-265-missing-entries-oneshot.patch"
-
- sed -i \
- -e 's, vers_string , PERL5LIB="@top_srcdir@" @top_srcdir@/vers_string ,g' \
- "${S}"/Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=(
- # --enable-schema-mapping
- --with-ldap-lib=openldap
- --with-ldap-conf-file="${EPREFIX}/etc/ldap.conf"
- --enable-paged-results
- --enable-rfc2307bis
- $(use_enable ssl)
- $(use_enable sasl)
- $(use_enable kerberos krb)
- )
-
- use debug && myconf+=( --enable-debugging )
- use kerberos && myconf+=( --enable-configurable-krb5-ccname-gssapi )
-
- # Neede to be careful with changing this
- # bug #581306
- multilib_is_native_abi && myconf+=( --libdir="${EPREFIX}/$(get_libdir)" )
-
- ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake -j1 DESTDIR="${D}" \
- INST_UID=${PORTAGE_USER:-root} \
- INST_GID=${PORTAGE_GROUP:-root} \
- install
-}
-
-multilib_src_install_all() {
- use split-usr &&
- dosym ../../$(get_libdir)/libnss_ldap.so.2 /usr/$(get_libdir)/libnss_ldap.so.2
-
- insinto /etc
- doins ldap.conf
-
- # Append two blank lines and some skip entries
- echo >>"${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'!"
-}
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index c144a03f7539..53e68f417f48 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,9 +1,7 @@
AUX sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch 1180 BLAKE2B 22b12936b8a4256af39396ce31a90742bc93331b2adb9c44442ddd1285ee19e03c24f99b899dfe35768d4383f7e46a241a0fa3975cc3cf4b32e93f1dd0805915 SHA512 d4519c7d9a63d6902da028584379457fda0be7b4e3b882498586504543e944462d93a3fe804f307562d75cd15257a1595c09bc1e804a41f47f1d2ff9999c7973
AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
DIST sssd-2.3.1.tar.gz 7186526 BLAKE2B 6d630fe75b9b426ef54adbe1704fde8e01fc34df7861028c07ce2985db8a151ce743d633061386fea6460fe8eabb89242b816d4bac87975bb9b7b2064ad1d547 SHA512 6aeb52d5222c5992d581296996749327bcaf276e4eb4413a6a32ea6529343432cfe413006aca4245c19b38b515be1c4c2ef88a157c617d889274179253355bc6
-DIST sssd-2.5.1.tar.gz 7492275 BLAKE2B 9f19d12cb0e071b15bd8fe2660ab9a2223d53267549602c4837f35ed852fa60022514a0bbd03c684c1f398d763120c5f706999d86432d9fe03c3715cb0d43000 SHA512 7441df3b5f1cc1eadb0c6853b048d780ecb36761876aaeb26b9a2d87729211d3ceeae01085dc3ec4fd1c5328f951c8abe854b1d01d91fae25466f930fe16e44a
DIST sssd-2.5.2.tar.gz 7579208 BLAKE2B ec5d9aeaf5b5e05b56c01f9137f6f24db05544dbd48458d742285b60e7beb6d48af865f3415e11ce89e187f4643bbecf15bbb321859ec80cfe458eb781cea6c9 SHA512 a9bac7b2cc23022dce3bcda314c9c26a0a0914c448f6d5a51c5ba18670f04c1fd1a94cb20173235b6285df1dcc9251cb6b3f3e71a220037b4eb66668e6f33c48
EBUILD sssd-2.3.1-r2.ebuild 7563 BLAKE2B b7dd8d9487bf8081aff7a20866e63ea37f97c12f4c6075af8080cf120d060c3075d9f0fa87234f5db6d9aa74ab58d0d53b21f059133975a819ee1b963d7e888a SHA512 3980637d2480a2247b897c0412a18c53536481eaf624089f5d697353688b13181d3928e8d665829f411d7bcf3e7da95b51a6407072a5c9548c7f66b47e92b30c
-EBUILD sssd-2.5.1.ebuild 7673 BLAKE2B 092df102af81094e598184c006d2669745fea384308dfc7655b35e84fd80dc56c5c9e587b9217b9ef822ad0893d0967827257f693ea5fb116b3ae9b4e7ad1b1f SHA512 85a3c54b36d15c0c4f9641c03b7893ca8994cb0f8218eb8039947dd500227640bc56bd6056cf94a60670b42c1b2d25d015383e5f0c47e95ccb33548550dec490
EBUILD sssd-2.5.2.ebuild 7680 BLAKE2B 0b2dd1baa1329a4a1783acec57bd72f12b5455d97bae3f1f527e12c6caff201c1c41c006bb5de114ef4749608651d4eb5a2c078abecec16036e06f98e0ea6c08 SHA512 c0a1e683a6593681eb8de8f2b1459b4bf40e08f5085087cac6bc98c7bfef77f0e13433ec2fb8fcfa620b2b1666e24ac5d6371bc5092ae477b6cb86b3bee47703
MISC metadata.xml 1181 BLAKE2B 169890eab8d708cc561792859dd065849c6c1b5ea4b338133a9850979032ebfe292d200c0437bbded1369cebef60c3acb9e4c6a3af4384700bd703a90ecd67ac SHA512 b4fc2aefde3549d763dcd806a1314f8bb09d2b8a18652d6e5d4e6c6e61e345c3e05fc161adef31e93c99344b6a7e129fa10e6ed0c34445c0c6149c2fe9da23a9
diff --git a/sys-auth/sssd/sssd-2.5.1.ebuild b/sys-auth/sssd/sssd-2.5.1.ebuild
deleted file mode 100644
index 3c3af9abb66e..000000000000
--- a/sys-auth/sssd/sssd-2.5.1.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://github.com/SSSD/sssd"
-SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- pac? ( samba )
- test? ( sudo )
- valgrind? ( test )"
-
-BDEPEND=">=sys-devel/autoconf-2.69-r5
- virtual/pkgconfig
- ${PYTHON_DEPS}
- doc? ( app-doc/doxygen )
- test? (
- dev-libs/check
- dev-libs/softhsm:2
- dev-util/cmocka
- net-libs/gnutls[pkcs11,tools]
- sys-libs/libfaketime
- sys-libs/nss_wrapper
- sys-libs/pam_wrapper
- sys-libs/uid_wrapper
- valgrind? ( dev-util/valgrind )
- )
- man? (
- app-text/docbook-xml-dtd:4.4
- >=dev-libs/libxslt-1.1.26
- nls? ( app-text/po4a )
- )"
-
-DEPEND=">=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
- app-crypt/p11-kit
- >=dev-libs/ding-libs-0.2
- dev-libs/glib:2
- >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
- >=dev-libs/libpcre-8.30:=
- >=dev-libs/popt-1.16
- >=dev-libs/openssl-1.0.2:0=
- >=net-dns/bind-tools-9.9[gssapi]
- >=net-dns/c-ares-1.7.4
- >=net-nds/openldap-2.4.30[sasl]
- >=sys-apps/dbus-1.6
- >=sys-apps/keyutils-1.5:=
- >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/talloc-2.0.7
- >=sys-libs/tdb-1.2.9
- >=sys-libs/tevent-0.9.16
- >=sys-libs/ldb-1.1.17-r1:=
- virtual/libintl
- locator? (
- >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
- )
- acl? ( net-fs/cifs-utils[acl] )
- netlink? ( dev-libs/libnl:3 )
- nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
- nls? ( >=sys-devel/gettext-0.18 )
- pac? (
- net-fs/samba
- )
- python? ( ${PYTHON_DEPS} )
- samba? ( >=net-fs/samba-4.10.2[winbind] )
- selinux? (
- >=sys-libs/libselinux-2.1.9
- >=sys-libs/libsemanage-2.1
- )
- systemd? (
- dev-libs/jansson:0=
- net-libs/http-parser:0=
- net-misc/curl:0=
- )
- systemtap? ( dev-util/systemtap )"
-RDEPEND="${DEPEND}
- >=sys-libs/glibc-2.17[nscd]
- selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/ipa_hbac.h
- /usr/include/sss_idmap.h
- /usr/include/sss_nss_idmap.h
- # --with-ifp
- /usr/include/sss_sifp.h
- /usr/include/sss_sifp_dbus.h
- # from 1.15.3
- /usr/include/sss_certmap.h
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e 's:/var/run:/run:' \
- "${S}"/src/examples/logrotate \
- || die
-
- # disable flaky test, see https://github.com/SSSD/sssd/issues/5631
- sed -i \
- -e '/^\s*pam-srv-tests[ \\]*$/d' \
- "${S}"/Makefile.am \
- || die
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-src_configure() {
- local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=()
-
- myconf+=(
- --localstatedir="${EPREFIX}"/var
- --runstatedir="${EPREFIX}"/run
- --with-pid-path="${EPREFIX}"/run
- --with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
- --enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
- --with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
- --with-db-path="${EPREFIX}"/var/lib/sss/db
- --with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
- --with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
- --with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
- --with-mcache-path="${EPREFIX}"/var/lib/sss/mc
- --with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
- --with-log-path="${EPREFIX}"/var/log/sssd
- --with-os=gentoo
- --with-nscd="${EPREFIX}"/usr/sbin/nscd
- --with-unicode-lib="glib2"
- --disable-rpath
- --disable-static
- --sbindir=/usr/sbin
- --enable-local-provider
- $(multilib_native_use_with systemd kcm)
- $(multilib_native_use_with systemd secrets)
- $(use_with samba)
- --with-smb-idmap-interface-version=6
- $(multilib_native_use_enable acl cifs-idmap-plugin)
- $(multilib_native_use_with selinux)
- $(multilib_native_use_with selinux semanage)
- $(use_enable locator krb5-locator-plugin)
- $(use_enable pac pac-responder)
- $(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
- $(use_enable nls)
- $(multilib_native_use_with netlink libnl)
- $(multilib_native_use_with man manpages)
- $(multilib_native_use_with sudo)
- $(multilib_native_with autofs)
- $(multilib_native_with ssh)
- $(use_enable systemtap)
- $(use_enable valgrind)
- --without-python2-bindings
- $(multilib_native_use_with python python3-bindings)
- )
-
- # Annoyingly configure requires that you pick systemd XOR sysv
- if use systemd; then
- myconf+=(
- --with-initscript="systemd"
- --with-systemdunitdir=$(systemd_get_systemunitdir)
- )
- else
- myconf+=(--with-initscript="sysv")
- fi
-
- if ! multilib_is_native_abi; then
- # work-around all the libraries that are used for CLI and server
- myconf+=(
- {POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
- # ldb headers are fine since native needs it
- # ldb lib fails... but it does not seem to bother
- {DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
- {PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
- {NDR_NBT,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' '
-
- # use native include path for dbus (needed for build)
- DBUS_CFLAGS="${native_dbus_cflags}"
-
- # non-pkgconfig checks
- ac_cv_lib_ldap_ldap_search=yes
- --without-secrets
- --without-kcm
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- use doc && emake docs
- if use man || use nls; then
- emake update-po
- fi
- else
- emake libnss_sss.la pam_sss.la
- use locator && emake sssd_krb5_locator_plugin.la
- use pac && emake sssd_pac_plugin.la
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- local -x CK_TIMEOUT_MULTIPLIER=10
- emake check VERBOSE=yes
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
- if use python; then
- python_optimize
- python_fix_shebang "${ED}"
- fi
- else
- # easier than playing with automake...
- dopammod .libs/pam_sss.so
-
- into /
- dolib.so .libs/libnss_sss.so*
-
- if use locator; then
- exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
- doexe .libs/sssd_krb5_locator_plugin.so
- fi
-
- if use pac; then
- exeinto /usr/$(get_libdir)/krb5/plugins/authdata
- doexe .libs/sssd_pac_plugin.so
- fi
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
-
- insinto /etc/sssd
- insopts -m600
- doins "${S}"/src/examples/sssd-example.conf
-
- insinto /etc/logrotate.d
- insopts -m644
- newins "${S}"/src/examples/logrotate sssd
-
- newconfd "${FILESDIR}"/sssd.conf sssd
-
- keepdir /var/lib/sss/db
- keepdir /var/lib/sss/deskprofile
- keepdir /var/lib/sss/gpo_cache
- keepdir /var/lib/sss/keytabs
- keepdir /var/lib/sss/mc
- keepdir /var/lib/sss/pipes/private
- keepdir /var/lib/sss/pubconf/krb5.include.d
- keepdir /var/lib/sss/secrets
- keepdir /var/log/sssd
-
- # strip empty dirs
- if ! use doc; then
- rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
- rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap,sss_simpleifp}_doc || die
- fi
-
- rm -r "${ED}"/run || die
-}
-
-pkg_postinst() {
- elog "You must set up sssd.conf (default installed into /etc/sssd)"
- elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
- elog "features. Please see howto in https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
-}
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index f286babd9bc3..18e1c44afde4 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -2,5 +2,7 @@ AUX yubico-piv-tool-2.1.1-no-Werror.patch 453 BLAKE2B 80e024475d4c5c648154a0cb79
AUX yubico-piv-tool-2.1.1-tests-optional.patch 881 BLAKE2B 02821ac155a75a213567958d33e5f9b25838c1b1ea9dc65efda223ee397643d2d6479b5e5bd5867dfaf057d64bdebf1f1379d2187e4f9fbca1fb4fa97133d0fa SHA512 f694e2d9e882cdb04728a3fc1f857c9c5c388ed439d6efbb385fa96414c8241ce918f7a2bbbe0ac2c94fbf3b2981fc68de4c7a999822a14068c8f43bd21de43d
AUX yubico-piv-tool-2.1.1-ykcs11-threads.patch 1168 BLAKE2B ec91a73c7ad6c9ddd2e6250536b89f01d1778a79bc8df823e896323053dac8fe23c6b23a84b526da61146204df3cbc7889cae3ffc9a0414626e6ddb3b0806051 SHA512 d48787ff5de1ed5ff80fbf2f65308ea0c174500e32b55033508284aa05b0674f013479aaed5697a8f1207f821e7fdbf99cc206830725c023aa3a349fa0792172
DIST yubico-piv-tool-2.2.0.tar.gz 1309359 BLAKE2B a5be7a48549f864b9322b5bf53726007b593ce7d08cd06f2251aef98cb065d90586e0189e6f3da94d6d274d6998459afa4a55a0d4c1145395f55830f53d334e4 SHA512 b2f8cd73800e0e0778ce36148b962026479f5d3ada3e313acb5a780993c28c41b03e9aa9335ac5b79fed7a418a2d3d3697231adf2da0dd06cd8d22ea5a01aca5
-EBUILD yubico-piv-tool-2.2.0-r1.ebuild 1293 BLAKE2B 4b57db4dd0fbc08af0cd4f567bb2023539ced6da261d94b98a206f550699907db5fd5a1098c49270094f670af2a889efe064ea7ae514a00a8d291255a4f91daa SHA512 f476c29d5ccb49fad0cd9bcae78500e65683082d25613f6d2c7b5e49408936430409dac559a252118607354370932c2069b4ad931e75b93a0c1d0e0266afcd1a
+DIST yubico-piv-tool-2.2.1.tar.gz 1310253 BLAKE2B f5e5d2c351200b2fc57aafdd02a604ee5f15cd8f1a0cb552133a367da2cbf7fe248ec9eba649427b30e8322126be1f9677fd471b38db1f00cda37ccb0ac413c9 SHA512 495a269194d8d9d8957542611959b3fc8e0ae54d1cab5c041f2604590cc740e89e0956b9d595f8a06f138e92b8804def52aae797f199479a81fc1fc3d57bfb96
+EBUILD yubico-piv-tool-2.2.0-r1.ebuild 1295 BLAKE2B 88a8abc80b294cc6de0f32fe53d479f94fbf8ef5425ece37131eefce64f0ea7fc0b9ac774c19e35c0dae1f49d28a865fbe3d29c64caf193d7ad1a65eddfbf929 SHA512 fe6340a8e4417337a637faf5d642f5f8a6402663b3bdd68d266b90d848bf649c7d480171ae6ec0acfff1c22a18aeae7dee44136f0b17af936bcb175edb1d044b
+EBUILD yubico-piv-tool-2.2.1.ebuild 1296 BLAKE2B 99b2735702317ba1262a25251ed457eefe9b59085941f8ad158403f7fdbb9f404c08f05a39656101008f6514b7be61e5090ef3d10d2d9c66d91d84c28918f349 SHA512 b8a6c451722e1705c30bfa2bd6dc1a4423c8cfc6689046d32ed6569fc2e3d3a020cfd5c2c1bec5d8fa51a66ac02d6d65b812e64bcff27bbf24b518caaffd733d
MISC metadata.xml 332 BLAKE2B cab42a159a3cd0da5f66dbbd7e542f4fbae2deb966a20e7392baa575ce00b65b40db1846abb69baced17c6feb6f9e3d565620ed5476735cfaa121b0a2b81dc22 SHA512 892f4b9d170c5bd2679a1777215d7b88249bd4347c918499b762aa9ad0132b7b15d847180e4d27527d5cead6a4f8e23a7a4d3dc89752bda3852a99782129c257
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
index fd630dc72b19..426295fd7d55 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="sys-apps/pcsc-lite
- <dev-libs/openssl-3.0.0:0=[-bindist(-)]"
+ <dev-libs/openssl-2.99.99:0=[-bindist(-)]"
DEPEND="${RDEPEND}
test? ( dev-libs/check )"
BDEPEND="dev-util/gengetopt
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild
new file mode 100644
index 000000000000..8cea2321eafe
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
+HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~riscv"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/pcsc-lite
+ <dev-libs/openssl-2.99.99:0=[-bindist(-)]"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )"
+BDEPEND="dev-util/gengetopt
+ sys-apps/help2man
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.1-no-Werror.patch
+ "${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
+ "${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
+)
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+ # As of 2.2.0, man pages end up in /usr/usr/... without the MANDIR override
+ local mycmakeargs=(
+ -DBUILD_STATIC_LIB=OFF
+ -DBUILD_TESTING=$(usex test)
+ -DCMAKE_INSTALL_MANDIR="share/man"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \
+ || die "Failed to generate p11-kit module configuration"
+ insinto /usr/share/p11-kit/modules
+ doins ${PN}.module
+}