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
This commit is contained in:
Martin Gansser
parent
2d9a6fd428
commit
a7629a8a49
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@
|
||||
/libmicrohttpd-0.9.44.tar.gz
|
||||
/libmicrohttpd-0.9.45.tar.gz
|
||||
/libmicrohttpd-0.9.46.tar.gz
|
||||
/libmicrohttpd-0.9.52.tar.gz
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -1,28 +1,21 @@
|
||||
Summary: Lightweight library for embedding a webserver in applications
|
||||
Name: libmicrohttpd
|
||||
Version: 0.9.46
|
||||
Release: 2%{?dist}
|
||||
Group: Development/Libraries
|
||||
License: LGPLv2+
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
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
|
||||
Name: libmicrohttpd
|
||||
Version: 0.9.52
|
||||
Release: 1%{?dist}
|
||||
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,34 +52,6 @@ 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} = %{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
|
||||
|
||||
@ -94,7 +59,7 @@ Translates incoming SPDY requests to HTTP server on localhost.
|
||||
# Required because patches modify .am files
|
||||
autoreconf --install --force
|
||||
%configure --disable-static --with-gnutls
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
make -C doc/doxygen full
|
||||
|
||||
# Disabled for now due to problems reported at
|
||||
@ -103,8 +68,7 @@ make -C doc/doxygen full
|
||||
#make check %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot}
|
||||
%make_install
|
||||
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
rm -f %{buildroot}%{_infodir}/dir
|
||||
@ -116,9 +80,6 @@ install -m 644 src/examples/*.c examples
|
||||
|
||||
cp -R doc/doxygen/html html
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post doc
|
||||
/sbin/install-info %{_infodir}/libmicrohttpd.info.gz %{_infodir}/dir || :
|
||||
/sbin/install-info %{_infodir}/libmicrohttpd-tutorial.info.gz %{_infodir}/dir || :
|
||||
@ -134,7 +95,7 @@ fi
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING
|
||||
%license COPYING
|
||||
%{_libdir}/libmicrohttpd.so.*
|
||||
|
||||
%files devel
|
||||
@ -152,22 +113,18 @@ 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
|
||||
* 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 Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.46-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user