Merge pull request 'Update to 3.6.1' (#9) from ayankov/Botan:3.6.1_update into factory

In some rare conditions, Botan 3.6.0 has problems with Processors, see:
https://botan.randombit.net/news.html#version-3-6-1-2024-10-26

Botan-2.19.5.tar.xz.asc

@@ -1,12 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEYh2vZBHhhRxM+aLhYhHr8e+637wFAmaL/agACgkQYhHr8e+6
-37wGJggAnreZh5SxH/FQTgeLtLD+Fb11cnyBstQeWuJq0Np/bPSsEzwgMLu9F/0/
-DWOH74eDLds8FUhh/w39bOkNgd2r6FTBLjnN1g8M86jsTg7ILlG04tbc1GF79Mx8
-GxDBdfNsKmqKEzVJBWHbwnqjvOR9oO2bdKLe2NCJ9jyrw5xyHNhfOEG7zXzpfFFN
-DM16kl2OVYnYrbDQyVGW9JNi+038qyR3fBfkWInOd8WoiimrOTk5+HuBL06RhWGN
-yiHT9P5AK/45fhCcs0yFiUpfrz85MfqqT6vIygV7v2fDElfpTX12LB1I7id8QyDN
-m9gqpB0mP0ewxaO0sIuV0UXk+ntfDg==
-=IUJq
------END PGP SIGNATURE-----
-

Botan-3.6.1.tar.xz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEYh2vZBHhhRxM+aLhYhHr8e+637wFAmccy+oACgkQYhHr8e+6
+37z+nAgAkCc0snrZv7Nl5pkI5k8NC54nBjDwJDBGrIkm4LnyYwJiF5ZLwlAp8HrX
+2gZ4Rn9VNmMj4bW2JyCWoaia4j/5GXawscJ4AIY4ECJSkF0ye4VLKmYZIiRNiNQX
+Db3W9df5mUQI7DogcBQBHjsq2qNcHot3DRZTsQOIZioS3pMxVS/2IWWTaSkzrS8c
+bg3TfeeeBl1WfUoDL8ybNWjMUQxEi+6D0Fv3FROqv4CielTg8SnoN7FJSnq0mTJI
+6/cMv6nC/W+E2HT3IAYyIq0t6NYBNsjJ+8SniY3nPosVHZiHzRLqMRw3RMXiy41J
+Dmp/IDo65ww/SSuaII+HtbHIsKijJw==
+=y+M3
+-----END PGP SIGNATURE-----

Botan.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Tue Nov  5 08:16:35 UTC 2024 - Stephan Hemeier <Sauerlandlinux@gmx.de>
+
+- Botan 3.6.1, the latest stable release of the Botan 3 series 
+
+  * Notice: Botan 3.7.0 will remove support for the currently supported experimental Kyber r3 TLS ciphersuites, leaving only the standardized ML-KEM suites. (GH #4407 #4403)
+  * Fix a bug in x86 CPUID detection introduced in 3.6.0 which would cause crashes on systems which have BMI1 but not BMI2. (GH #4402 #4401)
+  * Fix a bug in SLH-DSA signing, which did not default to the FIPS required randomized variant. (GH #4398)
+  * Modify how elliptic curve blinding is performed, reducing the number of self-additions that may occur during multiplication. (GH #4408)
+  * In speed command line utility, also iterate keygen several times. (GH #4381)
+
+-------------------------------------------------------------------
+Fri Oct 25 12:47:42 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
+
+- Botan 3.6.0, the latest stable release of the Botan 3 series
+
+* Fully integrate and further optimize the new ECC library first introduced in 3.5.0. For common curves, operations are 2 to 3 times faster. This also introduces a new API for low level EC operations, such a point multiplication, using EC_Scalar and EC_AffinePoint types
+* Add support for AVX2-VAES instructions
+* Add support for new ECC curves
+* Fix: CVE-2024-50382
+
+For full changelog, see: https://botan.randombit.net/news.html#version-3-6-0-2024-10-21
+
+-------------------------------------------------------------------
+Tue Jul 30 19:37:33 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Botan 3.5.0, the latest stable release of the Botan 3 series
+  * TLS 1.3 supported
+  * large header cleanup compared to v2
+  * start support of Post Quantum Crypto
+  * removed: CAST-256, MISTY1, Kasumi, DESX, XTEA, PBKDF1, MCEIES,
+    CBC-MAC, Tiger, CECPQ1, and NewHope
+- The legacy Botan 2 series moved to Botan2 source package. It is
+  EOL at the end of 2024.
+
 -------------------------------------------------------------------
 Mon Jul 15 05:50:55 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
 

Botan.spec

@@ -2,6 +2,7 @@
 # spec file for package Botan
 #
 # Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +17,10 @@
 #
 
 
-%{!?make_build: %define make_build make %{?_smp_mflags}}
+%define version_suffix 3-6
-%define version_suffix 2-19
+%define short_version 3
-%define short_version 2
 Name:           Botan
-Version:        2.19.5
+Version:        3.6.1
 Release:        0
 Summary:        A C++ Crypto Library
 License:        BSD-2-Clause
@@ -31,7 +31,7 @@ Source1:        https://botan.randombit.net/releases/Botan-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
 BuildRequires:  bzip2 >= 1.0.2
-BuildRequires:  gcc-c++
+BuildRequires:  c++_compiler
 BuildRequires:  libbz2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python3
@@ -39,6 +39,9 @@ BuildRequires:  trousers-devel
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(sqlite3)
+%if 0%{?suse_version} < 1600
+BuildRequires:  gcc12-c++
+%endif
 
 %description
 Botan is a C++ library that provides support for many common
@@ -89,11 +92,15 @@ BuildArch:      noarch
 Documentation of Botan package.
 
 %prep
-%setup -q -n Botan-%{version}
+%autosetup -n Botan-%{version}
 
 %build
 %define _lto_cflags %{nil}
 export RPM_OPT_FLAGS
+%if 0%{?suse_version} < 1600
+export CC=gcc-12
+export CXX=g++-12
+%endif
 python3 ./configure.py \
   --prefix=%{_prefix} \
   --bindir=%{_bindir} \
@@ -103,7 +110,6 @@ python3 ./configure.py \
   --with-bzip2 \
   --with-zlib \
   --with-lzma \
-  --with-openmp \
   --with-sqlite \
   --with-tpm \
 %ifarch %{ix86}
@@ -122,30 +128,36 @@ python3 ./configure.py \
 sed -i 's/env python/env python3/' src/scripts/install.py
 %make_install
 rm -f %{buildroot}/%{_libdir}/libbotan*.a
-chmod +x %{buildroot}%{python3_sitearch}/botan2.py
+chmod +x %{buildroot}%{python3_sitearch}/botan3.py
-sed -i '1s@^#!/.*@#!%{_bindir}/python3@' %{buildroot}%{python3_sitearch}/botan2.py
+sed -i '1s@^#!/.*@#!%{_bindir}/python3@' %{buildroot}%{python3_sitearch}/botan3.py
-
-rm %{buildroot}%{_bindir}/botan
 
 %check
 %make_build check
 
-%post -n libbotan-%{version_suffix} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libbotan-%{version_suffix}
-%postun -n libbotan-%{version_suffix} -p /sbin/ldconfig
+
+%files
+%license license.txt
+%{_bindir}/botan
 
 %files doc
+%license license.txt
 %docdir %{botan_docdir}
 %{botan_docdir}
 
 %files -n libbotan-%{version_suffix}
+%license license.txt
 %{_libdir}/libbotan-%{short_version}.so.*
 
 %files -n libbotan-devel
+%license license.txt
 %{_libdir}/libbotan-%{short_version}.so
 %{_libdir}/pkgconfig/botan-%{short_version}.pc
 %{_includedir}/botan-%{short_version}
+%{_libdir}/cmake
 
 %files -n python3-botan
-%{python3_sitearch}/botan2.py
+%license license.txt
+%{python3_sitearch}/botan3.py
 
 %changelog

baselibs.conf

@@ -1,4 +1,4 @@
-libbotan-2-19
+libbotan-3-6
 libbotan-devel
 	requires -libbotan-<targettype> = <version>
-	requires "libbotan-2-19-<targettype> = <version>"
+	requires "libbotan-3-6-<targettype> = <version>"