diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
| commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
| tree | b9791a06ab3284e27b568412c59316c66240c682 /sys-apps/shadow/files | |
| parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) | |
gentoo resync : 22.12.2021
Diffstat (limited to 'sys-apps/shadow/files')
| -rw-r--r-- | sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch | 38 |
1 files changed, 38 insertions, 0 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..e2f8ddf466d9 --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch @@ -0,0 +1,38 @@ +https://github.com/shadow-maint/shadow/pull/463 + +From: Sam James <sam@gentoo.org> +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 +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 <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 @@ + 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 + |