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 6AD92158087 for ; Thu, 3 Feb 2022 08:47:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFC50E069C; Thu, 3 Feb 2022 08:47:03 +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 94294E069C for ; Thu, 3 Feb 2022 08:47:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id A328C342E94 for ; Thu, 3 Feb 2022 08:47:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15E49268 for ; Thu, 3 Feb 2022 08:47:01 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1643878012.bfd01260a3fbdeb541d67a6c8ab6f1d7df23e456.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/, sys-libs/pam/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/pam/files/pam-1.5.1-musl.patch sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild sys-libs/pam/pam-1.5.2-r1.ebuild X-VCS-Directories: sys-libs/pam/ sys-libs/pam/files/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: bfd01260a3fbdeb541d67a6c8ab6f1d7df23e456 X-VCS-Branch: master Date: Thu, 3 Feb 2022 08:47:01 +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: 35f91a92-4a12-42f4-b1f6-bf114b8311ab X-Archives-Hash: 7a52cb19616712c54425f1d2239e1181 commit: bfd01260a3fbdeb541d67a6c8ab6f1d7df23e456 Author: Jakov Smolić gentoo org> AuthorDate: Thu Feb 3 08:45:20 2022 +0000 Commit: Jakov Smolić gentoo org> CommitDate: Thu Feb 3 08:46:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd01260 sys-libs/pam: Fix build on musl Closes: https://bugs.gentoo.org/832573 Co-authored-by: Sam James gentoo.org> Signed-off-by: Jakov Smolić gentoo.org> sys-libs/pam/files/pam-1.5.1-musl.patch | 15 +++++++++++++++ sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild | 6 +++++- sys-libs/pam/pam-1.5.2-r1.ebuild | 6 +++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/sys-libs/pam/files/pam-1.5.1-musl.patch b/sys-libs/pam/files/pam-1.5.1-musl.patch new file mode 100644 index 000000000000..a1d5b1543daf --- /dev/null +++ b/sys-libs/pam/files/pam-1.5.1-musl.patch @@ -0,0 +1,15 @@ +Fix undefined reference to `libintl_dgettext` on musl +Bug: https://bugs.gentoo.org/832573 +Upstream: https://github.com/linux-pam/linux-pam/pull/433 + +--- a/libpam/Makefile.am ++++ b/libpam/Makefile.am +@@ -21,7 +21,7 @@ noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \ + include/pam_inline.h include/test_assert.h + + libpam_la_LDFLAGS = -no-undefined -version-info 85:1:85 +-libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) $(ECONF_LIBS) @LIBDL@ ++libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) $(ECONF_LIBS) @LIBDL@ @LTLIBINTL@ + + if HAVE_VERSIONING + libpam_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpam.map diff --git a/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild b/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild index bbc95832d99a..98f33edbb60a 100644 --- a/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild +++ b/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -46,6 +46,10 @@ PDEPEND=">=sys-auth/pambase-20200616" S="${WORKDIR}/linux-${PN}-${GIT_COMMIT}" +PATCHES=( + "${FILESDIR}"/${PN}-1.5.1-musl.patch +) + src_prepare() { default touch ChangeLog || die diff --git a/sys-libs/pam/pam-1.5.2-r1.ebuild b/sys-libs/pam/pam-1.5.2-r1.ebuild index 77719a8fded9..41f8b3081e5a 100644 --- a/sys-libs/pam/pam-1.5.2-r1.ebuild +++ b/sys-libs/pam/pam-1.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,10 @@ PDEPEND=">=sys-auth/pambase-20200616" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-1.5.1-musl.patch +) + src_prepare() { default touch ChangeLog || die