diff --git a/AusweisApp2-1.24.4-no_brainpool_curves.patch b/AusweisApp2-1.24.4-no_brainpool_curves.patch deleted file mode 100644 index 695e12a..0000000 --- a/AusweisApp2-1.24.4-no_brainpool_curves.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: AusweisApp2-1.24.4/resources/config.json.in -=================================================================== ---- AusweisApp2-1.24.4.orig/resources/config.json.in -+++ AusweisApp2-1.24.4/resources/config.json.in -@@ -75,9 +75,6 @@ - ], - "_comment_2": "prime256v1 := secp256r1", - "ellipticCurves": [ -- "brainpoolP512r1", -- "brainpoolP384r1", -- "brainpoolP256r1", - "secp384r1", - "prime256v1" - ], -@@ -128,9 +125,6 @@ - ], - "_comment_2": "prime256v1 := secp256r1", - "ellipticCurves": [ -- "brainpoolP512r1", -- "brainpoolP384r1", -- "brainpoolP256r1", - "secp384r1", - "prime256v1" - ], -@@ -169,9 +163,6 @@ - "ECDHE-PSK-AES256-CBC-SHA384" - ], - "ellipticCurves": [ -- "brainpoolP512r1", -- "brainpoolP384r1", -- "brainpoolP256r1", - "secp384r1", - "prime256v1" - ], diff --git a/AusweisApp2-1.26.2.tar.gz.asc b/AusweisApp2-1.26.2.tar.gz.asc deleted file mode 100644 index ab59426..0000000 --- a/AusweisApp2-1.26.2.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEaZvzBVsKSSJO/efHLXR5pTFFEIgFAmPH8RwACgkQLXR5pTFF -EIhSaxAAgSWQy2zxSRAqEGym5xVs33CRsw0vKA9yqytTF6XgWiyXd7dcMsRVTJSH -oR8x2hXjLEspFBjwwGkoEyyK7lRFdlvet8zJukjV85p1543Prn0QGiAma421i31O -0QvkoIWu7btMDFwiY3wN/3mAkgigMfbJcNRC7RM+jz9ku/lXivUaPSTJdxTGI7Vx -TdJ1XFIIMj7y0QYcPKn03/L0Qqw4qjNHCoRl1A4qbd0cJQwV3K9MthM7WSseNQwo -FnVDA14eTwlE2DOyoPNOR+emticjMmFdiEbqZHzlK3X2EC+0GBzuTa932Sb7qS75 -zLufg8lMDG3NkAvgNi4iIqoZBHvVMwvof//W4gThwQsytpapx6tgNg0Tvf/OMHUH -WvukaCP7Ca2Vb0URoo3pQMvCKLLLOaV92nPclSBQ/byVtwsfKFX5VZlfczRD8iJ8 -CON1vthP3zEp3QrGdBeq63koSJ1/62pVUfiD9/QhNQOvbxgWEhhwqRKytZagWR/3 -E+EaMGCzgrJ3RtXXORSboEJohKUcuLJ4fXgisdXIpwvFVKNNHF7S6iW8R7li/M9S -GMjcMh8EHakGVdoT0B4+Z4VrKeC2KnuqR3nIYdZGjfAkOUatnqPGNF3ekIDfhPsG -Fwr5ufYBgDr+lmJD2GO0/1pLorn811faK47pICO0qP810EY2woM= -=5ME+ ------END PGP SIGNATURE----- diff --git a/AusweisApp2-1.26.2.tar.gz.sha256 b/AusweisApp2-1.26.2.tar.gz.sha256 deleted file mode 100644 index 44b8566..0000000 --- a/AusweisApp2-1.26.2.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -66b6d4f4df5d1115bdc5540d4c3afd2066e34beadc066195a2d46fc7aaace1a5 AusweisApp2-1.26.2.tar.gz diff --git a/AusweisApp2-1.26.3.tar.gz.asc b/AusweisApp2-1.26.3.tar.gz.asc new file mode 100644 index 0000000..6c14a9d --- /dev/null +++ b/AusweisApp2-1.26.3.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEaZvzBVsKSSJO/efHLXR5pTFFEIgFAmQJz2QACgkQLXR5pTFF +EIhj3A//Xjek0QACcFkLukwiAysStSYDkm6PEkNvJa/Jeq2kVwi2Ai+1BBjjGmUK +shS01+AuQ2EtDM7AkolQvefcu3hutKhx5u/z0Ao6NwhVlA1/Mk1Q8YUarIQSvLXP +njU1OsQ2KGbvDZthIQBQ7ZTIP5E4LrY+zhs5qUxpbfW9stH9AmKuhWiUockZfhk5 +6w/iZYMT894DQWgRN+w00I/ebWSdwmnde0pyL2hWG4DMVqOyIspZQE+kArkGnf86 +sh+ss202VEQGSYZ+GTd/S7DChnXR4XUivvZ18XVX1T7DTJ3bIfgcyQnGyeaN85ge +Mc+i6hSHF7IE+pggMEfSI0L5AyHZMEqb0t8ZGNogeiO9+nNF0PDKnyFc09JgaaPw +oVAZirPbsysz4RLKw83ro4W5vf/s1xXVrYXPfDMRhyswrhUzEnHZu1xpttMH3P45 +RmCB9vAmJjeqWlbGhj57oPWRQU+lhe6yIYAK+RByo/K9caNRBfGMjC9/s4EYHqog +z6SivR/7t5BQa4nwbeA9IS042ErB7RjIqfmWPvEv1R0B3J44bCq/bCDRHqhNtuX7 +qca9dQ6RydJV9wk3Uaq7c0M88rHHvitPN6hOOzXFWiYfu6ht3h9jUyPdqQNNM7fw +pYH3CfDIH7jfWIXJgTDF8vtG+qDQpxNrbXHjjYmyHIgvXiUYH28= +=EJOq +-----END PGP SIGNATURE----- diff --git a/AusweisApp2-1.26.3.tar.gz.sha256 b/AusweisApp2-1.26.3.tar.gz.sha256 new file mode 100644 index 0000000..49a820e --- /dev/null +++ b/AusweisApp2-1.26.3.tar.gz.sha256 @@ -0,0 +1 @@ +a27b186a176f3ba8627e68b14ae33f30bde55fd1524e53d790828840eae42adb AusweisApp2-1.26.3.tar.gz diff --git a/AusweisApp2.spec b/AusweisApp2.spec index f31e5cb..ee1fa9b 100644 --- a/AusweisApp2.spec +++ b/AusweisApp2.spec @@ -36,8 +36,8 @@ fi \ Name: AusweisApp2 -Version: 1.26.2 -Release: 2%{?dist} +Version: 1.26.3 +Release: 1%{?dist} Summary: %{pkg_sum} License: EUPL 1.2 @@ -59,7 +59,6 @@ Source1000: gen_openssl_cnf.py # Downstream. Patch01000: %{name}-1.24.1-use_Qt_TranslationsPath.patch -Patch01001: %{name}-1.24.4-no_brainpool_curves.patch BuildRequires: cmake BuildRequires: crypto-policies @@ -100,16 +99,16 @@ BuildRequires: %{_bindir}/fipshmac # Make sure this package automatically replaces the security hazard # built in some COPR. -Obsoletes: %{name} < 1.20.1 -Obsoletes: %{lc_name} < 1.20.1 +Obsoletes: %{name} < 1.20.1 +Obsoletes: %{lc_name} < 1.20.1 # Provide the lowercase name for convenience as well. -Provides: %{lc_name} = %{version}-%{release} -Provides: %{lc_name}%{?_isa} = %{version}-%{release} +Provides: %{lc_name} = %{version}-%{release} +Provides: %{lc_name}%{?_isa} = %{version}-%{release} # Do not raise conflicts about shared license files. -Requires: %{name}-data = %{version}-%{release} -Requires: (%{name}-doc = %{version}-%{release} if %{name}-doc) +Requires: %{name}-data = %{version}-%{release} +Requires: (%{name}-doc = %{version}-%{release} if %{name}-doc) %if !0%{?qt6_build} # RHBZ#1885310 @@ -117,6 +116,9 @@ Requires: (%{name}-doc = %{version}-%{release} if %{name}-doc) Requires: qt5-qtquickcontrols2%{?_isa} %endif +# Brainpool ECC +Requires: openssl-libs%{?_isa} >= 3.0.8-2 + # Needed for running fipscheck on application startup. # Requires: fipscheck @@ -134,7 +136,7 @@ online ID. Summary: Architecture-independent files used by %{name} BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: hicolor-icon-theme %description data @@ -155,12 +157,12 @@ BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme # Do not raise conflicts about shared license files. -Requires: (%{name} = %{version}-%{release} if %{name}) +Requires: (%{name} = %{version}-%{release} if %{name}) # The doc-api package is faded, since we can ship the # Doxygen documentation noarch'ed as well now. -Obsoletes: %{name}-doc-api < 1.20.1-2 -Provides: %{name}-doc-api = %{version}-%{release} +Obsoletes: %{name}-doc-api < 1.20.1-2 +Provides: %{name}-doc-api = %{version}-%{release} %description doc This package contains the user and API documentation for %{name}. @@ -286,6 +288,7 @@ sed -e 's!^%{buildroot}!!g' > %{lc_name}.icons %check +%ctest appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop @@ -319,6 +322,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Thu Mar 23 2023 Björn Esser - 1.26.3-1 +- New upstream release +- Enable use of Brainpool ECC + * Sat Jan 28 2023 Björn Esser - 1.26.2-2 - Drop Qt6 version lock, as this is already ensured by symbol versioning diff --git a/sources b/sources index 9b51495..affcd6d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (AusweisApp2-1.26.2.tar.gz) = 4e3604b28eded6180dac2b7ce6d86efc7a9b8c23a1cb0f3031fd76223a8d7050cc69a1ce50038ef2f621b7e21623f3cd4a16e557d04ef6239328f07ed69fbba1 +SHA512 (AusweisApp2-1.26.3.tar.gz) = 556ac22be2c8ece2e1360f81946eb32d88e9de91c8ab5c74806bc9dfde286e0a94a3525a86846c9b2947cb3a8c05796897d010d330e03a491ae2df03a3be25d4 SHA512 (AusweisApp2-pubring.gpg) = 3aae27b673f4eb2f7d3bda6c839b3d11829a730bde546e92abb889abb1c2453e786dc906154074485406692f5b9abbb3e1fb293e6b397696b6371016723621cd