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 B5A14158086 for ; Wed, 3 Nov 2021 00:54:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9C8EE0849; Wed, 3 Nov 2021 00:54:45 +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 27A7CE0849 for ; Wed, 3 Nov 2021 00:54:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B5A55340BBE for ; Wed, 3 Nov 2021 00:54:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21351132 for ; Wed, 3 Nov 2021 00:54:42 +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: <1635900852.3062f2ce92ef51f40385300dc9d3a3ec176bb9c6.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: 3062f2ce92ef51f40385300dc9d3a3ec176bb9c6 X-VCS-Branch: master Date: Wed, 3 Nov 2021 00:54:42 +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: daceab01-1930-4815-967d-0f95e4635ba3 X-Archives-Hash: 0d28275c698bc1de86a1339f3462c24a commit: 3062f2ce92ef51f40385300dc9d3a3ec176bb9c6 Author: Sam James gentoo org> AuthorDate: Wed Nov 3 00:53:29 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 3 00:54:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3062f2ce sys-libs/glibc: only copy crypt.h if it exists Some folks may have rather strict INSTALL_MASKs and such and don't need headers, so if they don't have it already, go with it. Bug: https://bugs.gentoo.org/802207 Signed-off-by: Sam James gentoo.org> sys-libs/glibc/glibc-2.33-r7.ebuild | 15 +++++++++++++-- sys-libs/glibc/glibc-2.34.ebuild | 16 ++++++++++++++-- sys-libs/glibc/glibc-9999.ebuild | 15 +++++++++++++-- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/sys-libs/glibc/glibc-2.33-r7.ebuild b/sys-libs/glibc/glibc-2.33-r7.ebuild index dbea0d35d4d..146cce876a7 100644 --- a/sys-libs/glibc/glibc-2.33-r7.ebuild +++ b/sys-libs/glibc/glibc-2.33-r7.ebuild @@ -1506,7 +1506,12 @@ pkg_preinst() { if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then PRESERVED_OLD_LIBCRYPT=1 preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die + + # 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 @@ -1542,7 +1547,13 @@ pkg_postinst() { if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" + + # 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 "the upgrade working, but it also needs to be overwritten when" diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild index 0a5f70fd284..f292dc31fc3 100644 --- a/sys-libs/glibc/glibc-2.34.ebuild +++ b/sys-libs/glibc/glibc-2.34.ebuild @@ -1519,7 +1519,13 @@ pkg_preinst() { if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then PRESERVED_OLD_LIBCRYPT=1 preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die + + # 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 @@ -1555,7 +1561,13 @@ pkg_postinst() { if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" + + # 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 "the upgrade working, but it also needs to be overwritten when" diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 7be3669c52a..ce817f25421 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1519,7 +1519,12 @@ pkg_preinst() { if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then PRESERVED_OLD_LIBCRYPT=1 preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die + + # 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 @@ -1555,7 +1560,13 @@ pkg_postinst() { if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" + + # 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 "the upgrade working, but it also needs to be overwritten when"