libgcrypt-rol64-redefinition.patch

@@ -1,16 +0,0 @@
-Index: libgcrypt-1.11.0/cipher/bithelp.h
-===================================================================
---- libgcrypt-1.11.0.orig/cipher/bithelp.h
-+++ libgcrypt-1.11.0/cipher/bithelp.h
-@@ -35,11 +35,6 @@ static inline u32 ror(u32 x, int n)
- 	return ( (x >> (n&(32-1))) | (x << ((32-n)&(32-1))) );
- }
- 
--static inline u64 rol64(u64 x, int n)
--{
--  return ( (x << (n&(64-1))) | (x >> ((64-n)&(64-1))) );
--}
--
- /* Byte swap for 32-bit and 64-bit integers.  If available, use compiler
-    provided helpers.  */
- #ifdef HAVE_BUILTIN_BSWAP32

libgcrypt.changes

@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-Tue Jan  7 09:28:25 UTC 2025 - Pedro Monreal <pmonreal@suse.com>
-
-- Fix redefinition error of 'rol64'. Remove not used rol64()
-  definition after removing the built-in jitter rng.
-  * Add libgcrypt-rol64-redefinition.patch
-
--------------------------------------------------------------------
-Mon Dec  2 10:11:10 UTC 2024 - Pedro Monreal <pmonreal@suse.com>
-
-- Remove unrecognized option: --enable-m-guard
-
 -------------------------------------------------------------------
 Thu Jun 20 08:11:07 UTC 2024 - Pedro Monreal <pmonreal@suse.com>
 

libgcrypt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libgcrypt
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -52,8 +52,6 @@ Patch105:       libgcrypt-FIPS-jitter-standalone.patch
 Patch106:       libgcrypt-FIPS-jitter-errorcodes.patch
 #PATCH-FIX-SUSE bsc#1220893 FIPS: Use Jitter RNG for the whole length entropy buffer
 Patch107:       libgcrypt-FIPS-jitter-whole-entropy.patch
-#PATCH-FIX-SUSE Remove not used rol64() definition after removing the built-in jitter rng
-Patch108:       libgcrypt-rol64-redefinition.patch
 BuildRequires:  automake >= 1.14
 BuildRequires:  libgpg-error-devel >= 1.49
 BuildRequires:  libtool
@@ -126,6 +124,7 @@ export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
            --enable-kdfs="$KDFS" \
            --enable-noexecstack \
            --disable-static \
+           --enable-m-guard \
 %ifarch %{sparc}
            --disable-asm \
 %endif