Accepting request 720091 from home:AndreasStieger:branches:security:tls

gnutls 3.6.9

OBS-URL: https://build.opensuse.org/request/show/720091
OBS-URL: https://build.opensuse.org/package/show/security:tls/gnutls?expand=0&rev=22

gnutls.spec

@@ -19,7 +19,6 @@
 %define gnutls_sover 30
 %define gnutlsxx_sover 28
 %define gnutls_dane_sover 0
-
 # unbound isn't in SLE (bsc#1086428)
 %if 0%{?is_opensuse}
 %bcond_without dane
@@ -29,26 +28,23 @@
 %bcond_with tpm
 %bcond_without guile
 Name:           gnutls
-Version:        3.6.7
+Version:        3.6.9
 Release:        0
 Summary:        The GNU Transport Layer Security Library
 License:        LGPL-2.1-or-later AND GPL-3.0-or-later
 Group:          Productivity/Networking/Security
-Url:            http://www.gnutls.org/
+URL:            https://www.gnutls.org/
 Source0:        ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/%{name}-%{version}.tar.xz
 Source1:        ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/%{name}-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
 Patch1:         gnutls-3.5.11-skip-trust-store-tests.patch
-Patch2:         gnutls-3.6.0-disable-flaky-dtls_resume-test.patch
-Patch3:         disable-psk-file-test.patch
 Patch4:         gnutls-3.6.6-set_guile_site_dir.patch
 BuildRequires:  autogen
 BuildRequires:  automake
 BuildRequires:  datefudge
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  pkgconfig(autoopts)
 # The test suite calls /usr/bin/ss from iproute2. It's our own duty to ensure we have it present
 BuildRequires:  iproute2
 BuildRequires:  libidn2-devel
@@ -61,6 +57,7 @@ BuildRequires:  p11-kit-devel >= 0.23.1
 BuildRequires:  pkgconfig
 BuildRequires:  xz
 BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(autoopts)
 %if 0%{?suse_version} <= 1320
 BuildRequires:  net-tools
 %else
@@ -161,12 +158,7 @@ GnuTLS Wrappers for GNU Guile, a dialect of Scheme.
 %prep
 %setup -q
 %patch1 -p1
-%patch3 -p1
 %patch4 -p1
-# dtls-resume test fails on PPC
-%ifarch ppc64 ppc64le ppc
-%patch2 -p1
-%endif
 
 %build
 export LDFLAGS="-pie"
@@ -201,7 +193,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 # install docs
 mkdir -p %{buildroot}%{_docdir}/libgnutls-devel/
-cp doc/gnutls.html doc/*.png doc/gnutls.pdf %{buildroot}%{_docdir}/libgnutls-devel/
+cp doc/gnutls.html doc/*.png %{buildroot}%{_docdir}/libgnutls-devel/
 mkdir -p %{buildroot}%{_docdir}/libgnutls-devel/reference
 cp doc/reference/html/* %{buildroot}%{_docdir}/libgnutls-devel/reference/
 mkdir -p %{buildroot}%{_docdir}/libgnutls-devel/examples