diff --git a/SOURCES/mod_nss-remove-deprecated-NSSSessionCacheTimeout.patch b/SOURCES/mod_nss-remove-deprecated-NSSSessionCacheTimeout.patch new file mode 100644 index 0000000..f2eac44 --- /dev/null +++ b/SOURCES/mod_nss-remove-deprecated-NSSSessionCacheTimeout.patch @@ -0,0 +1,41 @@ +From 84b4350da4e77a3cb313e531fa0c2979d74a2503 Mon Sep 17 00:00:00 2001 +From: Vitezslav Cizek +Date: Wed, 14 Sep 2016 14:50:52 -0400 +Subject: [PATCH] Remove deprecated NSSSessionCacheTimeout from default config. + +Signed-off-by: Vitezslav Cizek +--- + nss.conf.in | 2 -- + test/suite1.tmpl | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/nss.conf.in b/nss.conf.in +index 9b9ffc8..09402a8 100644 +--- a/nss.conf.in ++++ b/nss.conf.in +@@ -44,10 +44,8 @@ NSSPassPhraseHelper /usr/libexec/nss_pcache + + # Configure the SSL Session Cache. + # NSSSessionCacheSize is the number of entries in the cache. +-# NSSSessionCacheTimeout is the SSL2 session timeout (in seconds). + # NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds). + NSSSessionCacheSize 10000 +-NSSSessionCacheTimeout 100 + NSSSession3CacheTimeout 86400 + + # +diff --git a/test/suite1.tmpl b/test/suite1.tmpl +index 2c09a89..a1bede1 100644 +--- a/test/suite1.tmpl ++++ b/test/suite1.tmpl +@@ -4,7 +4,6 @@ NSSPassPhraseDialog file:$SERVER_ROOT/conf/password.conf + NSSPassPhraseHelper $SERVER_ROOT/bin/nss_pcache + + NSSSessionCacheSize 10000 +-NSSSessionCacheTimeout 100 + NSSSession3CacheTimeout 86400 + + Listen 0.0.0.0:$SERVER_PORT +-- +2.9.5 + diff --git a/SPECS/mod_nss.spec b/SPECS/mod_nss.spec index 062e1a4..b41102a 100644 --- a/SPECS/mod_nss.spec +++ b/SPECS/mod_nss.spec @@ -6,12 +6,12 @@ Name: mod_nss Version: 1.0.14 -Release: 10%{?dist}.1 +Release: 12%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: ASL 2.0 -URL: https://fedorahosted.org/mod_nss/ -Source: http://fedorahosted.org/released/mod_nss/%{name}-%{version}.tar.gz +URL: https://pagure.io/mod_nss/ +Source: http://releases.pagure.org/mod_nss/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nspr-devel >= 4.10.8, nss-devel >= 3.19.1 BuildRequires: httpd-devel, apr-devel, apr-util-devel @@ -60,6 +60,8 @@ Patch12: mod_nss-pcache_nodbinit.patch Patch13: mod_nss-nss_pcache_man.patch # Fix TLS Session cache Patch14: mod_nss-session_cache.patch +# Remove NSSSessionCacheTimeout from default config +Patch15: mod_nss-remove-deprecated-NSSSessionCacheTimeout.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -83,6 +85,7 @@ security library. %patch12 -p1 -b .pcache_nodbinit %patch13 -p1 -b .pcache_man %patch14 -p1 -b .session_cache +%patch15 -p1 -b .deprecated_sessioncachetimeout # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -197,8 +200,12 @@ fi %{_sbindir}/gencert %changelog -* Wed Jul 19 2017 Rob Crittenden - 1.0.14-10.1 -- TLS session cache was not working (#1479766) +* Fri Nov 3 2017 Rob Crittenden - 1.0.14-12 +- Correct URL and Source entries to point to pagure.io (#1502362) +- Remove deprecated NSSSessionCacheTimeout from default config (#1257662) + +* Wed Jul 19 2017 Rob Crittenden - 1.0.14-11 +- TLS session cache was not working (#1461580) * Wed May 10 2017 Rob Crittenden - 1.0.14-10 - Apply the nss_pcache man page patch (#1382102)