From 4761acd4f2b613c18469b2d02eeeea0dfaeda013 Mon Sep 17 00:00:00 2001
From: Jakub Martisko <jamartis@redhat.com>
Date: Tue, 2 Nov 2021 15:38:12 +0100
Subject: [PATCH] Rebase to gmp-6.2.1

---
 .gitignore          |  1 +
 gmp-intel-cet.patch |  9 +++------
 gmp.spec            | 12 ++++++++----
 sources             |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0bc7627..3b2f43e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /gmp-6.1.1.tar.bz2
 /gmp-6.1.2.tar.bz2
 /gmp-6.2.0.tar.bz2
+/gmp-6.2.1.tar.xz
diff --git a/gmp-intel-cet.patch b/gmp-intel-cet.patch
index 62e790d..e00f2a6 100644
--- a/gmp-intel-cet.patch
+++ b/gmp-intel-cet.patch
@@ -3379,17 +3379,14 @@ diff --git a/mpn/x86_64/x86_64-defs.m4 b/mpn/x86_64/x86_64-defs.m4
 index 64e3729..2a1c1b0 100644
 --- a/mpn/x86_64/x86_64-defs.m4
 +++ b/mpn/x86_64/x86_64-defs.m4
-@@ -94,9 +94,9 @@ m4_assert_numargs(1)
- `	GLOBL	$1
+@@ -94,6 +94,7 @@ m4_assert_numargs(1)
  	TYPE($1,`function')
+ 	COFF_TYPE($1)
  $1:
 +	X86_ENDBR
  ')
  
--
- dnl  Usage: ASSERT([cond][,instructions])
- dnl
- dnl  If WANT_ASSERT is 1, output the given instructions and expect the given
+
 @@ -149,6 +149,10 @@ ifdef(`PIC',
  	`lea	$1(%rip), $2')
  ')
diff --git a/gmp.spec b/gmp.spec
index c0852df..3d2b30c 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -5,12 +5,11 @@
 
 Summary: GNU arbitrary precision library
 Name: gmp
-Version: 6.2.0
-Release: 7%{?dist}
+Version: 6.2.1
+Release: 1%{?dist}
 Epoch: 1
 URL: https://gmplib.org/
-Source0: https://gmplib.org/download/gmp/gmp-%{version}.tar.bz2
-# or https://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.xz
+Source0: https://gmplib.org/download/gmp/gmp-%{version}.tar.xz
 Source2: gmp.h
 Source3: gmp-mparam.h
 Patch2: gmp-6.0.0-debuginfo.patch
@@ -177,6 +176,11 @@ export LD_LIBRARY_PATH=`pwd`/.libs
 %{_libdir}/libgmpxx.a
 
 %changelog
+* Tue Aug 31 2021 Jakub Martisko <jamartis@redhat.com> - 1:6.2.1-1
+- Rebase to gmp-6.2.1
+- Minor update of the cet patch
+Resolves: rhbz#1897831
+
 * Tue Aug 31 2021 Jakub Martisko <jamartis@redhat.com> - 1:6.2.0-8
 - Enable intel CET
 - Fix based on the patches provided by H.J. Lu
diff --git a/sources b/sources
index 202beef..6daf05b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gmp-6.2.0.tar.bz2) = ff22ed47fff176ed56301ecab0213316150a3abb370fed031635804f829c878296d7c65597b1f687f394479eef04fae6eba771162f7d363dc4c94c7334fc1fc0
+SHA512 (gmp-6.2.1.tar.xz) = c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84