diff --git a/libmicrohttpd-0.9.66-fix-gnutls-dependency.patch b/libmicrohttpd-0.9.66-fix-gnutls-dependency.patch new file mode 100644 index 0000000..4e2bdc9 --- /dev/null +++ b/libmicrohttpd-0.9.66-fix-gnutls-dependency.patch @@ -0,0 +1,31 @@ +From b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f Mon Sep 17 00:00:00 2001 +From: Christian Grothoff +Date: Fri, 2 Aug 2019 15:43:44 +0200 +Subject: [PATCH] trying to fix #5806 +References: https://bugs.gnunet.org/view.php?id=5806 + +--- + src/microhttpd/daemon.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c +index bf01ba9b..a8fc98c6 100644 +--- a/src/microhttpd/daemon.c ++++ b/src/microhttpd/daemon.c +@@ -2536,7 +2536,12 @@ internal_add_connection (struct MHD_Daemon *daemon, + else + { + #ifdef HTTPS_SUPPORT +- gnutls_init_flags_t flags; ++#if (GNUTLS_VERSION_NUMBER+0 >= 0x030500) ++ gnutls_init_flags_t ++#else ++ unsigned int ++#endif ++ flags; + + flags = GNUTLS_SERVER; + #if (GNUTLS_VERSION_NUMBER+0 >= 0x030402) +-- +2.16.4 + diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index deb9e30..df19c34 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 2 13:53:59 UTC 2019 - Andreas Stieger + +- fix build with SLE 12 with older GnuTLS: + * libmicrohttpd-0.9.66-fix-gnutls-dependency.patch + ------------------------------------------------------------------- Fri Aug 2 10:53:30 UTC 2019 - Andreas Stieger diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index abbd245..51be710 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -31,13 +31,12 @@ URL: https://www.gnu.org/software/libmicrohttpd/ Source0: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz Source1: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{name}&download=1#/%{name}.keyring +Patch0: libmicrohttpd-0.9.66-fix-gnutls-dependency.patch BuildRequires: libtool BuildRequires: makeinfo BuildRequires: pkgconfig >= 0.9.0 BuildRequires: socat -# see https://bugs.gnunet.org/view.php?id=5806 -# BuildRequires: pkgconfig(gnutls) >= 2.8.6 -BuildRequires: pkgconfig(gnutls) >= 3.5.0 +BuildRequires: pkgconfig(gnutls) >= 2.8.6 BuildRequires: pkgconfig(libcurl) >= 7.16.4 %description @@ -90,6 +89,7 @@ Headers, pkg-config files, so link and other development files for %{name} %prep %setup -q +%patch0 -p1 %build %configure \