Accepting request 496936 from Base:System

- skip trust-store tests to avoid build cycle with
  ca-certificates-mozilla, add gnutls-3.5.11-skip-trust-store-tests.patch (forwarded request 495815 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/496936
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=100
This commit is contained in:
Dominique Leuenberger 2017-05-20 12:31:57 +00:00 committed by Git OBS Bridge
parent 071ff154dc
commit 74bc5eea8e
3 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From: Andreas Stieger <astieger@suse.com>
Date: Thu, 18 May 2017 10:31:42 +0200
References: https://build.opensuse.org/request/show/493998
Upstream: never
trust-store test added in
https://gitlab.com/gnutls/gnutls/commit/8d740ae87fae9c1237421dd24825b78103c5da36
need ca-certificates-mozilla to run.
[ 242s] FAIL: trust-store
[ 242s] =================
[ 242s]
[ 242s] doit:64: no certificates were found in system trust store!
[ 242s] FAIL trust-store (exit status: 1)
But this would create a build cycle. Skip test.
Index: gnutls-3.5.11/tests/trust-store.c
===================================================================
--- gnutls-3.5.11.orig/tests/trust-store.c 2017-04-07 07:52:07.000000000 +0200
+++ gnutls-3.5.11/tests/trust-store.c 2017-05-18 10:33:53.537598763 +0200
@@ -44,6 +44,9 @@ static void tls_log_func(int level, cons
void doit(void)
{
+ /* building without ca-certificates-mozilla, skip test */
+ exit(77);
+
gnutls_certificate_credentials_t x509_cred;
int ret;

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 18 08:44:18 UTC 2017 - astieger@suse.com
- skip trust-store tests to avoid build cycle with
ca-certificates-mozilla, add gnutls-3.5.11-skip-trust-store-tests.patch
-------------------------------------------------------------------
Tue May 9 19:55:33 UTC 2017 - astieger@suse.com

View File

@ -41,9 +41,9 @@ Source1: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/%{name}-%{version}.tar.x
Source2: %{name}.keyring
Source3: baselibs.conf
Patch0: gnutls-broken-openpgp-tests.patch
Patch1: gnutls-3.5.11-skip-trust-store-tests.patch
BuildRequires: autogen
BuildRequires: automake
BuildRequires: ca-certificates-mozilla
BuildRequires: datefudge
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -200,6 +200,7 @@ GnuTLS Wrappers for GNU Guile - dialect of scheme.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
export LDFLAGS="-pie"