Backport mozbz#1334976 and mozbz#1336487

This commit is contained in:
Daiki Ueno 2017-03-29 10:40:20 +02:00
parent 88a7dca599
commit 75d7e4f171
2 changed files with 3288 additions and 1 deletions

3282
nss-1334976-1336487.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -21,7 +21,7 @@ Name: nss
Version: 3.29.3 Version: 3.29.3
# for Rawhide, please always use release >= 2 # for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...) # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
Release: 1.0%{?dist} Release: 1.1%{?dist}
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -112,6 +112,7 @@ Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch
Patch59: nss-check-policy-file.patch Patch59: nss-check-policy-file.patch
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1280846 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1280846
Patch62: nss-skip-util-gtest.patch Patch62: nss-skip-util-gtest.patch
Patch63: nss-1334976-1336487.patch
%description %description
Network Security Services (NSS) is a set of libraries designed to Network Security Services (NSS) is a set of libraries designed to
@ -195,6 +196,7 @@ low level services.
pushd nss pushd nss
%patch59 -p1 -b .check_policy_file %patch59 -p1 -b .check_policy_file
%patch62 -p0 -b .skip_util_gtest %patch62 -p0 -b .skip_util_gtest
%patch63 -p1 -b .1334976-1336487
popd popd
######################################################### #########################################################
@ -803,6 +805,9 @@ fi
%changelog %changelog
* Wed Mar 29 2017 Daiki Ueno <dueno@redhat.com> - 3.29.3-1.1
- Backport mozbz#1334976 and mozbz#1336487, from F26
* Mon Mar 20 2017 Daiki Ueno <dueno@redhat.com> - 3.29.3-1.0 * Mon Mar 20 2017 Daiki Ueno <dueno@redhat.com> - 3.29.3-1.0
- Rebase to NSS 3.29.3 - Rebase to NSS 3.29.3
- Remove upstreamed patch for fixing crash in tls13_DestroyKeyShares - Remove upstreamed patch for fixing crash in tls13_DestroyKeyShares