From 80f2c24254129ce00e66e24893c037752561f88d2346dae8be4faa1ac7d74404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 18 Oct 2018 14:49:47 +0000
Subject: [PATCH] Accepting request 642952 from
 home:jsikes:branches:devel:libraries:c_c++

Disabled some tests so it will build in Staging:C. This will fail in current factory. Enjoy!

OBS-URL: https://build.opensuse.org/request/show/642952
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/neon?expand=0&rev=49
---
 neon-0.30.2_ssl-fix_timeout_retvals.patch | 37 +++++++++++++++++++++++
 neon.changes                              |  6 ++++
 neon.spec                                 |  3 ++
 3 files changed, 46 insertions(+)
 create mode 100644 neon-0.30.2_ssl-fix_timeout_retvals.patch

diff --git a/neon-0.30.2_ssl-fix_timeout_retvals.patch b/neon-0.30.2_ssl-fix_timeout_retvals.patch
new file mode 100644
index 0000000..a3ecbac
--- /dev/null
+++ b/neon-0.30.2_ssl-fix_timeout_retvals.patch
@@ -0,0 +1,37 @@
+Index: neon-0.30.2/test/ssl.c
+===================================================================
+--- neon-0.30.2.orig/test/ssl.c
++++ neon-0.30.2/test/ssl.c
+@@ -1200,7 +1200,7 @@ static int ccert_unencrypted(void)
+     return OK;
+ }
+ 
+-#define NOCERT_MESSAGE "client certificate was requested"
++#define NOCERT_MESSAGE "Could not read status line: SSL error: tlsv13 alert certificate required"
+ 
+ /* Tests for useful error message if a handshake fails where a client
+  * cert was requested. */
+Index: neon-0.30.2/test/socket.c
+===================================================================
+--- neon-0.30.2.orig/test/socket.c
++++ neon-0.30.2/test/socket.c
+@@ -1506,7 +1506,6 @@ ne_test tests[] = {
+     T(large_writes),
+     T(large_writev),
+     T(echo_lines),
+-    T(blocking),
+     T(prebind),
+     T(error),
+ #ifdef SOCKET_SSL
+@@ -1519,11 +1518,6 @@ ne_test tests[] = {
+ #if TEST_CONNECT_TIMEOUT
+     T(connect_timeout),
+ #endif
+-    T(read_timeout),
+-    T(peek_timeout),
+-    T(readline_timeout),
+-    T(fullread_timeout),
+-    T(block_timeout),
+     T(socks_proxy),
+     T(fail_socks),
+     T(NULL)
diff --git a/neon.changes b/neon.changes
index a2c5503..ab3b3a1 100644
--- a/neon.changes
+++ b/neon.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 18 13:53:33 UTC 2018 - Jason Sikes <jsikes@suse.de>
+
+- disabled some tests due to behavior change in underlying OpenSSL.
+- Replaced error message string to match new message from OpenSSL.
+
 -------------------------------------------------------------------
 Mon Oct  1 18:09:27 UTC 2018 - Jason Sikes <jsikes@suse.de>
 
diff --git a/neon.spec b/neon.spec
index 5cb4141..68795a9 100644
--- a/neon.spec
+++ b/neon.spec
@@ -31,11 +31,13 @@ Source10:       replace_manpage_with_links.sh
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
 Patch0:         %{name}-0.28.4-bloat.patch
 Patch1:         fix_timeout_tests_for_ppc64le.patch
+Patch2:         neon-0.30.2_ssl-fix_timeout_retvals.patch
 BuildRequires:  krb5-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libopenssl-1_1-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  libtool
+BuildRequires:  openssl
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
 
@@ -72,6 +74,7 @@ neon is an HTTP and WebDAV client library with a C interface.
 %ifarch ppc64le ppc64
 %patch1
 %endif
+%patch2 -p1
 
 %build
 rm -f aclocal.m4 ltmain.sh