From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBA7A158094 for ; Mon, 18 Jul 2022 00:26:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF78FE0DA6; Mon, 18 Jul 2022 00:26:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F064E0DA7 for ; Mon, 18 Jul 2022 00:26:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D4AE340CC9 for ; Mon, 18 Jul 2022 00:26:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2091543 for ; Mon, 18 Jul 2022 00:26:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1658103971.d68dbb343ba94e145423987a1d5d8e1869e27736.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/files/, net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch net-fs/samba/samba-4.16.2.ebuild X-VCS-Directories: net-fs/samba/ net-fs/samba/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d68dbb343ba94e145423987a1d5d8e1869e27736 X-VCS-Branch: master Date: Mon, 18 Jul 2022 00:26:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3104e257-af88-461d-9c9e-e6f50ad0e74e X-Archives-Hash: 98735f8048b2400548f4adbbd119309d commit: d68dbb343ba94e145423987a1d5d8e1869e27736 Author: brahmajit das gmail com> AuthorDate: Wed Jun 29 18:36:50 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jul 18 00:26:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68dbb34 net-fs/samba: Fix undefined innetgr on musl Currently samba fails to build on musl with error message saying undefined reference to `innetgr'. This patch fixes that issue. Closes: https://bugs.gentoo.org/855047 Signed-off-by: brahmajit das gmail.com> Closes: https://github.com/gentoo/gentoo/pull/26151 Signed-off-by: Sam James gentoo.org> .../samba-4.16.2-fix-musl-without-innetgr.patch | 23 ++++++++++++++++++++++ net-fs/samba/samba-4.16.2.ebuild | 1 + 2 files changed, 24 insertions(+) diff --git a/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch b/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch new file mode 100644 index 000000000000..c0b1746fc31a --- /dev/null +++ b/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch @@ -0,0 +1,23 @@ +# Gentoo bug 855047 +--- a/lib/util/access.c ++++ b/lib/util/access.c +@@ -115,7 +115,7 @@ static bool string_match(const char *tok,const char *s) + return true; + } + } else if (tok[0] == '@') { /* netgroup: look it up */ +-#ifdef HAVE_NETGROUP ++#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) + DATA_BLOB tmp; + char *mydomain = NULL; + char *hostname = NULL; +--- a/source3/auth/user_util.c ++++ b/source3/auth/user_util.c +@@ -135,7 +135,7 @@ static void store_map_in_gencache(TALLOC_CTX *ctx, const char *from, const char + + bool user_in_netgroup(TALLOC_CTX *ctx, const char *user, const char *ngname) + { +-#ifdef HAVE_NETGROUP ++#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) + char nis_domain_buf[256]; + const char *nis_domain = NULL; + char *lowercase_user = NULL; diff --git a/net-fs/samba/samba-4.16.2.ebuild b/net-fs/samba/samba-4.16.2.ebuild index 090a59c32be1..e5115c4e9c41 100644 --- a/net-fs/samba/samba-4.16.2.ebuild +++ b/net-fs/samba/samba-4.16.2.ebuild @@ -142,6 +142,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" + "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"