From d0fafa709f2b77dc0e70c99118520000965e4b5a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Mar 2024 17:43:01 +0000 Subject: gentoo auto-resync : 04:03:2024 - 17:43:01 --- dev-libs/gmp/Manifest | 4 - dev-libs/gmp/files/gmp-6.2.1-CVE-2021-43618.patch | 17 -- dev-libs/gmp/gmp-6.2.1-r5.ebuild | 182 ---------------------- 3 files changed, 203 deletions(-) delete mode 100644 dev-libs/gmp/files/gmp-6.2.1-CVE-2021-43618.patch delete mode 100644 dev-libs/gmp/gmp-6.2.1-r5.ebuild (limited to 'dev-libs/gmp') diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest index 5227abca65cb..8cc158b48305 100644 --- a/dev-libs/gmp/Manifest +++ b/dev-libs/gmp/Manifest @@ -1,11 +1,7 @@ AUX gmp-6.1.0-noexecstack-detect.patch 970 BLAKE2B 3b74021e37d5fd6b0b7baa6ad8298962c54cceb769a5f70b3c5fb5ef82392ee2308e6613cd93b0a78b69235c1a73aedc0eb54bbc77b0daebc022d3f1bd05413d SHA512 29af921eed5dbd2d506bc1acdc0eacb8b7f5e7f575fd62038f00a910242bf622980a4197dae18daf5915963c3407ca7eb5bdcb9760f958794348b449fc54e042 AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f0a0dea5c5f2b79e0821733612dadcb0ae4c5815255640afe383e8424e2cf323c0ae33990ee2c21e963811ac434b466a1 SHA512 d1d9898c1978dcdc41dce95d2fc9e23f2ccb0615d02ca453045ece04e9bfd45aa9194774e1e3ea4efe7b40c8f2179233dbecbaa748e7c40d4f31f3adc78d878e -AUX gmp-6.2.1-CVE-2021-43618.patch 476 BLAKE2B 72e06b386e356e839f2aaecb14ef709b43b8d32226730a8176ff135a5370be347c5ad6b25147fe0b6a37b213867971da2bd3a127dfecb1564599c616adb58d49 SHA512 2eb2300dab73789f7994ad5adc50ca7d2fd44c01dbc7bd43f315369fb71da6058ff89d4339cfa2765e3089268814c7b3f6f9cbeb58bb6b55d5697b4ba0d90b40 AUX gmp-6.2.1-no-zarch.patch 623 BLAKE2B 4cdf9b780ca92f56eb3dd030a3614169b8cf4df94ec3b419d97c5488dd091c1847605b3525e1d90f07434b38cb82135b9a91d87785b79f0af828cbb09c54adde SHA512 6f071f6c44d3991a92f157545832238bcd2d7275321f7420aff0b4f88a95a66ba7cfd457d3c56040f8579a1be0b77ddedadc7dc4ce8a31c75266909fbb61c399 -DIST gmp-6.2.1-arm64-darwin.patch.bz2 2520 BLAKE2B 3d4e9dbd29dc9aa81f0c9e0de4a5904c989d54148c9e3dcc5097a43b3fb1ecd17802dacfc71ee131c0805a345f5dce9009e88439758d3a0ed8b3a88526353b4a SHA512 72d49f09c3facd75036c945e076207e72e5673ba9605999c32a122e43e8b970ed646c8ca8f07acbb62bff5e7c387d4c8e1f73ca73e50ac3f574b5f6471d66d56 -DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 DIST gmp-6.3.0.tar.xz 2094196 BLAKE2B a865129e2b3f634ec5bad7f97ed89532e43f5662ac47a7d8ab7f0df8c9f8d0886bd984651422e2573c2163bca69c0547c248147ec90880accbd53db97dc0ddee SHA512 e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2 DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb -EBUILD gmp-6.2.1-r5.ebuild 5523 BLAKE2B 0bf1d406c26bc2a5d87fdf4d6c8200c71d7a9cd05f9cd5fa5f319761ea943328e7eccc416453b2b210d4839904dd061956235f8a8efc59c90a67debe2f499928 SHA512 37d84a358674f25864e3935e963355a93b29799e1ae9198b7d6fd5fd40dbc16665c3720c19da0c5c16c72f65c5c966abd08a366f10ba4119d1d910c190c13ca7 EBUILD gmp-6.3.0-r1.ebuild 6108 BLAKE2B 6907cc02fbcff7c94124e682c7f045d2662dbebdfc3ecc53556d2c55c6747bf08ec059dcdf6d4eed7e71b9e7a5f58c0ad244e416b026c57abe600cc940c47081 SHA512 4eb326aedf92dc0765d59368b53d9ebeaeb2d24d83ef8c4f83c9fd4d6052d5af5d2978c9a79813bdc491bc57c81806b4e4e25b453b2ad6cc073ac7ee8b20da1c MISC metadata.xml 952 BLAKE2B 6727b370675f80d69a2daed7fa6155b7c6f94643b9358f795b7a250d4005eb00d3808611606e09bdfde62d2927a3cc4cd50bd69d1982ef7607722319f71f2910 SHA512 290192ba858363ad4e2d32b8653a7fc846e20b8a5ef4bb9d610c4acb26ed2edb6e63f44e1e8c8d33328184576186b1e6a24b335ab03026763fe1d72e80b5db2f diff --git a/dev-libs/gmp/files/gmp-6.2.1-CVE-2021-43618.patch b/dev-libs/gmp/files/gmp-6.2.1-CVE-2021-43618.patch deleted file mode 100644 index 90129ec5b2bd..000000000000 --- a/dev-libs/gmp/files/gmp-6.2.1-CVE-2021-43618.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/823804 -https://gmplib.org/repo/gmp-6.2/rev/561a9c25298e ---- a/mpz/inp_raw.c -+++ b/mpz/inp_raw.c -@@ -88,8 +88,11 @@ mpz_inp_raw (mpz_ptr x, FILE *fp) - - abs_csize = ABS (csize); - -+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8)) -+ return 0; /* Bit size overflows */ -+ - /* round up to a multiple of limbs */ -- abs_xsize = BITS_TO_LIMBS (abs_csize*8); -+ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8); - - if (abs_xsize != 0) - { diff --git a/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/dev-libs/gmp/gmp-6.2.1-r5.ebuild deleted file mode 100644 index dc9a1c129771..000000000000 --- a/dev-libs/gmp/gmp-6.2.1-r5.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnuconfig libtool flag-o-matic multilib-minimal toolchain-funcs - -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} - -MANUAL_PV=6.2.1 - -MY_P=${PN}-${MY_PV} -PLEVEL=${PV/*p} - -DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" -HOMEPAGE="https://gmplib.org/" -SRC_URI=" - https://gmplib.org/download/gmp/${MY_P}.tar.xz - mirror://gnu/${PN}/${MY_P}.tar.xz - doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf ) -" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-darwin.patch.bz2" -S="${WORKDIR}"/${MY_P%a} - -LICENSE="|| ( LGPL-3+ GPL-2+ )" -# The subslot reflects the C & C++ SONAMEs. -SLOT="0/10.4" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+asm doc +cpudetection +cxx pic static-libs" -REQUIRED_USE="cpudetection? ( asm )" -RESTRICT="!cpudetection? ( bindist )" - -BDEPEND=" - app-arch/xz-utils - sys-devel/m4 -" - -DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache ) -HTML_DOCS=( doc ) - -MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch - "${FILESDIR}"/${PN}-6.2.1-no-zarch.patch - "${WORKDIR}"/${P}-arm64-darwin.patch - "${FILESDIR}"/${P}-CVE-2021-43618.patch -) - -pkg_pretend() { - if use cpudetection && ! use amd64 && ! use x86 ; then - elog "Using generic C implementation on non-amd64/x86 with USE=cpudetection" - elog "--enable-fat is a no-op on alternative arches." - elog "To obtain an optimized build, set USE=-cpudetection, but binpkgs should not then be made." - fi -} - -src_prepare() { - default - - # We cannot run autotools here as gcc depends on this package - elibtoolize - - # bug #536894 - if [[ ${CHOST} == *-darwin* ]] ; then - eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch - fi - - # GMP uses the "ABI" env var during configure as does Gentoo (econf). - # So, to avoid patching the source constantly, wrap things up. - mv configure configure.wrapped || die - cat <<-\EOF > configure - #!/usr/bin/env sh - exec env ABI="${GMPABI}" "$0.wrapped" "$@" - EOF - - # Patches to original configure might have lost the +x bit. - chmod a+rx configure{,.wrapped} || die - - # Save the upstream files named config.{guess,sub} which are - # wrappers around the gnuconfig versions. - mkdir "${T}"/gmp-gnuconfig || die - mv config.guess "${T}"/gmp-gnuconfig/config.guess || die - mv config.sub "${T}"/gmp-gnuconfig/config.sub || die - # Grab fresh copies from gnuconfig. - touch config.guess config.sub || die - gnuconfig_update - # Rename the fresh copies to the filenames the wrappers from GMP - # expect. - mv config.guess configfsf.guess || die - mv config.sub configfsf.sub || die -} - -multilib_src_configure() { - # Generally a very fragile package - strip-flags - # Miscompiled with LTO at least on arm64, bug #889948 - filter-lto - - # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works - # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) - if [[ ${CHOST} == hppa2.0-* ]] ; then - GMPABI="1.0" - fi - - # ABI mappings (needs all architectures supported) - case ${ABI} in - 32|x86) GMPABI=32;; - 64|amd64|n64) GMPABI=64;; - [onx]32) GMPABI=${ABI};; - esac - export GMPABI - - tc-export CC - - # https://gmplib.org/manual/Notes-for-Package-Builds - local myeconfargs=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" - - --localstatedir="${EPREFIX}"/var/state/gmp - --enable-shared - - $(use_enable asm assembly) - # fat is needed to avoid gmp installing either purely generic - # or specific-to-used-CPU (which our config.guess refresh prevents at the moment). - # Both Fedora and opensuse use this option to tackle the issue, bug #883201. - # - # This only works for amd64/x86, so to get accelerated performance - # (i.e. not using the generic C), one needs USE=-cpudetection if - # on non-amd64/x86. - # - # (We do not mask USE=cpudetection on !amd64/x86 because we want - # the flag to be useful on other arches to allow opting out of the - # config.guess logic below.) - $(use_enable cpudetection fat) - $(use_enable cxx) - $(use_enable static-libs static) - - # --with-pic forces static libraries to be built as PIC - # and without TEXTRELs. musl does not support TEXTRELs: bug #707332 - $(use pic && echo --with-pic) - ) - - # Move the wrappers from GMP back into place (may have been destroyed by previous econf run) - cp "${T}"/gmp-gnuconfig/config.guess "${S}"/config.guess || die - cp "${T}"/gmp-gnuconfig/config.sub "${S}"/config.sub || die - - # See bug #883201 again. - if ! use cpudetection && ! tc-is-cross-compiler ; then - local gmp_host=$("${S}"/config.guess || die "failed to run config.guess") - - if [[ -z ${gmp_host} ]] ; then - die "Empty result from GMP's custom config.guess!" - fi - - einfo "GMP guessed processor type: ${gmp_host}" - ewarn "This build will only work on this machine. Enable USE=cpudetection for binary packages!" - export ac_cv_build="${gmp_host}" - export ac_cv_host="${gmp_host}" - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # Should be a standalone lib - rm -f "${ED}"/usr/$(get_libdir)/libgmp.la - - # This requires libgmp - local la="${ED}/usr/$(get_libdir)/libgmpxx.la" - if ! use static-libs ; then - rm -f "${la}" || die - fi -} - -multilib_src_install_all() { - einstalldocs - use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/ -} -- cgit v1.2.3