osc copypac from project:openSUSE:Factory package:gnutls revision:136, using expand

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=138

gnutls-3.7.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f
+size 6131772

gnutls-3.7.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad
-size 6321392

gnutls-FIPS-PBKDF2-KAT-requirements.patch

@@ -1,10 +1,10 @@
-Index: gnutls-3.7.5/lib/crypto-selftests.c
+Index: gnutls-3.7.3/lib/crypto-selftests.c
 ===================================================================
---- gnutls-3.7.5.orig/lib/crypto-selftests.c
-+++ gnutls-3.7.5/lib/crypto-selftests.c
-@@ -3123,6 +3123,16 @@ const struct pbkdf2_vectors_st pbkdf2_sh
- 		    "\x84\xcf\x2b\x17\x34\x7e\xbc\x18\x00\x18\x1c\x4e\x2a\x1f"
- 		    "\xb8\xdd\x53\xe1\xc6\x35\x51\x8c\x7d\xac\x47\xe9"),
+--- gnutls-3.7.3.orig/lib/crypto-selftests.c
++++ gnutls-3.7.3/lib/crypto-selftests.c
+@@ -3112,6 +3112,16 @@ const struct pbkdf2_vectors_st pbkdf2_sh
+ 		    "\x84\x1b\x51\xc9\xb3\x17\x6a\x27\x2b\xde\xbb\xa1\xd0\x78"
+ 		    "\x47\x8f\x62\xb3\x97\xf3\x3c\x8d"),
  	},
 +	/* Test vector extracted from https://dev.gnupg.org/source/libgcrypt/browse/master/cipher/kdf.c */
 +	{

gnutls.changes

@@ -1,24 +1,3 @@
--------------------------------------------------------------------
-Sat May 21 17:50:57 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
-
-- update to 3.7.5:
-  * add options disable session ticket usage in TLS 1.2 because
-    it does not provide forward secrecy
-  * For TLS 1.3 where session tickets do provide forward secrecy,
-    the PFS priority string now only disables session tickets in
-    TLS 1.2.
-  * Future backward incompatibility: in the next major release of
-     GnuTLS those flag and modifier are planned to be removed
-  * gnutls-cli, gnutls-serv: Channel binding for printing
-    information has been changed from tls-unique to tls-exporter
-    as tls-unique is not supported in TLS 1.3.
-  * Certificate sanity checks has been enhanced to make gnutls
-    more RFC 5280 compliant:
-  * Removed 3DES from FIPS approved algorithms
-  * Optimized support for AES-SIV-CMAC algorithms
-  * libgnutls: HKDF and AES-GCM algorithms are now approved in
-    FIPS-140 mode when used in TLS
-
 -------------------------------------------------------------------
 Wed May 11 09:19:52 UTC 2022 - Marcus Meissner <meissner@suse.com>
 

gnutls.spec

@@ -36,7 +36,7 @@
 %bcond_with tpm
 %bcond_without guile
 Name:           gnutls
-Version:        3.7.5
+Version:        3.7.4
 Release:        0
 Summary:        The GNU Transport Layer Security Library
 License:        GPL-3.0-or-later AND LGPL-2.1-or-later
@@ -159,6 +159,7 @@ Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
 Requires:       gnutls = %{version}
 Requires:       libgnutls%{gnutls_sover} = %{version}
+Requires(pre):  %{install_info_prereq}
 Provides:       gnutls-devel = %{version}-%{release}
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
 Requires:       crypto-policies
@@ -185,6 +186,7 @@ Group:          Development/Libraries/C and C++
 Requires:       libgnutls-devel = %{version}
 Requires:       libgnutlsxx%{gnutlsxx_sover} = %{version}
 Requires:       libstdc++-devel
+Requires(pre):  %{install_info_prereq}
 
 %description -n libgnutlsxx-devel
 Files needed for software development using gnutls.
@@ -239,7 +241,7 @@ export CXXFLAGS="%{optflags} -fPIE"
         --with-fips140-module-name="GnuTLS version" \
         --with-fips140-module-version="%{version}-%{release}" \
         %{nil}
-%make_build
+make %{?_smp_mflags}
 
 %install
 %make_install
@@ -266,7 +268,7 @@ rm -rf %{buildroot}%{_datadir}/doc/gnutls
 
 %check
 %if ! 0%{?qemu_user_space_build}
-%make_build check GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null || {
+make %{?_smp_mflags} check GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null || {
     find -name test-suite.log -print -exec cat {} +
     exit 1
 }
@@ -288,6 +290,12 @@ GNUTLS_FORCE_FIPS_MODE=1 make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=
 %post -n libgnutlsxx%{gnutlsxx_sover} -p /sbin/ldconfig
 %postun -n libgnutlsxx%{gnutlsxx_sover} -p /sbin/ldconfig
 
+%post -n libgnutls-devel
+%install_info --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz
+
+%preun -n libgnutls-devel
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz
+
 %files -f libgnutls.lang
 %license LICENSE
 %doc THANKS README.md NEWS ChangeLog AUTHORS doc/TODO
@@ -308,25 +316,20 @@ GNUTLS_FORCE_FIPS_MODE=1 make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=
 %{_mandir}/man1/*
 
 %files -n libgnutls%{gnutls_sover}
-%license LICENSE
 %{_libdir}/libgnutls.so.%{gnutls_sover}*
 
 %files -n libgnutls%{gnutls_sover}-hmac
-%license LICENSE
 %{_libdir}/.libgnutls.so.%{gnutls_sover}*.hmac
 
 %if %{with dane}
 %files -n libgnutls-dane%{gnutls_dane_sover}
-%license LICENSE
 %{_libdir}/libgnutls-dane.so.%{gnutls_dane_sover}*
 %endif
 
 %files -n libgnutlsxx%{gnutlsxx_sover}
-%license LICENSE
 %{_libdir}/libgnutlsxx.so.%{gnutlsxx_sover}*
 
 %files -n libgnutls-devel
-%license LICENSE
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/abstract.h
 %{_includedir}/%{name}/crypto.h
@@ -353,7 +356,6 @@ GNUTLS_FORCE_FIPS_MODE=1 make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=
 
 %if %{with dane}
 %files -n libgnutls-dane-devel
-%license LICENSE
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/dane.h
 %{_libdir}/pkgconfig/gnutls-dane.pc
@@ -361,14 +363,12 @@ GNUTLS_FORCE_FIPS_MODE=1 make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=
 %endif
 
 %files -n libgnutlsxx-devel
-%license LICENSE
 %{_libdir}/libgnutlsxx.so
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/gnutlsxx.h
 
 %if %{with guile}
 %files guile
-%license LICENSE
 %{_libdir}/guile/*
 %{_datadir}/guile/gnutls*
 %endif