[mod_gnutls] fix change to use system policy (rhbz#1109115) only on newer fedoras
jkastner
jkastner at fedoraproject.org
Fri Oct 3 14:18:33 UTC 2014
commit 2c69dfe57dc2b0f5fdcfe58555361e118fc39c8b
Author: Jiri Kastner <jkastner at redhat.com>
Date: Fri Oct 3 15:45:11 2014 +0200
fix change to use system policy (rhbz#1109115) only on newer fedoras
mod_gnutls.conf | 1 -
mod_gnutls.spec | 8 +++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/mod_gnutls.conf b/mod_gnutls.conf
index 03a9866..ae8d5c5 100644
--- a/mod_gnutls.conf
+++ b/mod_gnutls.conf
@@ -2,4 +2,3 @@ LoadModule gnutls_module modules/mod_gnutls.so
GnuTLSCache dbm "/var/cache/mod_gnutls"
GnuTLSCacheTimeout 300
-GnuTLSPriorities "@SYSTEM"
diff --git a/mod_gnutls.spec b/mod_gnutls.spec
index 20b723f..3c1e300 100644
--- a/mod_gnutls.spec
+++ b/mod_gnutls.spec
@@ -1,7 +1,7 @@
%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}
Name: mod_gnutls
Version: 0.5.10
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: GnuTLS module for the Apache HTTP server
Group: System Environment/Daemons
License: ASL 2.0
@@ -59,6 +59,9 @@ rm -rf autom4te.cache
rm -rf %{buildroot}
%{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so
%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
+%if 0%{?fedora} >= 21
+echo "GnuTLSPriorities \"@SYSTEM\"" >> %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
+%endif
%clean
rm -rf %{buildroot}
@@ -73,6 +76,9 @@ rm -fr %{_localstatedir}/cache/mod_gnutls
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%changelog
+* Fri Oct 3 2014 Jiri Kastner <jkastner at redhat.com> - 0.5.10-14
+- fix change to use system policy (rhbz#1109115) only on newer fedoras
+
* Fri Sep 12 2014 Jiri Kastner <jkastner at redhat.com> - 0.5.10-13
- config change to use system policy (rhbz#1109115)
More information about the scm-commits
mailing list