diff --git a/.packit.yaml b/.packit.yaml index 31a01eb..2a7dee2 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -28,4 +28,5 @@ actions: jobs: - job: propose_downstream trigger: release - dist_git_branches: fedora-all + metadata: + dist_git_branches: fedora-all diff --git a/gmp-6.2.1-c23.patch b/gmp-6.2.1-c23.patch deleted file mode 100644 index 778c62f..0000000 --- a/gmp-6.2.1-c23.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/acinclude.m4 b/acinclude.m4 -index 906071c..a466b7c 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1], - - #if defined (__GNUC__) && ! defined (__cplusplus) - typedef unsigned long long t1;typedef t1*t2; --void g(){} -+void g(int, t2, t1, t2, t2, int){} - void h(){} - static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) - {t1 c,x,r;int i;if(v0){c=1;for(i=1;i= 10 +Source201: gnutls-3.8.8-tests-rsa-default.patch +%endif + %if %{with leancrypto} Provides: bundled(leancrypto) = 1.6.0 Source300: leancrypto-1.6.0.tar.gz @@ -277,6 +281,10 @@ patch -p1 < %{SOURCE102} popd %endif +%if 0%{?rhel} >= 10 +patch -p1 < %{SOURCE201} +%endif + %build %define _lto_cflags %{nil} @@ -352,6 +360,11 @@ eval $(sed -n 's/^\(\(NAME\|VERSION_ID\)=.*\)/OS_\1/p' /etc/os-release) export FIPS_MODULE_NAME="$OS_NAME ${OS_VERSION_ID%%.*} %name" %endif +# F42 MinGW only has Nettle 3.7 +%if %{with mingw} +sed -i 's/NETTLE_MINIMUM=3.10/NETTLE_MINIMUM=3.7/' configure +%endif + mkdir native_build pushd native_build diff --git a/sources b/sources index c383c9e..b7486bf 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ SHA512 (gnutls-3.8.11.tar.xz) = 68f9e5bec3aa6686fd3319cc9c88a5cc44e2a75144049fc9de5fb55fef2241b4e16996af4be5dd48308abbee8cfaed6c862903f6bb89aff5dfa5410075bd7386 SHA512 (gnutls-3.8.11.tar.xz.sig) = 90883e5736299b103844ca42b85d371969ef66b50b60cb185e814ad9978598796e9ed07a590245ff28ac6ac084b1dee93fae0845576464583a5941835990957d SHA512 (gnutls-release-keyring.gpg) = 8c2b39239d1d8c5319757fcf669f28a11de7f8ec4a726f9904c57ba8105bea80240083c0de71b747115907bab46569f10cf58004137cc7884ac5c20f8319ae0a -SHA512 (gmp-6.2.1.tar.xz) = c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 SHA512 (leancrypto-1.6.0.tar.gz) = cb6ace4a1642208dd7656b62a48e99d6261f471aa7967b738057745a4534abfa11d380dd5de98a737c0c13b1e1cb37ce780e02297eefc1cf839581629d34e100