From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1351191-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5580C158086
for <garchives@archives.gentoo.org>; Mon, 20 Dec 2021 01:41:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2B7F42BC014;
Mon, 20 Dec 2021 01:41:05 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 E20B12BC014
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Dec 2021 01:41:03 +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 B04FE34314A
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Dec 2021 01:41:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3ECE91F4
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Dec 2021 01:41:00 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1639964451.019a7e4cea7b1a827ea4e1b5ef64dc528173d324.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/shadow-4.10-r2.ebuild
X-VCS-Directories: sys-apps/shadow/files/ sys-apps/shadow/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 019a7e4cea7b1a827ea4e1b5ef64dc528173d324
X-VCS-Branch: master
Date: Mon, 20 Dec 2021 01:41:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 60738bcf-431e-4172-9f9d-03b185dc9120
X-Archives-Hash: f0c1ae9ef60f74a354a8e62ee44df0fa
commit: 019a7e4cea7b1a827ea4e1b5ef64dc528173d324
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 01:40:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 01:40:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019a7e4c
sys-apps/shadow: update libsubid patch to match upstream-submitted version
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch | 13 ++++++++++++-
sys-apps/shadow/shadow-4.10-r2.ebuild | 1 -
2 files changed, 12 insertions(+), 2 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
index dffffb9c917b..e2f8ddf466d9 100644
--- a/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch
+++ b/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch
@@ -1,7 +1,7 @@
https://github.com/shadow-maint/shadow/pull/463
From: Sam James <sam@gentoo.org>
-Date: Mon, 20 Dec 2021 01:24:16 +0000
+Date: Mon, 20 Dec 2021 01:37:23 +0000
Subject: [PATCH] libsubid: fix defining SONAME version
We were overriding this when --enable-shared was passed. We can actually
@@ -11,6 +11,17 @@ us here anyway.
Without this patch, libsubid is installed as .0.
Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -321,8 +321,6 @@ if test "$with_sha_crypt" = "yes"; then
+ AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
+ fi
+
+-AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes")
+-
+ AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes")
+ if test "$with_bcrypt" = "yes"; then
+ AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm])
--- a/libsubid/Makefile.am
+++ b/libsubid/Makefile.am
@@ -1,10 +1,6 @@
diff --git a/sys-apps/shadow/shadow-4.10-r2.ebuild b/sys-apps/shadow/shadow-4.10-r2.ebuild
index 888a5dd2db52..6f651117a693 100644
--- a/sys-apps/shadow/shadow-4.10-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.10-r2.ebuild
@@ -68,7 +68,6 @@ src_prepare() {
src_configure() {
local myeconfargs=(
--disable-account-tools-setuid
- --enable-shared
--disable-static
--with-btrfs
--without-group-name-max-length