From e569e4374458beabedd4f80c51806169615fb7e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 5 Mar 2009 10:25:19 +0000 Subject: [PATCH] - with the integrity verification check the library needs to link to libdl (#488702) --- libgcrypt-1.4.4-use-fipscheck.patch | 16 ++++++++++++++-- libgcrypt.spec | 6 +++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libgcrypt-1.4.4-use-fipscheck.patch b/libgcrypt-1.4.4-use-fipscheck.patch index aa7d7d1..5708534 100644 --- a/libgcrypt-1.4.4-use-fipscheck.patch +++ b/libgcrypt-1.4.4-use-fipscheck.patch @@ -1,6 +1,6 @@ diff -up libgcrypt-1.4.4/src/fips.c.use-fipscheck libgcrypt-1.4.4/src/fips.c ---- libgcrypt-1.4.4/src/fips.c.use-fipscheck 2009-03-03 18:10:49.000000000 +0100 -+++ libgcrypt-1.4.4/src/fips.c 2009-03-03 18:51:31.000000000 +0100 +--- libgcrypt-1.4.4/src/fips.c.use-fipscheck 2009-03-03 21:09:27.000000000 +0100 ++++ libgcrypt-1.4.4/src/fips.c 2009-03-05 11:20:48.000000000 +0100 @@ -570,23 +570,48 @@ run_random_selftests (void) return !!err; } @@ -72,3 +72,15 @@ diff -up libgcrypt-1.4.4/src/fips.c.use-fipscheck libgcrypt-1.4.4/src/fips.c p = strrchr (fname, '/'); if (p) p++; +diff -up libgcrypt-1.4.4/src/Makefile.use-fipscheck libgcrypt-1.4.4/src/Makefile +--- libgcrypt-1.4.4/src/Makefile.use-fipscheck 2009-03-03 21:09:41.000000000 +0100 ++++ libgcrypt-1.4.4/src/Makefile 2009-03-05 11:20:40.000000000 +0100 +@@ -337,7 +337,7 @@ libgcrypt_la_LIBADD = \ + ../cipher/libcipher.la \ + ../random/librandom.la \ + ../mpi/libmpi.la \ +- -lgpg-error ++ -lgpg-error -ldl + + dumpsexp_SOURCES = dumpsexp.c + dumpsexp_LDADD = diff --git a/libgcrypt.spec b/libgcrypt.spec index 0242a85..df1fcad 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -1,6 +1,6 @@ Name: libgcrypt Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Source0: libgcrypt-%{version}-hobbled.tar.bz2 # The original libgcrypt sources now contain potentially patented ECC # cipher support. We have to remove it in the tarball we ship with @@ -145,6 +145,10 @@ exit 0 %{_infodir}/gcrypt.info* %changelog +* Thu Mar 5 2009 Tomas Mraz 1.4.4-4 +- with the integrity verification check the library needs to link to libdl + (#488702) + * Tue Mar 3 2009 Tomas Mraz 1.4.4-3 - add hmac FIPS integrity verification check