From 4b42d218835ffe38b102194f191b6c1fb16a659c Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Thu, 6 Dec 2018 10:23:36 +0100
Subject: [PATCH] Remove unnecessary patches

---
 nss.spec                         | 10 ++++------
 renegotiate-transitional.patch   | 12 ------------
 utilwrap-include-templates.patch | 14 --------------
 3 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 renegotiate-transitional.patch
 delete mode 100644 utilwrap-include-templates.patch

diff --git a/nss.spec b/nss.spec
index b7b8d28..eefe8b9 100644
--- a/nss.spec
+++ b/nss.spec
@@ -47,7 +47,7 @@ Name:             nss
 Version:          %{nss_version}
 # for Rawhide, please always use release >= 2
 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Requires:         nspr >= %{nspr_version}
@@ -97,11 +97,8 @@ Source28:         nss-p11-kit.config
 Source29:         PayPalICA.cert
 Source30:         PayPalEE.cert
 
-Patch1:           renegotiate-transitional.patch
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=617723
 Patch2:           nss-539183.patch
-# Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator
-Patch3:           utilwrap-include-templates.patch
 # This patch uses the GCC -iquote option documented at
 # http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
 # to give the in-tree headers a higher priority over the system headers,
@@ -248,9 +245,7 @@ Header and library files for doing development with Network Security Services.
 %prep
 %setup -q -n %{name}-%{nss_archive_version}
 
-%patch1 -p0 -b .transitional
 %patch2 -p0 -b .539183
-%patch3 -p0 -b .templates
 %patch4 -p0 -b .iquote
 %patch5 -p0 -b .1185708_3des
 pushd nss
@@ -922,6 +917,9 @@ update-crypto-policies
 
 
 %changelog
+* Thu Dec  6 2018 Daiki Ueno <dueno@redhat.com> - 3.40.1-3
+- Remove unnecessary patches
+
 * Thu Dec  6 2018 Daiki Ueno <dueno@redhat.com> - 3.40.1-2
 - Update to NSS 3.40.1
 
diff --git a/renegotiate-transitional.patch b/renegotiate-transitional.patch
deleted file mode 100644
index d3aa3bd..0000000
--- a/renegotiate-transitional.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up nss/lib/ssl/sslsock.c.transitional nss/lib/ssl/sslsock.c
---- nss/lib/ssl/sslsock.c.transitional	2018-03-09 13:57:50.615706802 +0100
-+++ nss/lib/ssl/sslsock.c	2018-03-09 13:58:23.708974970 +0100
-@@ -67,7 +67,7 @@ static sslOptions ssl_defaults = {
-     .noLocks = PR_FALSE,
-     .enableSessionTickets = PR_FALSE,
-     .enableDeflate = PR_FALSE,
--    .enableRenegotiation = SSL_RENEGOTIATE_REQUIRES_XTN,
-+    .enableRenegotiation = SSL_RENEGOTIATE_TRANSITIONAL,
-     .requireSafeNegotiation = PR_FALSE,
-     .enableFalseStart = PR_FALSE,
-     .cbcRandomIV = PR_TRUE,
diff --git a/utilwrap-include-templates.patch b/utilwrap-include-templates.patch
deleted file mode 100644
index 649b548..0000000
--- a/utilwrap-include-templates.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up nss/lib/nss/config.mk.templates nss/lib/nss/config.mk
---- nss/lib/nss/config.mk.templates	2013-06-18 11:32:07.590089155 -0700
-+++ nss/lib/nss/config.mk	2013-06-18 11:33:28.732763345 -0700
-@@ -3,6 +3,10 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
-+#ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
-+INCLUDES += -I/usr/include/nss3/templates
-+#endif
-+
- # can't do this in manifest.mn because OS_TARGET isn't defined there.
- ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-