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 <s...@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 <s...@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
