Accepting request 591143 from Base:System
OBS-URL: https://build.opensuse.org/request/show/591143 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=109
This commit is contained in:
parent
bb22a0a779
commit
a4e4513bc5
@ -1,22 +1,13 @@
|
||||
Index: gnutls-3.6.0/tests/dtls/Makefile.am
|
||||
Index: gnutls-3.6.2/tests/Makefile.am
|
||||
===================================================================
|
||||
--- gnutls-3.6.0.orig/tests/dtls/Makefile.am 2017-04-19 21:49:27.000000000 +0200
|
||||
+++ gnutls-3.6.0/tests/dtls/Makefile.am 2017-09-20 14:33:56.763416427 +0200
|
||||
@@ -19,7 +19,7 @@
|
||||
# along with this file; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
--- gnutls-3.6.2.orig/tests/Makefile.am 2018-02-16 08:27:16.000000000 +0100
|
||||
+++ gnutls-3.6.2/tests/Makefile.am 2018-03-23 12:07:47.003150907 +0100
|
||||
@@ -330,7 +330,7 @@ if !WINDOWS
|
||||
# List of tests not available/functional under windows
|
||||
#
|
||||
|
||||
-dist_check_SCRIPTS = dtls dtls-nb dtls-resume
|
||||
+dist_check_SCRIPTS = dtls dtls-nb
|
||||
-dist_check_SCRIPTS += dtls/dtls dtls/dtls-resume #dtls/dtls-nb
|
||||
+dist_check_SCRIPTS += dtls/dtls #dtls/dtls-resume #dtls/dtls-nb
|
||||
|
||||
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
AM_CPPFLAGS = \
|
||||
@@ -41,7 +41,7 @@ LDADD = ../../lib/libgnutls.la \
|
||||
if !WINDOWS
|
||||
|
||||
check_PROGRAMS = dtls-stress
|
||||
-TESTS = dtls dtls-resume
|
||||
+TESTS = dtls
|
||||
|
||||
endif
|
||||
indirect_tests += dtls-stress
|
||||
|
||||
|
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 23 11:20:59 UTC 2018 - vcizek@suse.com
|
||||
|
||||
- build without DANE support on SLE-15, as it doesn't have unbound
|
||||
(bsc#1086428)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 23 11:10:59 UTC 2018 - vcizek@suse.com
|
||||
|
||||
- add back refreshed gnutls-3.6.0-disable-flaky-dtls_resume-test.patch
|
||||
the dtls-resume test still keeps randomly failing on PPC
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 23 01:42:49 CET 2018 - ro@suse.de
|
||||
|
||||
- remove gnutls-3.6.0-disable-flaky-dtls_resume-test.patch
|
||||
patch does not apply any more and apparently the build
|
||||
suceeds even if the formerly flaky testcase is run (bsc#1086579)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 15 06:52:49 UTC 2018 - meissner@suse.com
|
||||
|
||||
|
22
gnutls.spec
22
gnutls.spec
@ -19,14 +19,20 @@
|
||||
%define gnutls_sover 30
|
||||
%define gnutlsxx_sover 28
|
||||
%define gnutls_dane_sover 0
|
||||
|
||||
# unbound isn't in SLE-15 (bsc#1086428)
|
||||
%if 0%{?sle_version} == 150000 && !0%{?is_opensuse}
|
||||
%bcond_with dane
|
||||
%else
|
||||
%bcond_without dane
|
||||
%endif
|
||||
%bcond_with tpm
|
||||
%bcond_without guile
|
||||
Name: gnutls
|
||||
Version: 3.6.2
|
||||
Release: 0
|
||||
Summary: The GNU Transport Layer Security Library
|
||||
License: LGPL-2.1+ AND GPL-3.0+
|
||||
License: LGPL-2.1-or-later AND GPL-3.0-or-later
|
||||
Group: Productivity/Networking/Security
|
||||
Url: http://www.gnutls.org/
|
||||
Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/%{name}-%{version}.tar.xz
|
||||
@ -79,7 +85,7 @@ of the IETF's TLS working group.
|
||||
|
||||
%package -n libgnutls%{gnutls_sover}
|
||||
Summary: The GNU Transport Layer Security Library
|
||||
License: LGPL-2.1+
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libgnutls%{gnutls_sover}
|
||||
@ -90,7 +96,7 @@ of the IETF's TLS working group.
|
||||
%if %{with dane}
|
||||
%package -n libgnutls-dane%{gnutls_dane_sover}
|
||||
Summary: The GNU Transport Layer Security Library
|
||||
License: LGPL-2.1+
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Productivity/Networking/Security
|
||||
|
||||
%description -n libgnutls-dane%{gnutls_dane_sover}
|
||||
@ -101,7 +107,7 @@ This package contains the "DANE" part of gnutls.
|
||||
|
||||
%package -n libgnutlsxx%{gnutlsxx_sover}
|
||||
Summary: C++ API for the GNU Transport Layer Security Library
|
||||
License: LGPL-2.1+
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libgnutlsxx%{gnutlsxx_sover}
|
||||
@ -111,7 +117,7 @@ implements the proposed standards of the IETF's TLS working group.
|
||||
|
||||
%package -n libgnutls-devel
|
||||
Summary: Development package for the GnuTLS C API
|
||||
License: LGPL-2.1+
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: glibc-devel
|
||||
Requires: libgnutls%{gnutls_sover} = %{version}
|
||||
@ -124,7 +130,7 @@ Files needed for software development using gnutls.
|
||||
%if %{with dane}
|
||||
%package -n libgnutls-dane-devel
|
||||
Summary: Development package for GnuTLS DANE component
|
||||
License: LGPL-2.1+
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libgnutls-dane%{gnutls_dane_sover} = %{version}
|
||||
|
||||
@ -134,7 +140,7 @@ Files needed for software development using gnutls.
|
||||
|
||||
%package -n libgnutlsxx-devel
|
||||
Summary: Development package for the GnuTLS C++ API
|
||||
License: LGPL-2.1+
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libgnutls-devel = %{version}
|
||||
Requires: libgnutlsxx%{gnutlsxx_sover} = %{version}
|
||||
@ -147,7 +153,7 @@ Files needed for software development using gnutls.
|
||||
%if %{with guile}
|
||||
%package guile
|
||||
Summary: Guile wrappers for gnutls
|
||||
License: LGPL-2.1+
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/Other
|
||||
Requires: guile
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user