From nobody Mon Feb 12 03:41:26 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TY9HC0czkz59M4w; Mon, 12 Feb 2024 03:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TY9HC099Yz4yvH; Mon, 12 Feb 2024 03:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707709287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RZ+WLZPlqUYdJr4de8aHV7cqLIMNlQUV2rrbh6j7Xgc=; b=ql6kVIME7p/rGFyytLD/hoX0YQveWtkmvZ858GRKdBd69xl61IceNPYFOJuD6Sv/RDP6A7 6BCd007cHYH4DM9X2Re/ldwJ/DNnNufuVhjq0uJxAK/lVMegW9ySTMaG3i0DtYs21hAkZY Rrbum5HdjiORA/y6YY44wtCDbLYB/X1s6/enyUCq4ri9c7dZjjRhdCL84DmLQs30Onfc4m RSXVv/Suc4NKBGVGyGccvTDOCmOxOzJDRnUgpBktfQ5DWyvozKT3z6banJWPumqmHymMLt llcSQXNWmtm7iQiPbEvgkF0FqR1NVdz8VAppjjRHb33hiP2ssDC+LjMDbnLxIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707709287; a=rsa-sha256; cv=none; b=ul/XPTCBUgotJMt3qHzgboJDUOiLaXvi7gvo90uTa74b/enQAEU5/Dk+IpAPm4MgvuiacK bdWA5nZOwQN2BeGlruc+R+m9B0HNvFSOoY7bSkaiJki5ukGlMcWET3bMscXC6pIIM2SpMk iCssphOFYSH6/JHGoXDC3kf7hA4aYPA5WDlA0f0nOn4zfPS9iV49DheL53RKGRdI74Jl3C In9aDCewNkYh2PnNnW/NBbbBbbhsMfOtwAGH6p5lrcGzw8byHRK+ANAuGvN0+duhB+S6KP F5+9S29DaUnjIripdXyJu/uQnR+YupTk5nk+o9FQGo9b3B1R0X09ALSg7gH3JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707709287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RZ+WLZPlqUYdJr4de8aHV7cqLIMNlQUV2rrbh6j7Xgc=; b=ZN7V5GgovxMxCuOuFuH/4B9R/j2LENld3XRzkIVEfGl3q03wdM/XFMKmfKZg0xZB/TMAJU 2JKoo/wH+EzoJW4oB3uvORtGUBQ2RE/ODVkDWUXfwxpqPkDA9SbqDOTuUEBczsScx5NIq6 nCZV9TpBOtBCNzN2h/LJ7Z+ejRA+lh+yNQWHnUNfGlj9MJ2WLpuDMcCcjyIpSJARaWvwfS vtreXvtdSmmVExv6f8zSYXLAk0ZBolXg/5fJFxVHIhlgCrZaPEJy2Uz4tg98wg63nvy/uQ MLi1D2NEY2yIBLxbrkij0isBiwJjFoc7o5cZn/VkahhvddOJbjvGs6kzs82N5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TY9HB6Lpxz1QDs; Mon, 12 Feb 2024 03:41:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41C3fQpx093924; Mon, 12 Feb 2024 03:41:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41C3fQmk093921; Mon, 12 Feb 2024 03:41:26 GMT (envelope-from git) Date: Mon, 12 Feb 2024 03:41:26 GMT Message-Id: <202402120341.41C3fQmk093921@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Hixson Subject: git: 28f442a86592 - main - security/sssd2: fix building on current List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhixson X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28f442a8659202f130ae0e4fa05b08d40e2b9734 Auto-Submitted: auto-generated The branch main has been updated by jhixson: URL: https://cgit.FreeBSD.org/ports/commit/?id=28f442a8659202f130ae0e4fa05b08d40e2b9734 commit 28f442a8659202f130ae0e4fa05b08d40e2b9734 Author: John Hixson AuthorDate: 2024-02-12 03:23:00 +0000 Commit: John Hixson CommitDate: 2024-02-12 03:41:16 +0000 security/sssd2: fix building on current --- security/sssd2/Makefile | 3 +- security/sssd2/files/bsdnss.c | 44 +++++++++++----------- .../patch-src__lib__certmap__sss_certmap.exports | 10 +++++ .../files/patch-src__sss_client__sss_nss.exports | 28 +++++++------- 4 files changed, 48 insertions(+), 37 deletions(-) diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile index c08fc5aad78d..825b1290b5ee 100644 --- a/security/sssd2/Makefile +++ b/security/sssd2/Makefile @@ -1,6 +1,6 @@ PORTNAME= sssd PORTVERSION= 2.9.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security PKGNAMESUFFIX= -devel @@ -11,7 +11,6 @@ WWW= https://sssd.io/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_15= fails to compile: linker fails to resolve nss symbols CONFLICTS_INSTALL?= sssd* BUILD_DEPENDS= bash:shells/bash \ diff --git a/security/sssd2/files/bsdnss.c b/security/sssd2/files/bsdnss.c index 6a1152100c67..ee0592d3aea9 100644 --- a/security/sssd2/files/bsdnss.c +++ b/security/sssd2/files/bsdnss.c @@ -6,6 +6,24 @@ #include #include +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 *, @@ -45,28 +63,10 @@ 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, "getgroupmembership", __nss_compat_getgroupmembership, _nss_sss_getgroupmembership }, { NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_sss_setgrent }, { NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_sss_endgrent }, @@ -76,9 +76,9 @@ static ns_mtab methods[] = { { 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_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 }, @@ -92,6 +92,8 @@ static ns_mtab methods[] = { { 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 }, + }; diff --git a/security/sssd2/files/patch-src__lib__certmap__sss_certmap.exports b/security/sssd2/files/patch-src__lib__certmap__sss_certmap.exports new file mode 100644 index 000000000000..df8fac78ac91 --- /dev/null +++ b/security/sssd2/files/patch-src__lib__certmap__sss_certmap.exports @@ -0,0 +1,10 @@ +--- 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/sssd2/files/patch-src__sss_client__sss_nss.exports b/security/sssd2/files/patch-src__sss_client__sss_nss.exports index 29f97f8540b4..8fadc74c9bd0 100644 --- a/security/sssd2/files/patch-src__sss_client__sss_nss.exports +++ b/security/sssd2/files/patch-src__sss_client__sss_nss.exports @@ -1,4 +1,4 @@ ---- src/sss_client/sss_nss.exports.orig 2023-06-05 03:42:12 UTC +--- src/sss_client/sss_nss.exports.orig 2024-01-12 12:05:40 UTC +++ src/sss_client/sss_nss.exports @@ -3,6 +3,7 @@ EXPORTED { # public functions @@ -15,21 +15,21 @@ + _nss_sss_getgroupmembership; _nss_sss_initgroups_dyn; + -+ __nss_compat_getgrnam_r; -+ __nss_compat_getgrgid_r; -+ __nss_compat_getgrent_r; -+ __nss_compat_setgrent; -+ __nss_compat_endgrent; ++ #__nss_compat_getgrnam_r; ++ #__nss_compat_getgrgid_r; ++ #__nss_compat_getgrent_r; ++ #__nss_compat_setgrent; ++ #__nss_compat_endgrent; + -+ __nss_compat_getpwnam_r; -+ __nss_compat_getpwuid_r; -+ __nss_compat_getpwent_r; -+ __nss_compat_setpwent; -+ __nss_compat_endpwent; ++ #__nss_compat_getpwnam_r; ++ #__nss_compat_getpwuid_r; ++ #__nss_compat_getpwent_r; ++ #__nss_compat_setpwent; ++ #__nss_compat_endpwent; + -+ __nss_compat_gethostbyname; -+ __nss_compat_gethostbyname2; -+ __nss_compat_gethostbyaddr; ++ #__nss_compat_gethostbyname; ++ #__nss_compat_gethostbyname2; ++ #__nss_compat_gethostbyaddr; #_nss_sss_getaliasbyname_r; #_nss_sss_setaliasent;