diff --git a/disable-stalling-test.patch b/disable-stalling-test.patch index 6b02943..34a59f2 100644 --- a/disable-stalling-test.patch +++ b/disable-stalling-test.patch @@ -1,7 +1,7 @@ -Index: libmicrohttpd-0.9.48/src/testcurl/test_start_stop.c +Index: src/testcurl/test_start_stop.c =================================================================== ---- libmicrohttpd-0.9.48.orig/src/testcurl/test_start_stop.c -+++ libmicrohttpd-0.9.48/src/testcurl/test_start_stop.c +--- src/testcurl/test_start_stop.c.orig ++++ src/testcurl/test_start_stop.c @@ -108,21 +108,6 @@ main (int argc, char *const *argv) { unsigned int errorCount = 0; diff --git a/libmicrohttpd-0.9.48.tar.gz b/libmicrohttpd-0.9.48.tar.gz deleted file mode 100644 index 35b911d..0000000 --- a/libmicrohttpd-0.9.48.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87667e158f2bf8c691a002e256ffe30885d4121a9ee4143af0320c47cdf8a2a4 -size 1077473 diff --git a/libmicrohttpd-0.9.48.tar.gz.sig b/libmicrohttpd-0.9.48.tar.gz.sig deleted file mode 100644 index 1560994..0000000 Binary files a/libmicrohttpd-0.9.48.tar.gz.sig and /dev/null differ diff --git a/libmicrohttpd-0.9.49.tar.gz b/libmicrohttpd-0.9.49.tar.gz new file mode 100644 index 0000000..7474211 --- /dev/null +++ b/libmicrohttpd-0.9.49.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9407d8252548ab97ace3276e0032f073820073c0599d43baff832902a8dab11c +size 1087716 diff --git a/libmicrohttpd-0.9.49.tar.gz.sig b/libmicrohttpd-0.9.49.tar.gz.sig new file mode 100644 index 0000000..45d39e9 Binary files /dev/null and b/libmicrohttpd-0.9.49.tar.gz.sig differ diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index e8a448b..1f80aaa 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,7 +1,16 @@ +------------------------------------------------------------------- +Thu Apr 14 18:10:40 UTC 2016 - mpluskal@suse.com + +- Update to 0.9.49 + * See provided Changelog for details +- Fix typo in previous changelog entry +- Refresh patches +- Use pkgconfig style dependencies + ------------------------------------------------------------------- Sun Dec 20 09:24:05 UTC 2015 - mpluskal@suse.com -- Update to 0.9.4 +- Update to 0.9.48 * Improved compatibility with VS2010 and other older compilers. * Default backlog size for listen socket was changed from 32 to SOMAXCONN, added new option MHD_OPTION_LISTEN_BACKLOG_SIZE to diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index c73d7bd..4304c54 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,7 +1,7 @@ # # spec file for package libmicrohttpd # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010,2011,2012 Stephan Kleine # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %global libmicrohttpd libmicrohttpd12 Name: libmicrohttpd -Version: 0.9.48 +Version: 0.9.49 Release: 0 Summary: Small Embeddable HTTP Server Library License: LGPL-2.1+ @@ -33,15 +33,15 @@ Patch1: disable-stalling-test.patch Patch2: libmicrohttpd_test_data.patch BuildRequires: curl BuildRequires: file-devel -BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel >= 1.2.4 -BuildRequires: libgnutls-devel -BuildRequires: libtasn1-devel BuildRequires: libtool BuildRequires: makeinfo BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: socat +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libtasn1) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,7 +72,7 @@ application, check it out. %package -n %{libmicrohttpd} Summary: Small embeddable http server library -Group: System/libraries +Group: System/Libraries %description -n %{libmicrohttpd} Shared library for %{name} (%{summary}). @@ -81,7 +81,8 @@ Shared library for %{name} (%{summary}). Summary: Small Embeddable HTTP Server Library Group: Development/Libraries/C and C++ Requires: %{libmicrohttpd} = %{version} -Requires: libgnutls-devel +Requires: pkg-config +Requires: pkgconfig(gnutls) Requires(post): info Requires(preun): info @@ -91,8 +92,8 @@ Headers, pkg-config files, so link and other development files for %{name} %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch1 +%patch2 %build %configure \ @@ -108,7 +109,7 @@ Headers, pkg-config files, so link and other development files for %{name} make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install find %{buildroot} -type f -name "*.la" -delete -print %check @@ -116,7 +117,6 @@ find %{buildroot} -type f -name "*.la" -delete -print make -j 1 check %post -n %{libmicrohttpd} -p /sbin/ldconfig - %postun -n %{libmicrohttpd} -p /sbin/ldconfig %post devel @@ -137,7 +137,7 @@ make -j 1 check %{_includedir}/microhttpd.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%{_infodir}/%{name}*.info* -%{_mandir}/man3/%{name}.3* +%{_infodir}/%{name}*.info%{ext_info} +%{_mandir}/man3/%{name}.3%{ext_man} %changelog diff --git a/libmicrohttpd_test_data.patch b/libmicrohttpd_test_data.patch index b3f6531..0631450 100644 --- a/libmicrohttpd_test_data.patch +++ b/libmicrohttpd_test_data.patch @@ -1,7 +1,7 @@ -Index: libmicrohttpd-0.9.48/src/testcurl/https/test_https_sni.c +Index: src/testcurl/https/test_https_sni.c =================================================================== ---- libmicrohttpd-0.9.48.orig/src/testcurl/https/test_https_sni.c -+++ libmicrohttpd-0.9.48/src/testcurl/https/test_https_sni.c +--- src/testcurl/https/test_https_sni.c.orig ++++ 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.48/src/testcurl/https/test_https_sni.c { fprintf (stderr, "Error: local file & received file differ.\n"); free (cbc.buf); -Index: libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.c +Index: src/testcurl/https/tls_test_common.c =================================================================== ---- libmicrohttpd-0.9.48.orig/src/testcurl/https/tls_test_common.c -+++ libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.c +--- src/testcurl/https/tls_test_common.c.orig ++++ 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.48/src/testcurl/https/tls_test_common.c len) != 0) ) { fprintf (stderr, "Error: local file & received file differ.\n"); -Index: libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.h +Index: src/testcurl/https/tls_test_common.h =================================================================== ---- libmicrohttpd-0.9.48.orig/src/testcurl/https/tls_test_common.h -+++ libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.h +--- src/testcurl/https/tls_test_common.h.orig ++++ src/testcurl/https/tls_test_common.h @@ -34,7 +34,7 @@ #define DEAMON_TEST_PORT 4233