| 1 |
commit: f10efb4adc6e0266f0c0b1995c0ff01aa8e9cf28 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 5 17:34:01 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 02:35:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10efb4a |
| 7 |
|
| 8 |
sys-libs/glibc: preserve libcrypt.so.1 as an orphan |
| 9 |
|
| 10 |
This should help users who have FEATURES="-preserve-libs protect-owned". |
| 11 |
|
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
Bug: https://bugs.gentoo.org/809410 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/22833 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-libs/glibc/glibc-2.33-r7.ebuild | 5 +++-- |
| 18 |
sys-libs/glibc/glibc-2.34.ebuild | 5 +++-- |
| 19 |
sys-libs/glibc/glibc-9999.ebuild | 5 +++-- |
| 20 |
3 files changed, 9 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-libs/glibc/glibc-2.33-r7.ebuild b/sys-libs/glibc/glibc-2.33-r7.ebuild |
| 23 |
index 1f78af9e694..cb9826d7be2 100644 |
| 24 |
--- a/sys-libs/glibc/glibc-2.33-r7.ebuild |
| 25 |
+++ b/sys-libs/glibc/glibc-2.33-r7.ebuild |
| 26 |
@@ -1503,9 +1503,9 @@ pkg_preinst() { |
| 27 |
# Keep around libcrypt so that Perl doesn't break when merging libxcrypt |
| 28 |
# (libxcrypt is the new provider for now of libcrypt.so.{1,2}). |
| 29 |
# bug #802207 |
| 30 |
- if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then |
| 31 |
+ if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then |
| 32 |
PRESERVED_OLD_LIBCRYPT=1 |
| 33 |
- preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) |
| 34 |
+ cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die |
| 35 |
else |
| 36 |
PRESERVED_OLD_LIBCRYPT=0 |
| 37 |
fi |
| 38 |
@@ -1540,6 +1540,7 @@ pkg_postinst() { |
| 39 |
fi |
| 40 |
|
| 41 |
if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then |
| 42 |
+ cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die |
| 43 |
preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) |
| 44 |
|
| 45 |
elog "Please ignore a possible later error message about a file collision involving" |
| 46 |
|
| 47 |
diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild |
| 48 |
index e98c13cc390..a553af44216 100644 |
| 49 |
--- a/sys-libs/glibc/glibc-2.34.ebuild |
| 50 |
+++ b/sys-libs/glibc/glibc-2.34.ebuild |
| 51 |
@@ -1516,9 +1516,9 @@ pkg_preinst() { |
| 52 |
# Keep around libcrypt so that Perl doesn't break when merging libxcrypt |
| 53 |
# (libxcrypt is the new provider for now of libcrypt.so.{1,2}). |
| 54 |
# bug #802207 |
| 55 |
- if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then |
| 56 |
+ if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then |
| 57 |
PRESERVED_OLD_LIBCRYPT=1 |
| 58 |
- preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) |
| 59 |
+ cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die |
| 60 |
else |
| 61 |
PRESERVED_OLD_LIBCRYPT=0 |
| 62 |
fi |
| 63 |
@@ -1553,6 +1553,7 @@ pkg_postinst() { |
| 64 |
fi |
| 65 |
|
| 66 |
if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then |
| 67 |
+ cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die |
| 68 |
preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) |
| 69 |
|
| 70 |
elog "Please ignore a possible later error message about a file collision involving" |
| 71 |
|
| 72 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 73 |
index c1752e4d398..b08e07445f5 100644 |
| 74 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 75 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 76 |
@@ -1516,9 +1516,9 @@ pkg_preinst() { |
| 77 |
# Keep around libcrypt so that Perl doesn't break when merging libxcrypt |
| 78 |
# (libxcrypt is the new provider for now of libcrypt.so.{1,2}). |
| 79 |
# bug #802207 |
| 80 |
- if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then |
| 81 |
+ if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then |
| 82 |
PRESERVED_OLD_LIBCRYPT=1 |
| 83 |
- preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) |
| 84 |
+ cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die |
| 85 |
else |
| 86 |
PRESERVED_OLD_LIBCRYPT=0 |
| 87 |
fi |
| 88 |
@@ -1553,6 +1553,7 @@ pkg_postinst() { |
| 89 |
fi |
| 90 |
|
| 91 |
if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then |
| 92 |
+ cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die |
| 93 |
preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) |
| 94 |
|
| 95 |
elog "Please ignore a possible later error message about a file collision involving" |
Archives