diff --git a/.checkpackageignore b/.checkpackageignore index f846cc7a87..3a9329ab71 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -536,7 +536,6 @@ package/gli/0001-Optional-building-tests.patch Upstream package/glog/0001-added-emscripten-support.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream -package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch Upstream package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch Upstream package/gnuplot/0001-configure-add-without-demo-option.patch Upstream diff --git a/package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch b/package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch deleted file mode 100644 index 0003f342c3..0000000000 --- a/package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch +++ /dev/null @@ -1,27 +0,0 @@ -# HG changeset patch -# User Marco Bodrato -# Date 1634836009 -7200 -# Node ID 561a9c25298e17bb01896801ff353546c6923dbd -# Parent e1fd9db13b475209a864577237ea4b9105b3e96e -mpz/inp_raw.c: Avoid bit size overflows - -[Retrieved from: https://gmplib.org/repo/gmp-6.2/rev/561a9c25298e] -Signed-off-by: Fabrice Fontaine - -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/package/gmp/gmp.hash b/package/gmp/gmp.hash index d55e312bbb..8c8b4d1151 100644 --- a/package/gmp/gmp.hash +++ b/package/gmp/gmp.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2 gmp-6.2.1.tar.xz +sha256 a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 gmp-6.3.0.tar.xz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 9b402767fd..c52a5214a6 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -GMP_VERSION = 6.2.1 +GMP_VERSION = 6.3.0 GMP_SITE = $(BR2_GNU_MIRROR)/gmp GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz GMP_INSTALL_STAGING = YES @@ -14,9 +14,6 @@ GMP_CPE_ID_VENDOR = gmplib GMP_DEPENDENCIES = host-m4 HOST_GMP_DEPENDENCIES = host-m4 -# 0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch -GMP_IGNORE_CVES += CVE-2021-43618 - # GMP doesn't support assembly for coldfire or mips r6 ISA yet # Disable for ARM v7m since it has different asm constraints ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M),y)