Date: Wed, 1 Jan 2025 11:30:18 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 151bd9399cf8 - main - security/sssd: Remove expired port Message-ID: <202501011130.501BUI03084095@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=151bd9399cf8ecac13245fb778aa9553ec0a4907 commit 151bd9399cf8ecac13245fb778aa9553ec0a4907 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2025-01-01 11:29:56 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2025-01-01 11:29:56 +0000 security/sssd: Remove expired port 2024-12-31 security/sssd: Not supported, please use deve/sssd2 --- MOVED | 1 + security/Makefile | 1 - security/sssd/Makefile | 117 ---------- security/sssd/distinfo | 3 - security/sssd/files/bsdnss.c | 215 ----------------- security/sssd/files/patch-Makefile.am | 237 ------------------- security/sssd/files/patch-configure.ac | 43 ---- security/sssd/files/patch-src__confdb__confdb.c | 14 -- .../sssd/files/patch-src__external__inotify.m4 | 15 -- security/sssd/files/patch-src__external__krb5.m4 | 11 - security/sssd/files/patch-src__external__ldap.m4 | 22 -- .../files/patch-src__external__pac_responder.m4 | 24 -- security/sssd/files/patch-src__external__python.m4 | 11 - .../patch-src__lib__certmap__sss_certmap.exports | 10 - ...rc__lib__winbind_idmap_sss__winbind_idmap_sss.h | 11 - .../files/patch-src__providers__ad__ad_common.c | 29 --- .../files/patch-src__providers__ad__ad_gpo_ndr.c | 29 --- .../sssd/files/patch-src__providers__ad__ad_pac.h | 11 - .../files/patch-src__providers__data_provider_fo.c | 24 -- .../files/patch-src__providers__ipa__ipa_common.c | 28 --- ...c__providers__ipa__ipa_deskprofile_rules_util.c | 11 - ...ers__krb5__krb5_delayed_online_authentication.c | 18 -- .../files/patch-src__providers__ldap__ldap_auth.c | 179 -------------- .../files/patch-src__providers__ldap__ldap_child.c | 20 -- .../patch-src__providers__ldap__sdap_access.c | 39 ---- ...patch-src__providers__ldap__sdap_async_groups.c | 20 -- ...h-src__providers__ldap__sdap_async_initgroups.c | 39 ---- ...rc__providers__ldap__sdap_async_initgroups_ad.c | 20 -- ...rc__providers__ldap__sdap_async_sudo_hostinfo.c | 28 --- .../patch-src__providers__ldap__sdap_async_users.c | 46 ---- .../files/patch-src__resolv__async_resolv_utils.c | 28 --- security/sssd/files/patch-src__sbus__sbus_codegen | 8 - .../sssd/files/patch-src__sss_client__common.c | 137 ----------- .../sssd/files/patch-src__sss_client__nss_group.c | 79 ------- .../sssd/files/patch-src__sss_client__pam_sss.c | 23 -- .../files/patch-src__sss_client__sss_nss.exports | 35 --- .../files/patch-src__tests__cmocka__test_authtok.c | 10 - .../patch-src__tests__cmocka__test_negcache_2.c | 48 ---- .../files/patch-src__tests__cmocka__test_pam_srv.c | 11 - ...atch-src__tests__cwrap__test_responder_common.c | 16 -- .../files/patch-src__tests__cwrap__test_server.c | 10 - .../sssd/files/patch-src__tests__dlopen-tests.c | 20 -- ...__util__crypto__libcrypto__crypto_sha512crypt.c | 16 -- ...patch-src__util__crypto__nss__nss_sha512crypt.c | 17 -- security/sssd/files/patch-src__util__find_uid.c | 37 --- security/sssd/files/patch-src__util__nss_dl_load.c | 30 --- security/sssd/files/patch-src__util__server.c | 20 -- security/sssd/files/patch-src__util__sss_endian.h | 21 -- security/sssd/files/patch-src__util__sss_krb5.c | 10 - security/sssd/files/patch-src__util__sss_sockets.c | 45 ---- security/sssd/files/patch-src__util__util.c | 22 -- security/sssd/files/patch-src__util__util.h | 9 - security/sssd/files/pkg-message.in | 21 -- security/sssd/files/sss_bsd_errno.h | 58 ----- security/sssd/files/sssd.in | 40 ---- security/sssd/pkg-descr | 7 - security/sssd/pkg-plist | 259 --------------------- 57 files changed, 1 insertion(+), 2312 deletions(-) diff --git a/MOVED b/MOVED index 4a5285c006bb..b7a9ab52578c 100644 --- a/MOVED +++ b/MOVED @@ -3821,3 +3821,4 @@ security/gnome-ssh-askpass||2025-01-01|Has expired: Uses deprecated gtk2 library comms/concordance||2025-01-01|Has expired: Logitech Harmony were officially discontinued in 2021, last major product in 2019 lang/parrot||2025-01-01|Has expired: Development stopped in 2017 net-im/purple-plugin-pack||2025-01-01|Has expired: Uses deprecated gtk2 libraries +security/sssd|security/sssd2|2025-01-01|Has expired: Not supported, please use deve/sssd2 diff --git a/security/Makefile b/security/Makefile index fa413a4c5c0e..dd78e4da8581 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1327,7 +1327,6 @@ SUBDIR += sslproxy SUBDIR += sslscan SUBDIR += sslsplit - SUBDIR += sssd SUBDIR += sssd2 SUBDIR += ssss SUBDIR += sst diff --git a/security/sssd/Makefile b/security/sssd/Makefile deleted file mode 100644 index 8f31f40c48f0..000000000000 --- a/security/sssd/Makefile +++ /dev/null @@ -1,117 +0,0 @@ -PORTNAME= sssd -PORTVERSION= 1.16.5 -PORTREVISION= 14 -CATEGORIES= security -MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/ - -MAINTAINER= jhixson@FreeBSD.org -COMMENT= System Security Services Daemon -WWW= https://pagure.io/SSSD/sssd - -DEPRECATED= Not supported, please use deve/sssd2 -EXPIRATION_DATE= 2024-12-31 - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -LIB_DEPENDS= libpopt.so:devel/popt \ - libtalloc.so:devel/talloc \ - libtevent.so:devel/tevent \ - libtdb.so:databases/tdb \ - libldb.so:databases/ldb22 \ - libcares.so:dns/c-ares \ - libdbus-1.so:devel/dbus \ - libdhash.so:devel/ding-libs \ - libpcre.so:devel/pcre \ - libunistring.so:devel/libunistring \ - libnss3.so:security/nss \ - libsasl2.so:security/cyrus-sasl2 \ - libinotify.so:devel/libinotify \ - libplds4.so:devel/nspr -BUILD_DEPENDS= xmlcatalog:textproc/libxml2 \ - docbook-xsl>=1:textproc/docbook-xsl \ - xsltproc:textproc/libxslt \ - xmlcatmgr:textproc/xmlcatmgr \ - krb5>=1.10:security/krb5 \ - nsupdate:dns/bind-tools - -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= ac_cv_prog_PO4A=no \ - --without-selinux --without-semanage \ - --without-libnl --without-nfsv4-idmapd-plugin \ - --without-autofs --without-secrets --without-kcm \ - --without-python2-bindings --with-python-prefix=${PREFIX} \ - --with-init-dir=no \ - --disable-cifs-idmap-plugin \ - --with-unicode-lib=libunistring \ - --with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \ - --with-xml-catalog-path=${LOCALBASE}/share/xml/catalog \ - --datadir=${DATADIR} --docdir=${DOCSDIR} --localstatedir=/var \ - --with-db-path=/var/db/sss/db --with-mcache-path=/var/db/sss/mc \ - --with-pubconf-path=/var/db/sss/pubconf \ - --with-gpo-cache-path=/var/db/sss/gpo_cache \ - --with-pid-path=/var/run --with-pipe-path=/var/run/sss/pipes \ - --with-krb5-conf=/etc/krb5.conf \ - --enable-pammoddir=${PREFIX}/lib \ - --without-samba -CFLAGS+= -fstack-protector-all -PLIST_SUB= PYTHON_VER=${PYTHON_VER} -#DEBUG_FLAGS= -g -MAKE_ENV+= LINGUAS="bg de eu es fr hu id it ja nb nl pl pt ru sv tg tr uk zh_CN zh_TW" -SUB_FILES= pkg-message - -TEST_TARGET= check - -USES= autoreconf cpe gettext gmake iconv ldap libtool pathfix pkgconfig \ - python shebangfix gssapi:mit -USE_LDCONFIG= yes -INSTALL_TARGET= install-strip -CPE_VENDOR= fedoraproject - -BINARY_ALIAS= python3=python${PYTHON_VER} -SHEBANG_FILES= src/tools/sss_obfuscate \ - src/sbus/sbus_codegen - -USE_RC_SUBR= ${PORTNAME} -PORTDATA= * - -OPTIONS_DEFINE= DOCS -OPTIONS_SUB= yes - -post-patch: - @${REINPLACE_CMD} -e 's|NSS_STATUS_NOTFOUND|NS_NOTFOUND|g' \ - -e 's|NSS_STATUS_UNAVAIL|NS_UNAVAIL|g' \ - -e 's|NSS_STATUS_TRYAGAIN|NS_TRYAGAIN|g' \ - -e '/ETIME/d' \ - -e 's|NSS_STATUS_SUCCESS|NS_SUCCESS|g' \ - ${WRKSRC}/src/sss_client/common.c - @${REINPLACE_CMD} \ - -e 's|pam_modutil_getlogin(pamh)|getlogin()|g' \ - ${WRKSRC}/src/sss_client/pam_sss.c - @${REINPLACE_CMD} \ - -e 's|install-data-hook install-dist_initSCRIPTS|install-dist_initSCRIPTS|g' \ - -e 's|install-data-hook|notinstall-data-hook|g' \ - ${WRKSRC}/Makefile.am - @${REINPLACE_CMD} -e 's|/etc/sssd/|${ETCDIR}/|g' \ - -e 's|/etc/openldap/|${LOCALBASE}/etc/openldap/|g' \ - ${WRKSRC}/src/man/*xml - @${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' \ - -e 's|/var/lib/sss/pubconf/|/var/db/sss/pubconf/|g' \ - ${WRKSRC}/src/man/sss_ssh_knownhostsproxy.1.xml \ - ${WRKSRC}/src/man/*/sss_ssh_knownhostsproxy.1.xml \ - ${WRKSRC}/src/man/po/*.po - @${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}/src/sss_client/bsdnss.c - @${CP} ${FILESDIR}/sss_bsd_errno.h ${WRKSRC}/src/util/sss_bsd_errno.h - -post-install: - ${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \ - ${STAGEDIR}${ETCDIR}/sssd.conf.sample - ${LN} -sf nss_sss.so ${STAGEDIR}${PREFIX}/lib/nss_sss.so.1 - -# clean unused man dirs -.for i in es/man1 nl/man1 nl/man5 pt/man1 pt/man5 sv/man1 - @${RMDIR} ${STAGEDIR}${PREFIX}/share/man/${i} -.endfor - -.include <bsd.port.mk> diff --git a/security/sssd/distinfo b/security/sssd/distinfo deleted file mode 100644 index 49b99708187c..000000000000 --- a/security/sssd/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1587639728 -SHA256 (sssd-1.16.5.tar.gz) = 2e1a7bf036b583f686d35164f2d79bdf4857b98f51fe8b0d17aa0fa756e4d0c0 -SIZE (sssd-1.16.5.tar.gz) = 6639917 diff --git a/security/sssd/files/bsdnss.c b/security/sssd/files/bsdnss.c deleted file mode 100644 index 21484bdca1f5..000000000000 --- a/security/sssd/files/bsdnss.c +++ /dev/null @@ -1,215 +0,0 @@ -#include <errno.h> -#include <sys/param.h> -#include <netinet/in.h> -#include <pwd.h> -#include <grp.h> -#include <nss.h> -#include <netdb.h> - -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); - -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); - -NSS_METHOD_PROTOTYPE(__nss_compat_getgroupmembership); - -extern enum nss_status _nss_sss_getgrent_r(struct group *, char *, size_t, - int *); -extern enum nss_status _nss_sss_getgrnam_r(const char *, struct group *, - char *, size_t, int *); -extern enum nss_status _nss_sss_getgrgid_r(gid_t gid, struct group *, char *, - size_t, int *); -extern enum nss_status _nss_sss_setgrent(void); -extern enum nss_status _nss_sss_endgrent(void); - -extern enum nss_status _nss_sss_getpwent_r(struct passwd *, char *, size_t, - int *); -extern enum nss_status _nss_sss_getpwnam_r(const char *, struct passwd *, - char *, size_t, int *); -extern enum nss_status _nss_sss_getpwuid_r(gid_t gid, struct passwd *, char *, - size_t, int *); -extern enum nss_status _nss_sss_setpwent(void); -extern enum nss_status _nss_sss_endpwent(void); - -extern enum nss_status _nss_sss_gethostbyname_r(const char *name, - struct hostent * result, - char *buffer, size_t buflen, - int *errnop, - int *h_errnop); - -extern enum nss_status _nss_sss_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_sss_gethostbyaddr_r(struct in_addr * addr, int len, - int type, - struct hostent * result, - char *buffer, size_t buflen, - int *errnop, int *h_errnop); - -extern enum nss_status _nss_sss_getgroupmembership(const char *uname, - gid_t agroup, gid_t *groups, - int maxgrp, int *grpcnt); - -NSS_METHOD_PROTOTYPE(__nss_compat_getgroupmembership); -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); - -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_sss_getgrnam_r }, -{ NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_sss_getgrgid_r }, -{ NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_sss_getgrent_r }, -{ NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_sss_setgrent }, -{ NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_sss_endgrent }, - -{ NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_sss_getpwnam_r }, -{ NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_sss_getpwuid_r }, -{ NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, _nss_sss_getpwent_r }, -{ NSDB_PASSWD, "setpwent", __nss_compat_setpwent, _nss_sss_setpwent }, -{ NSDB_PASSWD, "endpwent", __nss_compat_endpwent, _nss_sss_endpwent }, - -{ NSDB_HOSTS, "gethostbyname", __nss_compat_gethostbyname, _nss_sss_gethostbyname_r }, -{ NSDB_HOSTS, "gethostbyaddr", __nss_compat_gethostbyaddr, _nss_sss_gethostbyaddr_r }, -{ NSDB_HOSTS, "gethostbyname2", __nss_compat_gethostbyname2, _nss_sss_gethostbyname2_r }, - -{ NSDB_GROUP_COMPAT, "getgrnam_r", __nss_compat_getgrnam_r, _nss_sss_getgrnam_r }, -{ NSDB_GROUP_COMPAT, "getgrgid_r", __nss_compat_getgrgid_r, _nss_sss_getgrgid_r }, -{ NSDB_GROUP_COMPAT, "getgrent_r", __nss_compat_getgrent_r, _nss_sss_getgrent_r }, -{ NSDB_GROUP_COMPAT, "setgrent", __nss_compat_setgrent, _nss_sss_setgrent }, -{ NSDB_GROUP_COMPAT, "endgrent", __nss_compat_endgrent, _nss_sss_endgrent }, - -{ NSDB_PASSWD_COMPAT, "getpwnam_r", __nss_compat_getpwnam_r, _nss_sss_getpwnam_r }, -{ NSDB_PASSWD_COMPAT, "getpwuid_r", __nss_compat_getpwuid_r, _nss_sss_getpwuid_r }, -{ NSDB_PASSWD_COMPAT, "getpwent_r", __nss_compat_getpwent_r, _nss_sss_getpwent_r }, -{ NSDB_PASSWD_COMPAT, "setpwent", __nss_compat_setpwent, _nss_sss_setpwent }, -{ NSDB_PASSWD_COMPAT, "endpwent", __nss_compat_endpwent, _nss_sss_endpwent }, - -{ NSDB_GROUP, "getgroupmembership", __nss_compat_getgroupmembership, _nss_sss_getgroupmembership }, - -}; - - -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_getgroupmembership(void *retval, void *mdata, va_list ap) -{ - int (*fn)(const char *, gid_t, gid_t *, int, int *); - - const char *uname; - gid_t agroup; - gid_t *groups; - int maxgrp; - int *grpcnt; - int errnop = 0; - enum nss_status status; - - fn = mdata; - uname = va_arg(ap, const char *); - agroup = va_arg(ap, gid_t); - groups = va_arg(ap, gid_t *); - maxgrp = va_arg(ap, int); - grpcnt = va_arg(ap, int *); - status = fn(uname, agroup, groups, maxgrp, grpcnt); - status = __nss_compat_result(status, errnop); - return (status); -} - -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); -} diff --git a/security/sssd/files/patch-Makefile.am b/security/sssd/files/patch-Makefile.am deleted file mode 100644 index facbd10dcd13..000000000000 --- a/security/sssd/files/patch-Makefile.am +++ /dev/null @@ -1,237 +0,0 @@ ---- Makefile.am.orig 2024-07-05 11:41:32 UTC -+++ Makefile.am -@@ -61,7 +61,7 @@ dbusservicedir = $(datadir)/dbus-1/system-services - sssdtapscriptdir = $(sssddatadir)/systemtap - dbuspolicydir = $(sysconfdir)/dbus-1/system.d - dbusservicedir = $(datadir)/dbus-1/system-services --sss_statedir = $(localstatedir)/lib/sss -+sss_statedir = $(localstatedir)/db/sss - runstatedir = @runstatedir@ - localedir = @localedir@ - nsslibdir = @nsslibdir@ -@@ -382,12 +382,6 @@ endif - libsss_ad.la - endif - --if HAVE_INOTIFY --sssdlib_LTLIBRARIES += \ -- libsss_files.la \ -- $(NULL) --endif # HAVE_INOTIFY -- - ldblib_LTLIBRARIES = \ - memberof.la - -@@ -623,6 +617,7 @@ SSSD_LIBS = \ - - SSSD_LIBS = \ - $(TALLOC_LIBS) \ -+ $(LTLIBINTL) \ - $(TEVENT_LIBS) \ - $(POPT_LIBS) \ - $(LDB_LIBS) \ -@@ -677,6 +672,7 @@ dist_noinst_HEADERS = \ - src/util/sss_ssh.h \ - src/util/sss_ini.h \ - src/util/sss_format.h \ -+ src/util/sss_bsd_errno.h \ - src/util/refcount.h \ - src/util/find_uid.h \ - src/util/user_info_msg.h \ -@@ -1372,6 +1368,7 @@ sssd_LDADD = \ - $(SSSD_LIBS) \ - $(INOTIFY_LIBS) \ - $(LIBNL_LIBS) \ -+ $(LTLIBINTL) \ - $(KEYUTILS_LIBS) \ - $(SYSTEMD_DAEMON_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) -@@ -1396,6 +1393,7 @@ sssd_nss_LDADD = \ - $(LIBADD_DL) \ - $(TDB_LIBS) \ - $(SSSD_LIBS) \ -+ $(LTLIBINTL) \ - libsss_idmap.la \ - libsss_cert.la \ - $(SYSTEMD_DAEMON_LIBS) \ -@@ -1418,6 +1416,7 @@ sssd_pam_LDADD = \ - $(LIBADD_DL) \ - $(TDB_LIBS) \ - $(SSSD_LIBS) \ -+ $(LTLIBINTL) \ - $(SELINUX_LIBS) \ - $(PAM_LIBS) \ - $(SYSTEMD_DAEMON_LIBS) \ -@@ -1436,6 +1435,8 @@ sssd_sudo_LDADD = \ - sssd_sudo_LDADD = \ - $(LIBADD_DL) \ - $(SSSD_LIBS) \ -+ $(LTLIBINTL) \ -+ $(LTLIBINTL) \ - $(SYSTEMD_DAEMON_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) - endif -@@ -1464,6 +1465,7 @@ sssd_ssh_LDADD = \ - sssd_ssh_LDADD = \ - $(LIBADD_DL) \ - $(SSSD_LIBS) \ -+ $(LTLIBINTL) \ - $(SSSD_INTERNAL_LTLIBS) \ - $(SYSTEMD_DAEMON_LIBS) \ - libsss_cert.la \ -@@ -1506,6 +1508,7 @@ sssd_ifp_LDADD = \ - sssd_ifp_LDADD = \ - $(LIBADD_DL) \ - $(SSSD_LIBS) \ -+ $(LTLIBINTL) \ - $(SYSTEMD_DAEMON_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - libsss_cert.la \ -@@ -1631,6 +1634,7 @@ sssd_be_LDADD = \ - sssd_be_LDADD = \ - $(LIBADD_DL) \ - $(SSSD_LIBS) \ -+ $(LTLIBINTL) \ - $(CARES_LIBS) \ - $(PAM_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) -@@ -1753,6 +1757,7 @@ sss_signal_LDADD = \ - src/tools/common/sss_process.c - $(NULL) - sss_signal_LDADD = \ -+ $(LTLIBINTL) \ - libsss_debug.la \ - $(NULL) - -@@ -2347,6 +2352,7 @@ test_ssh_client_LDADD = \ - test_ssh_client_LDADD = \ - $(SSSD_INTERNAL_LTLIBS) \ - $(SSSD_LIBS) \ -+ $(LTLIBINTL) \ - $(NULL) - - if BUILD_DBUS_TESTS -@@ -2657,6 +2663,7 @@ test_authtok_LDADD = \ - $(CMOCKA_LIBS) \ - $(DHASH_LIBS) \ - $(POPT_LIBS) \ -+ $(LTLIBINTL) \ - libsss_test_common.la \ - libsss_debug.la \ - $(NULL) -@@ -2692,6 +2699,7 @@ deskprofile_utils_tests_LDADD = \ - deskprofile_utils_tests_CFLAGS = \ - $(AM_CFLAGS) - deskprofile_utils_tests_LDADD = \ -+ $(LTLIBINTL) \ - $(CMOCKA_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ - libsss_test_common.la -@@ -2724,6 +2732,7 @@ domain_resolution_order_tests_LDADD = \ - $(AM_CFLAGS) - domain_resolution_order_tests_LDADD = \ - $(CMOCKA_LIBS) \ -+ $(LTLIBINTL) \ - $(SSSD_INTERNAL_LTLIBS) \ - libsss_test_common.la - -@@ -2809,6 +2818,7 @@ test_search_bases_LDADD = \ - $(CMOCKA_LIBS) \ - $(TALLOC_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ -+ $(LTLIBINTL) \ - libsss_ldap_common.la \ - libsss_test_common.la \ - libdlopen_test_providers.la \ -@@ -3619,6 +3629,7 @@ test_inotify_LDADD = \ - $(CMOCKA_LIBS) \ - $(SSSD_LIBS) \ - $(SSSD_INTERNAL_LTLIBS) \ -+ $(INOTIFY_LIBS) \ - $(LIBADD_DL) \ - libsss_test_common.la \ - $(NULL) -@@ -3711,9 +3722,6 @@ endif - if BUILD_WITH_LIBCURL - noinst_PROGRAMS += tcurl-test-tool - endif --if BUILD_PAC_RESPONDER -- noinst_PROGRAMS += sssd_pac_test_client --endif - - if BUILD_AUTOFS - autofs_test_client_SOURCES = \ -@@ -3806,9 +3814,10 @@ intgcheck: - # Client Libraries # - #################### - --nsslib_LTLIBRARIES = libnss_sss.la --libnss_sss_la_SOURCES = \ -+nsslib_LTLIBRARIES = nss_sss.la -+nss_sss_la_SOURCES = \ - src/sss_client/common.c \ -+ src/sss_client/bsdnss.c \ - src/sss_client/nss_passwd.c \ - src/sss_client/nss_group.c \ - src/sss_client/nss_netgroup.c \ -@@ -3824,9 +3833,9 @@ libnss_sss_la_SOURCES = \ - src/sss_client/nss_mc_group.c \ - src/sss_client/nss_mc_initgr.c \ - src/sss_client/nss_mc.h --libnss_sss_la_LIBADD = \ -+nss_sss_la_LIBADD = \ - $(CLIENT_LIBS) --libnss_sss_la_LDFLAGS = \ -+nss_sss_la_LDFLAGS = \ - -module \ - -version-info 2:0:0 \ - -Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports -@@ -3985,6 +3994,7 @@ libsss_ldap_common_la_LIBADD = \ - $(OPENLDAP_LIBS) \ - $(DHASH_LIBS) \ - $(KRB5_LIBS) \ -+ $(LTLIBINTL) \ - libsss_krb5_common.la \ - libsss_idmap.la \ - libsss_certmap.la \ -@@ -4353,6 +4363,7 @@ ldap_child_LDADD = \ - $(KRB5_CFLAGS) - ldap_child_LDADD = \ - libsss_debug.la \ -+ $(LTLIBINTL) \ - $(TALLOC_LIBS) \ - $(POPT_LIBS) \ - $(DHASH_LIBS) \ -@@ -4395,6 +4406,7 @@ gpo_child_LDADD = \ - $(SMBCLIENT_CFLAGS) - gpo_child_LDADD = \ - libsss_debug.la \ -+ $(LTLIBINTL) \ - $(TALLOC_LIBS) \ - $(POPT_LIBS) \ - $(DHASH_LIBS) \ -@@ -4411,6 +4423,7 @@ proxy_child_LDADD = \ - proxy_child_LDADD = \ - $(PAM_LIBS) \ - $(SSSD_LIBS) \ -+ $(LTLIBINTL) \ - $(SSSD_INTERNAL_LTLIBS) - - p11_child_SOURCES = \ -@@ -4443,6 +4456,7 @@ p11_child_LDADD = \ - - p11_child_LDADD = \ - libsss_debug.la \ -+ $(LTLIBINTL) \ - $(TALLOC_LIBS) \ - $(DHASH_LIBS) \ - $(POPT_LIBS) \ -@@ -5094,7 +5108,7 @@ endif - endif - endif - --install-data-hook: -+notnotinstall-data-hook: - rm $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2 \ - $(DESTDIR)/$(nsslibdir)/libnss_sss.so - mv $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2.0.0 $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2 diff --git a/security/sssd/files/patch-configure.ac b/security/sssd/files/patch-configure.ac deleted file mode 100644 index 4dc61dafc774..000000000000 --- a/security/sssd/files/patch-configure.ac +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.ac.orig 2020-03-17 13:31:28 UTC -+++ configure.ac -@@ -44,8 +44,6 @@ AC_CONFIG_HEADER(config.h) - AC_CHECK_HEADERS(stdint.h dlfcn.h) - AC_CONFIG_HEADER(config.h) - --AC_CHECK_TYPES([errno_t], [], [], [[#include <errno.h>]]) -- - m4_include([src/build_macros.m4]) - BUILD_WITH_SHARED_BUILD_DIR - -@@ -62,6 +60,20 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test x"$HAVE_PTHREAD" - - AM_CONDITIONAL([HAVE_PTHREAD], [test x"$HAVE_PTHREAD" != "x"]) - -+saved_CFLAGS="$CFLAGS" -+CFLAGS="-Werror" -+AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[#include <string.h>]], -+ [[(void)mempcpy(NULL, NULL, 0);]])], -+ [AC_DEFINE([HAVE_MEMPCPY], [1], [mempcpy() available]) -+ HAVE_MEMPCPY=1 -+ ], -+ [AC_MSG_WARN([mempcpy() not found, will use private implementation])]) -+ -+CFLAGS="$saved_CFLAGS" -+ -+AM_CONDITIONAL([HAVE_MEMPCPY], [test x"$HAVE_MEMPCPY" != "x"]) -+ - # Check library for the timer_create function - SAVE_LIBS=$LIBS - LIBS= -@@ -356,8 +368,8 @@ them please use argument --without-python3-bindings wh - AM_CHECK_PYTHON_HEADERS([], - AC_MSG_ERROR([Could not find python3 headers])) - -- AC_SUBST([py3execdir], [$pyexecdir]) -- AC_SUBST([python3dir], [$pythondir]) -+ AC_SUBST([py3execdir], [$(eval echo $pyexecdir)]) -+ AC_SUBST([python3dir], [$(eval echo $pythondir)]) - AC_SUBST([PYTHON3_CFLAGS], [$PYTHON_CFLAGS]) - AC_SUBST([PYTHON3_LIBS], [$PYTHON_LIBS]) - AC_SUBST([PYTHON3_INCLUDES], [$PYTHON_INCLUDES]) diff --git a/security/sssd/files/patch-src__confdb__confdb.c b/security/sssd/files/patch-src__confdb__confdb.c deleted file mode 100644 index 0db5562a301f..000000000000 --- a/security/sssd/files/patch-src__confdb__confdb.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/confdb/confdb.c.orig 2020-03-17 13:31:28 UTC -+++ src/confdb/confdb.c -@@ -28,6 +28,11 @@ - #include "util/strtonum.h" - #include "db/sysdb.h" - -+char *strchrnul(const char *s, int ch) { -+ char *ret = strchr(s, ch); -+ return ret == NULL ? discard_const_p(char, s) + strlen(s) : ret; -+} -+ - #define CONFDB_ZERO_CHECK_OR_JUMP(var, ret, err, label) do { \ - if (!var) { \ - ret = err; \ diff --git a/security/sssd/files/patch-src__external__inotify.m4 b/security/sssd/files/patch-src__external__inotify.m4 deleted file mode 100644 index 7b99442f016d..000000000000 --- a/security/sssd/files/patch-src__external__inotify.m4 +++ /dev/null @@ -1,15 +0,0 @@ ---- src/external/inotify.m4.orig 2020-03-17 13:31:28 UTC -+++ src/external/inotify.m4 -@@ -20,10 +20,10 @@ int main () { - AS_IF([test x"$inotify_works" != xyes], - [AC_CHECK_LIB([inotify], - [inotify_init], -- [INOTIFY_LIBS="$sss_extra_libdir -linotify" -+ [INOTIFY_LIBS="-L$sss_extra_libdir -linotify" - inotify_works=yes], - [inotify_works=no], -- [$sss_extra_libdir])] -+ [-L$sss_extra_libdir])] - ) - - AS_IF([test x"$inotify_works" = xyes], diff --git a/security/sssd/files/patch-src__external__krb5.m4 b/security/sssd/files/patch-src__external__krb5.m4 deleted file mode 100644 index a7d0d6c58b3b..000000000000 --- a/security/sssd/files/patch-src__external__krb5.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/external/krb5.m4.orig 2020-03-17 13:31:28 UTC -+++ src/external/krb5.m4 -@@ -9,7 +9,7 @@ fi - KRB5_PASSED_CFLAGS=$KRB5_CFLAGS - fi - --AC_PATH_TOOL(KRB5_CONFIG, krb5-config) -+AC_PATH_TOOL(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH]) - AC_MSG_CHECKING(for working krb5-config) - if test -x "$KRB5_CONFIG"; then - KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" diff --git a/security/sssd/files/patch-src__external__ldap.m4 b/security/sssd/files/patch-src__external__ldap.m4 deleted file mode 100644 index 8939c02bdeeb..000000000000 --- a/security/sssd/files/patch-src__external__ldap.m4 +++ /dev/null @@ -1,22 +0,0 @@ ---- src/external/ldap.m4.orig 2020-03-17 13:31:28 UTC -+++ src/external/ldap.m4 -@@ -32,8 +32,7 @@ test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, lda - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) } - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) } - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) } --CFLAGS=$SAVE_CFLAGS --LIBS=$SAVE_LIBS -+ - dnl Recently, we need -lber even though the main routines are elsewhere, - dnl because otherwise we get link errors w.r.t. ber_pvt_opt_on. So just - dnl check for that (it's a variable not a fun but that doesn't seem to -@@ -41,6 +40,9 @@ test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber - dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who - dnl #### understands LDAP needs to fix this properly. - test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) } -+ -+CFLAGS=$SAVE_CFLAGS -+LIBS=$SAVE_LIBS - - if test "$with_ldap" = "yes"; then - if test "$with_ldap_des" = "yes" ; then diff --git a/security/sssd/files/patch-src__external__pac_responder.m4 b/security/sssd/files/patch-src__external__pac_responder.m4 deleted file mode 100644 index 94dfde4f335c..000000000000 --- a/security/sssd/files/patch-src__external__pac_responder.m4 +++ /dev/null @@ -1,24 +0,0 @@ ---- src/external/pac_responder.m4.orig 2020-03-17 13:31:28 UTC -+++ src/external/pac_responder.m4 -@@ -7,7 +7,7 @@ AC_ARG_ENABLE([pac-responder], - krb5_version_ok=no - if test x$build_pac_responder = xyes - then -- AC_PATH_PROG(KRB5_CONFIG, krb5-config) -+ AC_PATH_TOOL(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH]) - AC_MSG_CHECKING(for supported MIT krb5 version) - KRB5_VERSION="`$KRB5_CONFIG --version`" - case $KRB5_VERSION in -@@ -19,7 +19,11 @@ then - Kerberos\ 5\ release\ 1.14* | \ - Kerberos\ 5\ release\ 1.15* | \ - Kerberos\ 5\ release\ 1.16* | \ -- Kerberos\ 5\ release\ 1.17*) -+ Kerberos\ 5\ release\ 1.17* | \ -+ Kerberos\ 5\ release\ 1.18* | \ -+ Kerberos\ 5\ release\ 1.19* | \ -+ Kerberos\ 5\ release\ 1.20* | \ -+ Kerberos\ 5\ release\ 1.21*) - krb5_version_ok=yes - AC_MSG_RESULT([yes]) - ;; diff --git a/security/sssd/files/patch-src__external__python.m4 b/security/sssd/files/patch-src__external__python.m4 deleted file mode 100644 index 12987976c2fb..000000000000 --- a/security/sssd/files/patch-src__external__python.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/external/python.m4.orig 2020-03-17 13:31:28 UTC -+++ src/external/python.m4 -@@ -36,7 +36,7 @@ --without-$1-bindings when running configure.])) - if test $? -eq 0; then - PYTHON_DLOPEN_LIB="` $PYTHON_CONFIG --libs --embed | grep -o -- '-lpython@<:@^ @:>@*' |sed -e 's/^-l/lib/'`" - if test x"$PYTHON_DLOPEN_LIB" != x; then -- python_lib_path="` $PYTHON_CONFIG --ldflags | grep -o -- '-L/@<:@^ @:>@*' | sed -e 's/^-L//'`" -+ python_lib_path="` $PYTHON_CONFIG --ldflags | sed -n 's/.*-L\(@<:@^ @:>@*\).*/\1/p'`" - if test x"$python_lib_path" != x; then - PYTHON_DLOPEN_LIB=$python_lib_path"/"$PYTHON_DLOPEN_LIB - fi diff --git a/security/sssd/files/patch-src__lib__certmap__sss_certmap.exports b/security/sssd/files/patch-src__lib__certmap__sss_certmap.exports deleted file mode 100644 index df8fac78ac91..000000000000 --- a/security/sssd/files/patch-src__lib__certmap__sss_certmap.exports +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/certmap/sss_certmap.exports.orig 2024-01-12 12:05:40 UTC -+++ src/lib/certmap/sss_certmap.exports -@@ -2,7 +2,6 @@ SSS_CERTMAP_0.0 { - global: - sss_certmap_init; - sss_certmap_free_ctx; -- sss_certmap_err_msg; - sss_certmap_add_rule; - sss_certmap_match_cert; - sss_certmap_get_search_filter; diff --git a/security/sssd/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.h b/security/sssd/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.h deleted file mode 100644 index 272d51672ba8..000000000000 --- a/security/sssd/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/winbind_idmap_sss/winbind_idmap_sss.h.orig 2020-03-17 13:31:28 UTC -+++ src/lib/winbind_idmap_sss/winbind_idmap_sss.h -@@ -29,6 +29,8 @@ - #include <stdbool.h> - - #include <core/ntstatus.h> -+#include <unistd.h> -+#include <time.h> - #include <ndr.h> - #include <gen_ndr/security.h> - diff --git a/security/sssd/files/patch-src__providers__ad__ad_common.c b/security/sssd/files/patch-src__providers__ad__ad_common.c deleted file mode 100644 index abf17a992994..000000000000 --- a/security/sssd/files/patch-src__providers__ad__ad_common.c +++ /dev/null @@ -1,29 +0,0 @@ ---- src/providers/ad/ad_common.c.orig 2020-03-17 13:31:28 UTC -+++ src/providers/ad/ad_common.c -@@ -420,7 +420,7 @@ ad_get_common_options(TALLOC_CTX *mem_ctx, - char *server; - char *realm; - char *ad_hostname; -- char hostname[HOST_NAME_MAX + 1]; -+ char hostname[_POSIX_HOST_NAME_MAX + 1]; - char *case_sensitive_opt; - const char *opt_override; - -@@ -459,7 +459,7 @@ ad_get_common_options(TALLOC_CTX *mem_ctx, - */ - ad_hostname = dp_opt_get_string(opts->basic, AD_HOSTNAME); - if (ad_hostname == NULL) { -- gret = gethostname(hostname, sizeof(hostname)); -+ gret = gethostname(hostname, _POSIX_HOST_NAME_MAX); - if (gret != 0) { - ret = errno; - DEBUG(SSSDBG_FATAL_FAILURE, -@@ -467,7 +467,7 @@ ad_get_common_options(TALLOC_CTX *mem_ctx, - strerror(ret)); - goto done; - } -- hostname[HOST_NAME_MAX] = '\0'; -+ hostname[_POSIX_HOST_NAME_MAX] = '\0'; - DEBUG(SSSDBG_CONF_SETTINGS, - "Setting ad_hostname to [%s].\n", hostname); - ret = dp_opt_set_string(opts->basic, AD_HOSTNAME, hostname); diff --git a/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c b/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c deleted file mode 100644 index 33f2aaafc884..000000000000 --- a/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c +++ /dev/null @@ -1,29 +0,0 @@ ---- src/providers/ad/ad_gpo_ndr.c.orig 2020-03-17 13:31:28 UTC -+++ src/providers/ad/ad_gpo_ndr.c -@@ -105,7 +105,7 @@ ndr_pull_security_ace_object_type(struct ndr_pull *ndr - union security_ace_object_type *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); -+ level = ndr_token_peek(&ndr->switch_list, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_union_align(ndr, 4)); -@@ -135,7 +135,7 @@ ndr_pull_security_ace_object_inherited_type(struct ndr - union security_ace_object_inherited_type *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); -+ level = ndr_token_peek(&ndr->switch_list, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_union_align(ndr, 4)); -@@ -198,7 +198,7 @@ ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, - union security_ace_object_ctr *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); -+ level = ndr_token_peek(&ndr->switch_list, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_union_align(ndr, 4)); diff --git a/security/sssd/files/patch-src__providers__ad__ad_pac.h b/security/sssd/files/patch-src__providers__ad__ad_pac.h deleted file mode 100644 index 038a52963d46..000000000000 --- a/security/sssd/files/patch-src__providers__ad__ad_pac.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/providers/ad/ad_pac.h.orig 2020-03-17 13:31:28 UTC -+++ src/providers/ad/ad_pac.h -@@ -32,6 +32,8 @@ - #ifdef ldb_val - #error Please make sure to include ad_pac.h before ldb.h *** 1749 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501011130.501BUI03084095>