Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libgcrypt for openSUSE:Factory
checked in at 2023-05-28 19:21:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libgcrypt (Old)
and /work/SRC/openSUSE:Factory/.libgcrypt.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgcrypt"
Sun May 28 19:21:50 2023 rev:97 rq:1089003 version:1.10.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libgcrypt/libgcrypt.changes 2023-04-14
13:12:03.075211508 +0200
+++ /work/SRC/openSUSE:Factory/.libgcrypt.new.1533/libgcrypt.changes
2023-05-28 19:22:01.296668951 +0200
@@ -1,0 +2,7 @@
+Mon May 22 11:32:53 UTC 2023 - Pedro Monreal <pmonr...@suse.com>
+
+- FIPS: Merge the libgcrypt20-hmac package into the library and
+ remove the "module is complete" trigger file .fips [bsc#1185116]
+ * Remove libgcrypt-1.10.0-use-fipscheck.patch
+
+-------------------------------------------------------------------
Old:
----
libgcrypt-1.10.0-use-fipscheck.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgcrypt.spec ++++++
--- /var/tmp/diff_new_pack.BXNKVA/_old 2023-05-28 19:22:01.932672736 +0200
+++ /var/tmp/diff_new_pack.BXNKVA/_new 2023-05-28 19:22:01.936672760 +0200
@@ -16,7 +16,6 @@
#
-%define build_hmac256 1
%define libsover 20
%define libsoname %{name}%{libsover}
%define hmac_key orboDeJITITejsirpADONivirpUkvarP
@@ -49,8 +48,6 @@
Patch103: libgcrypt-jitterentropy-3.4.0.patch
#PATCH-FIX-SUSE bsc#1202117 FIPS: Get most of the entropy from rndjent_poll
Patch104: libgcrypt-FIPS-rndjent_poll.patch
-#PATCH-FIX-SUSE Check the FIPS "module is complete" trigger file .fips
-Patch105: libgcrypt-1.10.0-use-fipscheck.patch
BuildRequires: automake >= 1.14
BuildRequires: libgpg-error-devel >= 1.27
BuildRequires: libtool
@@ -68,23 +65,13 @@
Summary: The GNU Crypto Library
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Libraries
-Suggests: %{libsoname}-hmac = %{version}-%{release}
+Provides: %{libsoname}-hmac = %{version}-%{release}
+Obsoletes: %{libsoname}-hmac < %{version}-%{release}
%description -n %{libsoname}
Libgcrypt is a general purpose crypto library based on the code used in
GnuPG (alpha version).
-%package -n %{libsoname}-hmac
-Summary: HMAC checksums for the GNU Crypto Library
-License: GPL-2.0-or-later AND LGPL-2.1-or-later
-Group: System/Libraries
-Requires: %{libsoname} = %{version}-%{release}
-
-%description -n %{libsoname}-hmac
-Libgcrypt is a general purpose crypto library based on the code used in
-GnuPG (alpha version). This package contains the HMAC checksum files
-for integrity checking the library, as required by FIPS 140-2.
-
%package devel
Summary: The GNU Crypto Library
License: GFDL-1.1-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND
MIT
@@ -109,8 +96,6 @@
sed -i "s/libgcrypt\.so\.hmac/\.libgcrypt\.so\.%{libsover}\.hmac/g"
src/Makefile.am src/Makefile.in
%build
-echo building with build_hmac256 set to %{build_hmac256}
-
export PUBKEYS="dsa elgamal rsa ecc"
export CIPHERS="arcfour blowfish cast5 des aes twofish serpent rfc2268 seed
camellia idea salsa20 gost28147 chacha20 sm4"
export DIGESTS="crc gostr3411-94 md4 md5 rmd160 sha1 sha256 sha512 sha3 tiger
whirlpool stribog blake2 sm3"
@@ -139,18 +124,13 @@
%make_build
%check
-%make_build check
+make -k check
# run the regression tests also in FIPS mode
-LIBGCRYPT_FORCE_FIPS_MODE=1 make -k check VERBOSE=1 || true
+LIBGCRYPT_FORCE_FIPS_MODE=1 make -k check || true
# Install the FIPS hmac file
cp src/.libgcrypt.so.%{libsover}.hmac %{buildroot}%{_libdir}/
-# create the FIPS "module is complete" trigger file
-%if 0%{?build_hmac256}
-touch %{buildroot}%{_libdir}/.%{name}.so.%{libsover}.fips
-%endif
-
%install
%make_install
rm %{buildroot}%{_libdir}/%{name}.la
@@ -170,12 +150,7 @@
%dir %{_sysconfdir}/gcrypt
%config(noreplace) %{_sysconfdir}/gcrypt/random.conf
%config(noreplace) %{_sysconfdir}/gcrypt/hwf.deny
-
-%files -n %{libsoname}-hmac
%{_libdir}/.libgcrypt.so.*.hmac
-%if 0%{?build_hmac256}
-%{_libdir}/.libgcrypt.so.*.fips
-%endif
%files devel
%license COPYING COPYING.LIB LICENSES
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.BXNKVA/_old 2023-05-28 19:22:01.972672974 +0200
+++ /var/tmp/diff_new_pack.BXNKVA/_new 2023-05-28 19:22:01.976672998 +0200
@@ -1,8 +1,9 @@
libgcrypt20
- obsoletes "libgcrypt-<targettype> <= <version>"
provides "libgcrypt-<targettype> = <version>"
-libgcrypt20-hmac
+ obsoletes "libgcrypt-<targettype> <= <version>"
+ provides "libgcrypt20-hmac-<targettype> = <version>-%release"
+ obsoletes "libgcrypt20-hmac-<targettype> < <version>-%release"
libgcrypt-devel
- requires -libgcrypt-<targettype>
- requires "libgcrypt20-<targettype> = <version>"
+ requires -libgcrypt-<targettype>
+ requires "libgcrypt20-<targettype> = <version>"
++++++ hwf.deny ++++++
--- /var/tmp/diff_new_pack.BXNKVA/_old 2023-05-28 19:22:01.996673117 +0200
+++ /var/tmp/diff_new_pack.BXNKVA/_new 2023-05-28 19:22:02.000673140 +0200
@@ -1,6 +1,5 @@
# This file can be used to globally disable the use of hardware
# based optimizations. Supported options are:
-
# padlock-rng
# padlock-aes
# padlock-sha
