diff --git a/disable-stalling-test.patch b/disable-stalling-test.patch index 59e4aac..52c3b35 100644 --- a/disable-stalling-test.patch +++ b/disable-stalling-test.patch @@ -1,13 +1,13 @@ # This test deadlocks too often in OBS -Index: libmicrohttpd-0.9.34/src/testcurl/Makefile.am +Index: libmicrohttpd-0.9.39/src/testcurl/Makefile.am =================================================================== ---- libmicrohttpd-0.9.34.orig/src/testcurl/Makefile.am -+++ libmicrohttpd-0.9.34/src/testcurl/Makefile.am -@@ -23,7 +23,6 @@ endif +--- libmicrohttpd-0.9.39.orig/src/testcurl/Makefile.am ++++ libmicrohttpd-0.9.39/src/testcurl/Makefile.am +@@ -24,7 +24,6 @@ endif if HAVE_CURL check_PROGRAMS = \ - test_start_stop \ - test_quiesce \ test_get \ test_get_sendfile \ + test_urlparse \ diff --git a/libmicrohttpd-0.9.34-spdy-pc.patch b/libmicrohttpd-0.9.34-spdy-pc.patch deleted file mode 100644 index f02f66c..0000000 --- a/libmicrohttpd-0.9.34-spdy-pc.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libmicrohttpd-0.9.34/configure.ac libmicrohttpd-0.9.34-spdy-pc/configure.ac ---- libmicrohttpd-0.9.34/configure.ac 2014-02-24 23:13:03.000000000 +0100 -+++ libmicrohttpd-0.9.34-spdy-pc/configure.ac 2014-03-13 16:47:58.733989222 +0100 -@@ -640,6 +640,7 @@ - - AC_CONFIG_FILES([ - libmicrohttpd.pc -+libmicrospdy.pc - Makefile - contrib/Makefile - doc/Makefile -diff -urN libmicrohttpd-0.9.34/Makefile.am libmicrohttpd-0.9.34-spdy-pc/Makefile.am ---- libmicrohttpd-0.9.34/Makefile.am 2013-05-05 20:48:18.000000000 +0200 -+++ libmicrohttpd-0.9.34-spdy-pc/Makefile.am 2014-03-13 16:35:04.883473986 +0100 -@@ -3,5 +3,5 @@ - EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in libmicrospdy.pc.in - - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = libmicrohttpd.pc -+pkgconfig_DATA = libmicrohttpd.pc libmicrospdy.pc - diff --git a/libmicrohttpd-0.9.34.tar.gz b/libmicrohttpd-0.9.34.tar.gz deleted file mode 100644 index ca27637..0000000 --- a/libmicrohttpd-0.9.34.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29a2bfd4fd2ddf60c756b8c283291a134898e3cc143843be421a040be1b25a88 -size 1141536 diff --git a/libmicrohttpd-0.9.34.tar.gz.sig b/libmicrohttpd-0.9.34.tar.gz.sig deleted file mode 100644 index e6f4bf3..0000000 Binary files a/libmicrohttpd-0.9.34.tar.gz.sig and /dev/null differ diff --git a/libmicrohttpd-0.9.39.tar.gz b/libmicrohttpd-0.9.39.tar.gz new file mode 100644 index 0000000..e29bad1 --- /dev/null +++ b/libmicrohttpd-0.9.39.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f937b6065c366d776be86b1d24b8fc400ebc7ea006a9d77c49a8f2f0cd7e373 +size 1205722 diff --git a/libmicrohttpd-0.9.39.tar.gz.sig b/libmicrohttpd-0.9.39.tar.gz.sig new file mode 100644 index 0000000..ba12108 Binary files /dev/null and b/libmicrohttpd-0.9.39.tar.gz.sig differ diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index 74dd9d1..8694453 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 7 13:44:46 UTC 2015 - prusnak@opensuse.org + +- updated to 0.9.39 +- dropped libmicrohttpd-0.9.34-spdy-pc.patch (included upstream) + ------------------------------------------------------------------- Thu May 8 14:00:36 UTC 2014 - meissner@suse.com diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 92b7c2a..bc8e559 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,7 +1,7 @@ # # spec file for package libmicrohttpd # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010,2011,2012 Stephan Kleine # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,7 @@ %global libmicrohttpd libmicrohttpd10 %global libmicrospdy libmicrospdy0 Name: libmicrohttpd -Version: 0.9.34 +Version: 0.9.39 Release: 0 Summary: Small Embeddable HTTP Server Library License: LGPL-2.1+ @@ -29,8 +29,6 @@ Url: http://gnunet.org/libmicrohttpd/ Source0: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz Source1: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz.sig Source2: libmicrohttpd.keyring -# PATCH-FIX-UPSTREAM: install spdy pc file, from Fedora and already upstream applied -Patch0: libmicrohttpd-0.9.34-spdy-pc.patch # PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS) Patch1: disable-stalling-test.patch # Autotools only due to above patch @@ -122,12 +120,11 @@ localhost. %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 -autoreconf -vi %build +autoreconf -vi %configure \ --enable-bauth --enable-dauth \ --enable-epoll \ diff --git a/libmicrohttpd_test_data.patch b/libmicrohttpd_test_data.patch index d40eaee..82f6e6e 100644 --- a/libmicrohttpd_test_data.patch +++ b/libmicrohttpd_test_data.patch @@ -1,7 +1,7 @@ -Index: libmicrohttpd-0.9.34/src/testcurl/https/test_https_sni.c +Index: libmicrohttpd-0.9.39/src/testcurl/https/test_https_sni.c =================================================================== ---- libmicrohttpd-0.9.34.orig/src/testcurl/https/test_https_sni.c -+++ libmicrohttpd-0.9.34/src/testcurl/https/test_https_sni.c +--- libmicrohttpd-0.9.39.orig/src/testcurl/https/test_https_sni.c ++++ libmicrohttpd-0.9.39/src/testcurl/https/test_https_sni.c @@ -186,7 +186,7 @@ do_get (const char *url) size_t len; struct curl_slist *dns_info; @@ -20,10 +20,10 @@ Index: libmicrohttpd-0.9.34/src/testcurl/https/test_https_sni.c { fprintf (stderr, "Error: local file & received file differ.\n"); free (cbc.buf); -Index: libmicrohttpd-0.9.34/src/testcurl/https/tls_test_common.c +Index: libmicrohttpd-0.9.39/src/testcurl/https/tls_test_common.c =================================================================== ---- libmicrohttpd-0.9.34.orig/src/testcurl/https/tls_test_common.c -+++ libmicrohttpd-0.9.34/src/testcurl/https/tls_test_common.c +--- libmicrohttpd-0.9.39.orig/src/testcurl/https/tls_test_common.c ++++ libmicrohttpd-0.9.39/src/testcurl/https/tls_test_common.c @@ -74,7 +74,7 @@ test_daemon_get (void *cls, char url[255]; size_t len; @@ -74,10 +74,10 @@ Index: libmicrohttpd-0.9.34/src/testcurl/https/tls_test_common.c len) != 0) ) { fprintf (stderr, "Error: local file & received file differ.\n"); -Index: libmicrohttpd-0.9.34/src/testcurl/https/tls_test_common.h +Index: libmicrohttpd-0.9.39/src/testcurl/https/tls_test_common.h =================================================================== ---- libmicrohttpd-0.9.34.orig/src/testcurl/https/tls_test_common.h -+++ libmicrohttpd-0.9.34/src/testcurl/https/tls_test_common.h +--- libmicrohttpd-0.9.39.orig/src/testcurl/https/tls_test_common.h ++++ libmicrohttpd-0.9.39/src/testcurl/https/tls_test_common.h @@ -34,7 +34,7 @@ #define DEAMON_TEST_PORT 4233