| 1 |
commit: 7b1c50f1d331f650a72558744dbae4bbbda38ce9 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 3 01:44:05 2020 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 3 01:44:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1c50f1 |
| 7 |
|
| 8 |
sys-libs/musl: remove vulnerable world, bug #711276 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/711276 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-libs/musl/Manifest | 1 - |
| 15 |
sys-libs/musl/musl-1.1.23.ebuild | 122 --------------------------------------- |
| 16 |
2 files changed, 123 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest |
| 19 |
index dbf5d17bdfe..abcb1a03efe 100644 |
| 20 |
--- a/sys-libs/musl/Manifest |
| 21 |
+++ b/sys-libs/musl/Manifest |
| 22 |
@@ -1,6 +1,5 @@ |
| 23 |
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d |
| 24 |
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2 |
| 25 |
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf |
| 26 |
-DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09 |
| 27 |
DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77 |
| 28 |
DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1 |
| 29 |
|
| 30 |
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild |
| 31 |
deleted file mode 100644 |
| 32 |
index ec3d2f49819..00000000000 |
| 33 |
--- a/sys-libs/musl/musl-1.1.23.ebuild |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,122 +0,0 @@ |
| 36 |
-# Copyright 1999-2020 Gentoo Authors |
| 37 |
-# Distributed under the terms of the GNU General Public License v2 |
| 38 |
- |
| 39 |
-EAPI=6 |
| 40 |
- |
| 41 |
-inherit eutils flag-o-matic multilib toolchain-funcs |
| 42 |
-if [[ ${PV} == "9999" ]] ; then |
| 43 |
- EGIT_REPO_URI="git://git.musl-libc.org/musl" |
| 44 |
- inherit git-r3 |
| 45 |
- SRC_URI=" |
| 46 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
| 47 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
| 48 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
| 49 |
- KEYWORDS="" |
| 50 |
-else |
| 51 |
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz |
| 52 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
| 53 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
| 54 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
| 55 |
- KEYWORDS="-* amd64 arm arm64 ~mips ppc x86" |
| 56 |
-fi |
| 57 |
- |
| 58 |
-export CBUILD=${CBUILD:-${CHOST}} |
| 59 |
-export CTARGET=${CTARGET:-${CHOST}} |
| 60 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
| 61 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
| 62 |
- export CTARGET=${CATEGORY#cross-} |
| 63 |
- fi |
| 64 |
-fi |
| 65 |
- |
| 66 |
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" |
| 67 |
-HOMEPAGE="http://www.musl-libc.org/" |
| 68 |
-LICENSE="MIT LGPL-2 GPL-2" |
| 69 |
-SLOT="0" |
| 70 |
-IUSE="headers-only" |
| 71 |
- |
| 72 |
-QA_SONAME="/usr/lib/libc.so" |
| 73 |
-QA_DT_NEEDED="/usr/lib/libc.so" |
| 74 |
- |
| 75 |
-is_crosscompile() { |
| 76 |
- [[ ${CHOST} != ${CTARGET} ]] |
| 77 |
-} |
| 78 |
- |
| 79 |
-just_headers() { |
| 80 |
- use headers-only && is_crosscompile |
| 81 |
-} |
| 82 |
- |
| 83 |
-pkg_setup() { |
| 84 |
- if [ ${CTARGET} == ${CHOST} ] ; then |
| 85 |
- case ${CHOST} in |
| 86 |
- *-musl*) ;; |
| 87 |
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 88 |
- esac |
| 89 |
- fi |
| 90 |
- |
| 91 |
- # fix for #667126, copied from glibc ebuild |
| 92 |
- # make sure host make.conf doesn't pollute us |
| 93 |
- if is_crosscompile || tc-is-cross-compiler ; then |
| 94 |
- CHOST=${CTARGET} strip-unsupported-flags |
| 95 |
- fi |
| 96 |
-} |
| 97 |
- |
| 98 |
-src_configure() { |
| 99 |
- tc-getCC ${CTARGET} |
| 100 |
- just_headers && export CC=true |
| 101 |
- |
| 102 |
- local sysroot |
| 103 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
| 104 |
- ./configure \ |
| 105 |
- --target=${CTARGET} \ |
| 106 |
- --prefix=${sysroot}/usr \ |
| 107 |
- --syslibdir=${sysroot}/lib \ |
| 108 |
- --disable-gcc-wrapper || die |
| 109 |
-} |
| 110 |
- |
| 111 |
-src_compile() { |
| 112 |
- emake obj/include/bits/alltypes.h |
| 113 |
- just_headers && return 0 |
| 114 |
- |
| 115 |
- emake |
| 116 |
- if [[ ${CATEGORY} != cross-* ]] ; then |
| 117 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die |
| 118 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die |
| 119 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die |
| 120 |
- fi |
| 121 |
-} |
| 122 |
- |
| 123 |
-src_install() { |
| 124 |
- local target="install" |
| 125 |
- just_headers && target="install-headers" |
| 126 |
- emake DESTDIR="${D}" ${target} |
| 127 |
- just_headers && return 0 |
| 128 |
- |
| 129 |
- # musl provides ldd via a sym link to its ld.so |
| 130 |
- local sysroot |
| 131 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
| 132 |
- local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) |
| 133 |
- dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
| 134 |
- |
| 135 |
- if [[ ${CATEGORY} != cross-* ]] ; then |
| 136 |
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
| 137 |
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
| 138 |
- cp "${FILESDIR}"/ldconfig.in "${T}" || die |
| 139 |
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
| 140 |
- into / |
| 141 |
- dosbin "${T}"/ldconfig |
| 142 |
- into /usr |
| 143 |
- dobin "${T}"/getconf |
| 144 |
- dobin "${T}"/getent |
| 145 |
- dobin "${T}"/iconv |
| 146 |
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die |
| 147 |
- doenvd "${T}"/00musl |
| 148 |
- fi |
| 149 |
-} |
| 150 |
- |
| 151 |
-pkg_postinst() { |
| 152 |
- is_crosscompile && return 0 |
| 153 |
- |
| 154 |
- [ "${ROOT}" != "/" ] && return 0 |
| 155 |
- |
| 156 |
- ldconfig || die |
| 157 |
-} |
Archives