From fc600b9d54f519c198842f808e98d17d731d16bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 13 Mar 2015 10:44:45 -0400 Subject: [PATCH] Utilize system-wide crypto policy --- gnutls-utilize-system-crypto-policy.patch | 26 +++++++++++++++++++++++ libmicrohttpd.spec | 10 ++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 gnutls-utilize-system-crypto-policy.patch diff --git a/gnutls-utilize-system-crypto-policy.patch b/gnutls-utilize-system-crypto-policy.patch new file mode 100644 index 0000000..d694de4 --- /dev/null +++ b/gnutls-utilize-system-crypto-policy.patch @@ -0,0 +1,26 @@ +From 20dfcdf8e5699590d63da0b985b8cde5c862e5b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +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)) + { + gnutls_priority_init (&daemon->priority_cache, +- "NORMAL", ++ "@SYSTEM", + NULL); + } + #endif +-- +2.1.0 + diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index b30aee3..f3cd66b 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,12 +1,13 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd Version: 0.9.39 -Release: 1%{?dist} +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 BuildRequires: autoconf, automake, libtool %if 0%{?rhel} == 5 @@ -87,7 +88,7 @@ Translates incoming SPDY requests to HTTP server on localhost. * No error handling for curl requests %prep -%setup -q +%autosetup -p1 %build # Required because patches modify .am files @@ -167,8 +168,11 @@ fi %{_bindir}/microspdy2http %changelog +* Fri Mar 13 2015 Zbigniew Jędrzejewski-Szmek - 0.9.39-2 +- Utilize system crypto policy (#1179314) + * Mon Jan 05 2015 Lukáš Nykrýn - 0.9.39-1 -- Update to latest upstream release 0.9.39 +- Update to latest upstream release 0.9.39 (#1094435) * Sun Aug 17 2014 Fedora Release Engineering - 0.9.34-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild