|
|
@@ -2,8 +2,8 @@
|
|
|
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
-%define nspr_version 4.13.1
|
|
|
-%define pem_version 1.0.3
|
|
|
+%define nspr_version 4.20
|
|
|
+%define pem_version 1.0.4
|
|
|
%define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
|
|
|
%global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
|
|
|
|
|
|
@@ -29,7 +29,7 @@
|
|
|
|
|
|
Summary: Network Security Services
|
|
|
Name: nss
|
|
|
-Version: 3.33
|
|
|
+Version: 3.40
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
|
|
URL: http://www.mozilla.org/projects/security/pki/nss/
|
|
|
@@ -60,15 +60,13 @@ Source102: nss-util-config.in
|
|
|
Source103: nss-softokn.pc.in
|
|
|
Source104: nss-softokn-config.in
|
|
|
|
|
|
-Source1000: https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.3/nss-pem-%{pem_version}.tar.xz
|
|
|
+Source1000: https://github.com/kdudka/nss-pem/releases/download/nss-pem-%{pem_version}/nss-pem-%{pem_version}.tar.xz
|
|
|
Source1001: pem-makefile.tar.gz
|
|
|
|
|
|
Patch2: add-relro-linker-option.patch
|
|
|
Patch3: renegotiate-transitional.patch
|
|
|
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=617723
|
|
|
Patch16: nss-539183.patch
|
|
|
-# TODO: Remove this patch when the ocsp test are fixed
|
|
|
-Patch40: nss-3.14.0.0-disble-ocsp-test.patch
|
|
|
# Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator
|
|
|
Patch47: utilwrap-include-templates.patch
|
|
|
# TODO remove when we switch to building nss without softoken
|
|
|
@@ -87,11 +85,10 @@ Patch49: nss-skip-bltest-and-fipstest.patch
|
|
|
Patch50: iquote.patch
|
|
|
# Local patch for TLS_ECDHE_{ECDSA|RSA}_WITH_3DES_EDE_CBC_SHA ciphers
|
|
|
Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch
|
|
|
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1279520
|
|
|
-Patch59: nss-check-policy-file.patch
|
|
|
Patch62: nss-skip-util-gtest.patch
|
|
|
|
|
|
Patch1000: nss-enable-pem.patch
|
|
|
+Patch1001: nss-pem-fix-shadowed-vars.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
@@ -171,12 +168,12 @@ v3 certificates, and other security standards.
|
|
|
pushd nss/lib/ckfw/pem/
|
|
|
tar xvf %{SOURCE1001}
|
|
|
perl -pi -e 's/^#define USE_UTIL_DIRECTLY.*$//' ckpem.h
|
|
|
+%patch1001 -p2 -b .shadowed_vars
|
|
|
popd
|
|
|
|
|
|
%patch2 -p0 -b .relro
|
|
|
%patch3 -p0 -b .transitional
|
|
|
%patch16 -p0 -b .539183
|
|
|
-%patch40 -p0 -b .noocsptest
|
|
|
%patch50 -p0 -b .iquote
|
|
|
pushd nss
|
|
|
%patch62 -p1 -b .skip_util_gtest
|
|
|
@@ -626,6 +623,12 @@ chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Nov 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.40-1
|
|
|
+- update to 3.40.
|
|
|
+- dropped Patch40,59.
|
|
|
+- updated Patch3.
|
|
|
+- added Patch1001.
|
|
|
+
|
|
|
* Mon Oct 09 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.33-1
|
|
|
- update to 3.33.
|
|
|
|
tomop