rpms/libmicrohttpd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Enable HTTPS with --enable-https=yes

Browse Source 
Re-add gnutls-utilize-system-crypto-policy.patch
Add epoch to allow update of higher release version
This commit is contained in:
Martin Gansser 2017-01-30 16:49:08 +01:00
parent e7298c13c2
commit 98ce3dc810
3 changed files with 35 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnutls-utilize-system-crypto-policy.patch
View File

@ -1,26 +1,11 @@
From 20dfcdf8e5699590d63da0b985b8cde5c862e5b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 13 Mar 2015 10:35:43 -0400
Subject: [PATCH] Utilize system crypto policy for gnutls
https://fedoraproject.org/wiki/Packaging:CryptoPolicies
---
src/microhttpd/daemon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index dbe0cb58f9..41e35a4f8e 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3472,7 +3472,7 @@ MHD_start_daemon_va (unsigned int flags,
if (0 != (flags & MHD_USE_SSL))
--- libmicrohttpd-0.9.52/src/microhttpd/daemon.c.orig 2017-01-13 19:54:48.203411920 +0100
+++ libmicrohttpd-0.9.52/src/microhttpd/daemon.c 2017-01-13 19:55:22.286061143 +0100
@@ -4486,7 +4486,7 @@
if (0 != (flags & MHD_USE_TLS))
{
gnutls_priority_init (&daemon->priority_cache,
- "NORMAL",
+ "@SYSTEM",
+ "@SYSTEM",
NULL);
}
#endif
--
2.1.0

88
libmicrohttpd.spec
View File

@ -1,28 +1,24 @@
Summary: Lightweight library for embedding a webserver in applications
Name: libmicrohttpd
Version: 0.9.46
Release: 4%{?dist}
Version: 0.9.52
Release: 3%{?dist}
Epoch: 1
Group: Development/Libraries
Summary: Lightweight library for embedding a webserver in applications
License: LGPLv2+
URL: http://www.gnu.org/software/libmicrohttpd/
Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
Patch0: gnutls-utilize-system-crypto-policy.patch
BuildRequires: autoconf, automake, libtool
BuildRequires: autoconf, automake, libtool, gettext-devel
%if 0%{?rhel} == 5
BuildRequires: curl-devel
BuildRequires: curl-devel
%endif
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
BuildRequires: libcurl-devel
BuildRequires: libcurl-devel
%endif
BuildRequires: gnutls-devel
# for microspdy
BuildRequires: openssl-devel
BuildRequires: libgcrypt-devel
BuildRequires: graphviz
BuildRequires: doxygen
Requires(post): info
Requires(preun): info
@ -59,41 +55,13 @@ BuildArch: noarch
%description doc
Doxygen documentation for libmicrohttpd and some example source code
%package -n libmicrospdy
Summary: Lightweight library for embedding a webserver using the SPDY protocol
Group: Development/Libraries
%description -n libmicrospdy
GNU libmicrospdy is a small C library that is supposed to make it
easy to run a SPDY server as part of another application.
The library is part of the libmicrohttpd project and source tree
and shared its advantages of being fast aand small with a simple API.
%package -n libmicrospdy-devel
Summary: Development files for libmicrospdy
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n libmicrospdy-devel
Development files for libmicrospdy
%package -n microspdy2http
Summary: Translates incoming SPDY requests to http server on localhost
Group: Applications/Internet
%description -n microspdy2http
Translates incoming SPDY requests to HTTP server on localhost.
* Uses libcurl
* No error handling for curl requests
%prep
%autosetup -p1
%build
# Required because patches modify .am files
autoreconf --install --force
%configure --disable-static --with-gnutls
%configure --disable-static --with-gnutls --enable-https=yes
%make_build
make -C doc/doxygen full
@ -129,18 +97,16 @@ fi
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING
%doc README
%license COPYING
%{_libdir}/libmicrohttpd.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/microhttpd.h
%{_libdir}/libmicrohttpd.so
%{_libdir}/pkgconfig/libmicrohttpd.pc
%files doc
%defattr(-,root,root,-)
%{_mandir}/man3/libmicrohttpd.3.gz
%{_infodir}/libmicrohttpd.info.gz
%{_infodir}/libmicrohttpd-tutorial.info.gz
@ -148,26 +114,30 @@ fi
%doc examples
%doc html
%files -n libmicrospdy
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libmicrospdy.so.*
%files -n libmicrospdy-devel
%defattr(-,root,root,-)
%{_includedir}/microspdy.h
%{_libdir}/libmicrospdy.so
%{_libdir}/pkgconfig/libmicrospdy.pc
%files -n microspdy2http
%defattr(-,root,root,-)
%{_bindir}/microspdy2http
%changelog
* Sat Jan 28 2017 Martin Gansser <martinkg@fedoraproject.org> - 0.9.46-4
* Sun Jan 29 2017 Martin Gansser <martinkg@fedoraproject.org> - 0.9.52-3
- Enable HTTPS with --enable-https=yes
- Re-add gnutls-utilize-system-crypto-policy.patch
- Add epoch to allow update of higher release version
* Thu Jan 26 2017 Martin Gansser <martinkg@fedoraproject.org> - 0.9.52-2
- Dropped gnutls-utilize-system-crypto-policy.patch
* Fri Jan 13 2017 Martin Gansser <martinkg@fedoraproject.org> - 0.9.52-1
- Update to 0.9.52
- Dropped subpkg microspdy2http because it's dead
- Adjust gnutls-utilize-system-crypto-policy.patch
- Use %%make_build
- Use %%make_install
- Use %%license
- Cleanup Specfile
- Add BR gettext-devel
* Thu Jan 12 2017 Martin Gansser <martinkg@fedoraproject.org> - 0.9.46-4
- roolback to release 0.9.46 again, because 0.9.52 does not work
* Fri Jan 27 2017 Martin Gansser <martinkg@fedoraproject.org> - 0.9.46-3
* Wed Jan 11 2017 Martin Gansser <martinkg@fedoraproject.org> - 0.9.46-3
- Add epoch to allow update of higher release version
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.46-2

2
sources
View File

@ -1 +1 @@
SHA512 (libmicrohttpd-0.9.46.tar.gz) = d45cd6e8ca1fb0e4d42110fa6ae5b49823d1b2ce66dd82d8b68757b79bf441e4103301af9437886b2c5d3296102ed8da17933a573da9649e7359305f8e678e46
SHA512 (libmicrohttpd-0.9.52.tar.gz) = 2cb7fa6ed59ec5f48748cd2aedea8a68629f02ffcf8e86c6d5b57a6622bb5f0ffd7dabfd6c04cc99047ca81eb76efe2a79b34bd6e3de329261a319369232fcf4