From c707605642f1ed7d9365111b8da4ec6596d4113b Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 1 Aug 2023 15:41:14 +0800 Subject: gmp: upgrade 6.2.1 -> 6.3.0 cve-2021-43618.patch removed since it's included in 6.3.0 Changelog: ============ BUGS FIXED * A possible overflow of type int is avoided for mpz_cmp on huge operands. * A possible error condition when a malformed file is read with mpz_inp_raw is now correctly handled. FEATURES * New public function mpz_prevprime, companion of the existing mpz_nextprime. * New documented pointer types mpz_ptr, mpz_srcptr, and similar for other GMP types. Refer to the manual for full list and suggested usage. These types have been present in gmp.h at least since GMP-4.0, but previously not advertised to users. * Support for 64-bit Arm under Macos. * Support for the loongarch64 CPU family. * Support for building with LTO, link-time optimisations. SPEEDUPS * New special code for base = 2 in mpz_powm reduces the average time for the functions that test primality. * Speedup for the function mpz_nextprime on large operands. * Speedup for multiplications (some sizes only) thanks to new internal functions to compute small negacyclic products. * Special assembly code for IBM z13 and later "mainframe" CPUs, resulting in a huge speedup. * Improved assembly for several 64-bit x86 CPUs, Risc-V, 64-bit Arm. (From OE-Core rev: 49b625116b67a19abfd17670431ba3f96031b86e) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-support/gmp/gmp/cve-2021-43618.patch | 27 ------------- meta/recipes-support/gmp/gmp_6.2.1.bb | 47 ----------------------- meta/recipes-support/gmp/gmp_6.3.0.bb | 45 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-support/gmp/gmp/cve-2021-43618.patch delete mode 100644 meta/recipes-support/gmp/gmp_6.2.1.bb create mode 100644 meta/recipes-support/gmp/gmp_6.3.0.bb (limited to 'meta') diff --git a/meta/recipes-support/gmp/gmp/cve-2021-43618.patch b/meta/recipes-support/gmp/gmp/cve-2021-43618.patch deleted file mode 100644 index 095fb21eaa..0000000000 --- a/meta/recipes-support/gmp/gmp/cve-2021-43618.patch +++ /dev/null @@ -1,27 +0,0 @@ -CVE: CVE-2021-43618 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -# HG changeset patch -# User Marco Bodrato -# Date 1634836009 -7200 -# Node ID 561a9c25298e17bb01896801ff353546c6923dbd -# Parent e1fd9db13b475209a864577237ea4b9105b3e96e -mpz/inp_raw.c: Avoid bit size overflows - -diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c ---- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100 -+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200 -@@ -88,8 +88,11 @@ - - 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/meta/recipes-support/gmp/gmp_6.2.1.bb b/meta/recipes-support/gmp/gmp_6.2.1.bb deleted file mode 100644 index 29055492c2..0000000000 --- a/meta/recipes-support/gmp/gmp_6.2.1.bb +++ /dev/null @@ -1,47 +0,0 @@ -require gmp.inc - -LICENSE = "GPL-2.0-or-later | LGPL-3.0-or-later" - -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \ -" - -REVISION = "" -SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ - file://use-includedir.patch \ - file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ - file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ - file://cve-2021-43618.patch \ - " -SRC_URI[md5sum] = "28971fc21cf028042d4897f02fd355ea" -SRC_URI[sha256sum] = "eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c" - -acpaths = "" - -EXTRA_OECONF += " --enable-cxx=detect" -EXTRA_OECONF:append:mipsarchr6 = " --disable-assembly" - -PACKAGES =+ "libgmpxx" -FILES:libgmpxx = "${libdir}/libgmpxx${SOLIBS}" - -do_install:append() { - oe_multilib_header gmp.h -} - -do_install:prepend:class-target() { - sed -i \ - -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ - -e "s|${DEBUG_PREFIX_MAP}||g" \ - ${B}/gmp.h -} - -SSTATE_SCAN_FILES += "gmp.h" - -# Doesn't compile in MIPS16e mode due to use of hand-written -# assembly -MIPS_INSTRUCTION_SET = "mips" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/gmp/gmp_6.3.0.bb b/meta/recipes-support/gmp/gmp_6.3.0.bb new file mode 100644 index 0000000000..3dbcd68b5c --- /dev/null +++ b/meta/recipes-support/gmp/gmp_6.3.0.bb @@ -0,0 +1,45 @@ +require gmp.inc + +LICENSE = "GPL-2.0-or-later | LGPL-3.0-or-later" + +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \ +" + +REVISION = "" +SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ + file://use-includedir.patch \ + file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ + file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ + " +SRC_URI[sha256sum] = "ac28211a7cfb609bae2e2c8d6058d66c8fe96434f740cf6fe2e47b000d1c20cb" + +acpaths = "" + +EXTRA_OECONF += " --enable-cxx=detect" +EXTRA_OECONF:append:mipsarchr6 = " --disable-assembly" + +PACKAGES =+ "libgmpxx" +FILES:libgmpxx = "${libdir}/libgmpxx${SOLIBS}" + +do_install:append() { + oe_multilib_header gmp.h +} + +do_install:prepend:class-target() { + sed -i \ + -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ + -e "s|${DEBUG_PREFIX_MAP}||g" \ + ${B}/gmp.h +} + +SSTATE_SCAN_FILES += "gmp.h" + +# Doesn't compile in MIPS16e mode due to use of hand-written +# assembly +MIPS_INSTRUCTION_SET = "mips" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf