Hello community,
here is the log from the commit of package gnutls for openSUSE:Factory checked
in at 2018-12-03 10:09:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnutls (Old)
and /work/SRC/openSUSE:Factory/.gnutls.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnutls"
Mon Dec 3 10:09:09 2018 rev:115 rq:652451 version:3.6.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnutls/gnutls.changes 2018-10-25
08:11:24.528224690 +0200
+++ /work/SRC/openSUSE:Factory/.gnutls.new.19453/gnutls.changes 2018-12-03
10:09:16.167771081 +0100
@@ -1,0 +2,9 @@
+Tue Nov 27 13:46:27 UTC 2018 - jbrielma...@suse.de
+
+- search for guile-2.2 during configure, part of boo#1117121
+ add patches:
+ * gnutls-enbale-guile-2.2.patch: search for guile-2.2
+ refresh patches:
+ * disable-psk-file-test.patch: disable psk-file in Makefile.am
+
+-------------------------------------------------------------------
New:
----
gnutls-enbale-guile-2.2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnutls.spec ++++++
--- /var/tmp/diff_new_pack.yEgkor/_old 2018-12-03 10:09:17.119770203 +0100
+++ /var/tmp/diff_new_pack.yEgkor/_new 2018-12-03 10:09:17.127770196 +0100
@@ -42,6 +42,8 @@
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
+# Search for guile-2.2, which is supported since 3.5.5
+Patch4: gnutls-enbale-guile-2.2.patch
BuildRequires: autogen
BuildRequires: automake
BuildRequires: datefudge
@@ -161,6 +163,7 @@
%setup -q
%patch1 -p1
%patch3 -p1
+%patch4 -p1
# dtls-resume test fails on PPC
%ifarch ppc64 ppc64le ppc
%patch2 -p1
++++++ disable-psk-file-test.patch ++++++
--- /var/tmp/diff_new_pack.yEgkor/_old 2018-12-03 10:09:17.155770170 +0100
+++ /var/tmp/diff_new_pack.yEgkor/_new 2018-12-03 10:09:17.155770170 +0100
@@ -105,3 +105,15 @@
-rm -f ./$(DEPDIR)/pskself.Po
-rm -f ./$(DEPDIR)/pubkey-import-export.Po
-rm -f ./$(DEPDIR)/random-art.Po
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+--- a/tests/Makefile.am 2018-11-21 16:31:27.871806950 +0100
++++ b/tests/Makefile.am 2018-11-21 16:31:47.952191845 +0100
+@@ -167,7 +167,7 @@
+ tls13-cert-key-exchange x509-cert-callback-ocsp
gnutls_ocsp_resp_list_import2 \
+ server-sign-md5-rep privkey-keygen mini-tls-nonblock no-signal
pkcs7-gen dtls-etm \
+ x509sign-verify-rsa x509sign-verify-ecdsa x509sign-verify-gost \
+- mini-alignment oids atfork prf psk-file priority-init2 \
++ mini-alignment oids atfork prf priority-init2 \
+ status-request status-request-ok status-request-missing
sign-verify-ext \
+ fallback-scsv pkcs8-key-decode urls dtls-rehandshake-cert \
+ key-usage-rsa key-usage-ecdhe-rsa mini-session-verify-function
auto-verify \
++++++ gnutls-enbale-guile-2.2.patch ++++++
--- gnutls-3.6.4/aclocal.m4.orig 2018-10-16 17:52:16.972960988 +0200
+++ gnutls-3.6.4/aclocal.m4 2018-10-16 17:52:32.797099492 +0200
@@ -162,7 +162,7 @@
#
AC_DEFUN([GUILE_PKG],
[PKG_PROG_PKG_CONFIG
- _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
+ _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do
--- gnutls-3.6.4/configure.orig 2018-10-16 18:00:13.661141247 +0200
+++ gnutls-3.6.4/configure 2018-10-16 18:00:29.857283556 +0200
@@ -62704,7 +62704,7 @@
PKG_CONFIG=""
fi
fi
- _guile_versions_to_search="2.0 1.8"
+ _guile_versions_to_search="2.2 2.0 1.8"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do
