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 48BA6158086 for ; Mon, 20 Dec 2021 01:27:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A56A2BC014; Mon, 20 Dec 2021 01:27:34 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CC432BC014 for ; Mon, 20 Dec 2021 01:27:33 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3360343030 for ; Mon, 20 Dec 2021 01:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0569D1F4 for ; Mon, 20 Dec 2021 01:27:31 +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: <1639963642.ca1bb8531416b974b09efde5028ea46829e3c2c0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/shadow/files/, sys-apps/shadow/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch sys-apps/shadow/metadata.xml sys-apps/shadow/shadow-4.10-r1.ebuild sys-apps/shadow/shadow-4.10-r2.ebuild X-VCS-Directories: sys-apps/shadow/ sys-apps/shadow/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ca1bb8531416b974b09efde5028ea46829e3c2c0 X-VCS-Branch: master Date: Mon, 20 Dec 2021 01:27:31 +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: 760a2be1-c02d-43f2-b73d-0970640ace7b X-Archives-Hash: 70c2e0dd04d98ce45bc7f38200d721ab commit: ca1bb8531416b974b09efde5028ea46829e3c2c0 Author: Sam James gentoo org> AuthorDate: Mon Dec 20 01:27:07 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 20 01:27:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca1bb853 sys-apps/shadow: fix libsubid SONAME, add subslot for libsubid Signed-off-by: Sam James gentoo.org> .../shadow/files/shadow-4.10-libsubid-soname.patch | 27 ++++++++++++++++++++++ sys-apps/shadow/metadata.xml | 4 +++- ...shadow-4.10-r1.ebuild => shadow-4.10-r2.ebuild} | 9 +++++--- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch b/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch new file mode 100644 index 000000000000..dffffb9c917b --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch @@ -0,0 +1,27 @@ +https://github.com/shadow-maint/shadow/pull/463 + +From: Sam James +Date: Mon, 20 Dec 2021 01:24:16 +0000 +Subject: [PATCH] libsubid: fix defining SONAME version + +We were overriding this when --enable-shared was passed. We can actually +just dump the conditional logic as libtool will do the right thing for +us here anyway. + +Without this patch, libsubid is installed as .0. + +Signed-off-by: Sam James +--- a/libsubid/Makefile.am ++++ b/libsubid/Makefile.am +@@ -1,10 +1,6 @@ + lib_LTLIBRARIES = libsubid.la +-if ENABLE_SHARED +-libsubid_la_LDFLAGS = -Wl,-soname,libsubid.so.@LIBSUBID_ABI@ \ +- -shared -version-info @LIBSUBID_ABI_MAJOR@ +-endif + libsubid_la_SOURCES = api.c +-libsubid_la_LDFLAGS = -export-symbols-regex '^subid_' ++libsubid_la_LDFLAGS = -version-info @LIBSUBID_ABI_MAJOR@ -export-symbols-regex '^subid_' + + pkginclude_HEADERS = subid.h + diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml index 980dcbed0ddb..9c7dcc5444cf 100644 --- a/sys-apps/shadow/metadata.xml +++ b/sys-apps/shadow/metadata.xml @@ -9,7 +9,9 @@ build the bcrypt password encryption algorithm build the su program - + + Reflect ABI of libsubids.so + cpe:/a:debian:shadow shadow-maint/shadow diff --git a/sys-apps/shadow/shadow-4.10-r1.ebuild b/sys-apps/shadow/shadow-4.10-r2.ebuild similarity index 97% rename from sys-apps/shadow/shadow-4.10-r1.ebuild rename to sys-apps/shadow/shadow-4.10-r2.ebuild index a213030fec37..888a5dd2db52 100644 --- a/sys-apps/shadow/shadow-4.10-r1.ebuild +++ b/sys-apps/shadow/shadow-4.10-r2.ebuild @@ -3,14 +3,15 @@ EAPI=7 -inherit libtool pam +inherit autotools pam DESCRIPTION="Utilities to deal with user accounts" HOMEPAGE="https://github.com/shadow-maint/shadow" SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz" LICENSE="BSD GPL-2" -SLOT="0" +# Subslot is for libsubid's SONAME. +SLOT="0/4" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr" # Taken from the man/Makefile.am file. @@ -54,12 +55,14 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch" + "${FILESDIR}/${PN}-4.10-libsubid-soname.patch" ) src_prepare() { default - elibtoolize + eautoreconf + #elibtoolize } src_configure() {