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 A152B158086 for ; Fri, 19 Nov 2021 03:03:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F2DAE07ED; Fri, 19 Nov 2021 03:03:16 +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 E2A77E07EE for ; Fri, 19 Nov 2021 03:03:15 +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 4CDC3342E67 for ; Fri, 19 Nov 2021 03:03:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B26251D4 for ; Fri, 19 Nov 2021 03:03:08 +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: <1637290960.bd2656625bf0ed0b05e5b6de9ead4a73f09c58fe.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/, sys-libs/musl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/musl/files/ldconfig.in-r1 sys-libs/musl/musl-1.2.2-r5.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/files/ sys-libs/musl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bd2656625bf0ed0b05e5b6de9ead4a73f09c58fe X-VCS-Branch: master Date: Fri, 19 Nov 2021 03:03:08 +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: 5cb75396-2a7c-47f7-a5e9-c0c3cfcb340b X-Archives-Hash: da854f85725bd240d6a30ffd8ffe1991 commit: bd2656625bf0ed0b05e5b6de9ead4a73f09c58fe Author: Sam James gentoo org> AuthorDate: Thu Nov 18 00:45:48 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 19 03:02:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd265662 sys-libs/musl: additional ROOT fixes for ldconfig Move around some declarations so we get sensible default values but only perform the sanity checks _after_ we parse command line arguments to take into account e.g. -r (root). Bug: https://bugs.gentoo.org/666246 Signed-off-by: Sam James gentoo.org> sys-libs/musl/files/ldconfig.in-r1 | 17 +++++++++-------- .../musl/{musl-9999.ebuild => musl-1.2.2-r5.ebuild} | 11 +++++++++-- sys-libs/musl/musl-9999.ebuild | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/sys-libs/musl/files/ldconfig.in-r1 b/sys-libs/musl/files/ldconfig.in-r1 index 362d11ce815a..14aa7c3466b8 100644 --- a/sys-libs/musl/files/ldconfig.in-r1 +++ b/sys-libs/musl/files/ldconfig.in-r1 @@ -1,16 +1,9 @@ #!/bin/bash -e -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 ROOT="/" - LDSO_CONF="/etc/ld.so.conf" -if [[ ! -e $LDSO_CONF ]]; then - echo "$LDSO_CONF not found" >&2 - exit 1 -fi - -LDSO_CONF_DIR=$(dirname $LDSO_CONF) VERBOSE=0 @@ -124,6 +117,14 @@ sanitize() { } get_options "$@" + +if [[ ! -e $LDSO_CONF ]]; then + echo "$LDSO_CONF not found" >&2 + exit 1 +fi + +LDSO_CONF_DIR=$(dirname $LDSO_CONF) + drs=$(read_ldso_conf "$LDSO_CONF") drs=$(sanitize $drs) diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.2-r5.ebuild similarity index 94% copy from sys-libs/musl/musl-9999.ebuild copy to sys-libs/musl/musl-1.2.2-r5.ebuild index 1ba86e7846fb..79a60682c79f 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-1.2.2-r5.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" + KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86" fi GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab" GETENT_FILE="musl-getent-${GETENT_COMMIT}.c" @@ -71,6 +71,13 @@ src_unpack() { cp "${DISTDIR}"/iconv.c misc/iconv.c || die } +src_prepare() { + default + + # Expand gethostid instead of being just a stub + eapply "${FILESDIR}/${PN}-1.2.2-gethostid.patch" +} + src_configure() { tc-getCC ${CTARGET} just_headers && export CC=true @@ -137,7 +144,7 @@ src_install() { [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die fi - cp "${FILESDIR}"/ldconfig.in "${T}" || die + cp "${FILESDIR}"/ldconfig.in-r1 "${T}"/ldconfig.in || die sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die into / dosbin "${T}"/ldconfig diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 1ba86e7846fb..0d528e720587 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -137,7 +137,7 @@ src_install() { [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die fi - cp "${FILESDIR}"/ldconfig.in "${T}" || die + cp "${FILESDIR}"/ldconfig.in "${T}"/ldconfig.in || die sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die into / dosbin "${T}"/ldconfig