From b2c99e670bcdb9a9f04c97420acfc88ebab4939d Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 1 Jul 2021 16:19:52 -0500 Subject: [PATCH] Forgot to link to libdl... ...I got away with this in rawhide because it's no longer needed there, but it's still necessary in el9. Related: ##1971823 --- gnutls-hmac.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnutls-hmac.patch b/gnutls-hmac.patch index 0455ed8..4b1ba0e 100644 --- a/gnutls-hmac.patch +++ b/gnutls-hmac.patch @@ -737,7 +737,7 @@ index 072765361..c8f26ac02 100644 -- 2.31.1 -From a2429b6b2b12ebec5b51ec1bd287674c104877c1 Mon Sep 17 00:00:00 2001 +From 61c175277acb8d1e080305acd444201c5ad1fb81 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 16 Jun 2021 20:35:00 -0500 Subject: [PATCH 3/4] dlopen GnuTLS instead of linking directly @@ -919,7 +919,7 @@ index 0e39ea40a..2d9be91b8 100644 #endif diff --git a/glib/meson.build b/glib/meson.build -index 2417de53d..1b4a2477c 100644 +index 2417de53d..ba42951aa 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -384,7 +384,7 @@ libglib = library('glib-2.0', @@ -927,7 +927,7 @@ index 2417de53d..1b4a2477c 100644 link_args : [noseh_link_args, glib_link_flags, win32_ldflags], include_directories : configinc, - dependencies : pcre_deps + [thread_dep, librt] + libgnutls_dep + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep], -+ dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep], ++ dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + [libdl_dep], c_args : glib_c_args, objc_args : glib_c_args, ) @@ -952,7 +952,7 @@ index cca15f653..404ef1790 100644 -- 2.31.1 -From 14b214e82d7f58739c180d3c777b0a000cf0590f Mon Sep 17 00:00:00 2001 +From 7d1d96311b6ecd4f90ebbdd6fc58d28e06a86887 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 16 Jun 2021 20:46:24 -0500 Subject: [PATCH 4/4] Add test for GHmac in FIPS mode