From 405310c9463fecadb75ed32df17680b275d59354 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Mon, 24 Apr 2017 09:50:22 +0200
Subject: [PATCH] Rebase to NSS 3.30.2

---
 .gitignore |  1 +
 nss.spec   | 18 +++++++++---------
 sources    |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index c60fdcf..a6cc36c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ TestUser51.cert
 /nss-3.29.0.tar.gz
 /nss-3.29.1.tar.gz
 /nss-3.30.0.tar.gz
+/nss-3.30.2.tar.gz
diff --git a/nss.spec b/nss.spec
index 9aa1abe..17937bb 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.13.1
-%global nss_util_version 3.30.0
-%global nss_softokn_version 3.30.0
+%global nspr_version 4.14.0
+%global nss_util_version 3.30.2
+%global nss_softokn_version 3.30.2
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"
 
@@ -18,10 +18,10 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.30.0
+Version:          3.30.2
 # for Rawhide, please always use release >= 2
 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release:          3%{?dist}
+Release:          2%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -298,8 +298,6 @@ export IN_TREE_FREEBL_HEADERS_FIRST=1
 ##### phase 2: build the rest of nss
 export NSS_BLTEST_NOT_AVAILABLE=1
 
-export NSS_DISABLE_TLS_1_3=1
-
 %{__make} -C ./nss/coreconf
 %{__make} -C ./nss/lib/dbm
 
@@ -408,8 +406,6 @@ export USE_64
 
 export NSS_BLTEST_NOT_AVAILABLE=1
 
-export NSS_DISABLE_TLS_1_3=1
-
 # needed for the fips mangling test
 export SOFTOKEN_LIB_DIR=%{_libdir}
 
@@ -807,6 +803,10 @@ fi
 
 
 %changelog
+* Mon Apr 24 2017 Daiki Ueno <dueno@redhat.com> - 3.30.2-2
+- Rebase to NSS 3.30.2
+- Enable TLS 1.3
+
 * Thu Mar 30 2017 Kai Engert <kaie@redhat.com> - 3.30.0-3
 - Backport upstream mozbz#1328318 to support crypto policy FUTURE.
 
diff --git a/sources b/sources
index a94dfd0..c8ab401 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403
 SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
 SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310
-SHA512 (nss-3.30.0.tar.gz) = 8d5e5dcb4b7aa82795a09df14654436f6bcbf95c6b86c00917a3476da46c14a7c9e85d9a62d1b543fd8e50dbb4ccf218b6923361450d1ed2ba7f4674dd17714c
+SHA512 (nss-3.30.2.tar.gz) = 02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500