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 A66D5158086 for ; Wed, 3 Nov 2021 17:27:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E733BE0896; Wed, 3 Nov 2021 17:27:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C6B5AE0896 for ; Wed, 3 Nov 2021 17:27:05 +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 6FCEB342CC5 for ; Wed, 3 Nov 2021 17:27:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8A66156 for ; Wed, 3 Nov 2021 17:27:01 +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: <1635960411.609d72bc35743b798c849b1b6d33cbfcf40b3b15.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.33-r7.ebuild sys-libs/glibc/glibc-2.34.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 609d72bc35743b798c849b1b6d33cbfcf40b3b15 X-VCS-Branch: master Date: Wed, 3 Nov 2021 17:27:01 +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: 5a7b1f9a-cedf-4af9-9b47-858b70f9aad1 X-Archives-Hash: 828285fb0b362b3b6ea947bcaac54011 commit: 609d72bc35743b798c849b1b6d33cbfcf40b3b15 Author: Sam James gentoo org> AuthorDate: Wed Nov 3 17:25:03 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 3 17:26:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609d72bc sys-libs/glibc: drop crypt.h preservation workaround Python was the main culprit and now that the erroneous/redundant include of crypt.h (and separately, -lcrypt linkage) has been dropped (and hence no longer affecting any consumers of Python.h and libpython). Hence, we can drop this as it was causing _more_ issues than it prevented as folks were still using FEATURES="collision-protect" instead of FEATURES="unmerge-orphans" (the news item and postinst did mention this, though). Bug: https://bugs.gentoo.org/802210 Signed-off-by: Sam James gentoo.org> sys-libs/glibc/glibc-2.33-r7.ebuild | 14 +------------- sys-libs/glibc/glibc-2.34.ebuild | 15 +-------------- sys-libs/glibc/glibc-9999.ebuild | 14 +------------- 3 files changed, 3 insertions(+), 40 deletions(-) diff --git a/sys-libs/glibc/glibc-2.33-r7.ebuild b/sys-libs/glibc/glibc-2.33-r7.ebuild index 146cce876a7..4fb9888470f 100644 --- a/sys-libs/glibc/glibc-2.33-r7.ebuild +++ b/sys-libs/glibc/glibc-2.33-r7.ebuild @@ -1506,12 +1506,6 @@ pkg_preinst() { if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then PRESERVED_OLD_LIBCRYPT=1 preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16. - if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die - fi else PRESERVED_OLD_LIBCRYPT=0 fi @@ -1548,14 +1542,8 @@ pkg_postinst() { if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${T}"/crypt.h ]] ; then - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" - fi - elog "Please ignore a possible later error message about a file collision involving" - elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep" + elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep" elog "the upgrade working, but it also needs to be overwritten when" elog "sys-libs/libxcrypt is installed. See bug 802210 for more details." elog "If you have FEATURES=collision-protect, please use FEATURES=unmerge-orphans instead!" diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild index f292dc31fc3..e98c13cc390 100644 --- a/sys-libs/glibc/glibc-2.34.ebuild +++ b/sys-libs/glibc/glibc-2.34.ebuild @@ -1519,13 +1519,6 @@ pkg_preinst() { if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then PRESERVED_OLD_LIBCRYPT=1 preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die - fi - else PRESERVED_OLD_LIBCRYPT=0 fi @@ -1562,14 +1555,8 @@ pkg_postinst() { if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${T}"/crypt.h ]] ; then - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" - fi - elog "Please ignore a possible later error message about a file collision involving" - elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep" + elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep" elog "the upgrade working, but it also needs to be overwritten when" elog "sys-libs/libxcrypt is installed. See bug 802210 for more details." fi diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index ce817f25421..c1752e4d398 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1519,12 +1519,6 @@ pkg_preinst() { if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then PRESERVED_OLD_LIBCRYPT=1 preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die - fi else PRESERVED_OLD_LIBCRYPT=0 fi @@ -1561,14 +1555,8 @@ pkg_postinst() { if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${T}"/crypt.h ]] ; then - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" - fi - elog "Please ignore a possible later error message about a file collision involving" - elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep" + elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep" elog "the upgrade working, but it also needs to be overwritten when" elog "sys-libs/libxcrypt is installed. See bug 802210 for more details." fi