From 306dd778f40b1bcaa91ab865c26385e6ef2420f0 Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Wed, 23 Oct 2013 09:53:20 -0700
Subject: [PATCH] Use the full sources from upstream

- Bug 1019245 - ECDHE in openssl available -> NSS needs too for Firefox/Thunderbird
---
 .gitignore |  2 +-
 nss.spec   | 23 +++++++----------------
 sources    |  2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 370b654..25fde7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ TestCA.ca.cert
 TestUser50.cert
 TestUser51.cert
 /nss-pem-20130828.tar.bz2
-/nss-3.15.2-stripped.tar.bz2
+/nss-3.15.2.tar.gz
diff --git a/nss.spec b/nss.spec
index 819cc68..99de6e3 100644
--- a/nss.spec
+++ b/nss.spec
@@ -20,7 +20,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.15.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -47,20 +47,7 @@ BuildRequires:    perl
 %{!?nss_ckbi_suffix:%define full_nss_version %{version}}
 %{?nss_ckbi_suffix:%define full_nss_version %{version}%{nss_ckbi_suffix}}
 
-Source0:          %{name}-%{full_nss_version}-stripped.tar.bz2
-
-# The stripped tar ball is a subset of the upstream sources with
-# patent-encumbered cryptographic algorithms removed.
-# Use this script to remove them and create the stripped archive.
-# 1. Download the sources nss-{version}.tar.gz found within 
-# http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/
-# in a subdirectory named NSS_${major}_${minor}_${maint}_RTM/src
-# 2. In the download directory execute
-# ./mozilla-crypto-strip.sh ${name}-${version}.tar.gz
-# to produce ${name}-${version}-stripped.tar.bz2
-# for uploading to the lookaside cache.
-Source100:        mozilla-crypto-strip.sh
-
+Source0:          %{name}-%{full_nss_version}.tar.gz
 Source1:          nss.pc.in
 Source2:          nss-config.in
 Source3:          blank-cert8.db
@@ -105,7 +92,7 @@ Patch45:          Bug-896651-pem-dont-trash-keys-on-failed-login.patch
 Patch46:          disable-ocsp-stapling-tests.patch
 # Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator
 Patch47:          utilwrap-include-templates.patch
-# TODO submit this patch upstream
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=902171
 Patch48:          nss-versus-softoken-tests.patch
 # TODO remove when we switch to building nss without softoken
 Patch49:          nss-skip-bltest-and-fipstest.patch
@@ -755,6 +742,10 @@ fi
 
 
 %changelog
+* Wed Oct 23 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.2-2
+- Use the full sources from upstream
+- Bug 1019245 - ECDHE in openssl available -> NSS needs too for Firefox/Thunderbird
+
 * Thu Sep 26 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.2-1
 - Update to NSS_3_15_2_RTM
 - Update iquote.patch on account of modified prototype on cert.h installed by nss-devel
diff --git a/sources b/sources
index c14d054..2a414c9 100644
--- a/sources
+++ b/sources
@@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2  TestCA.ca.cert
 1b7b6808cd77d5df29bf5bb9e5fac967  TestUser50.cert
 ab0b56dd505a995425c03e5266f7c8d6  TestUser51.cert
 e82dd2b9520f9d0f5d101e7710d59656  nss-pem-20130828.tar.bz2
-b402f7062b1c0c0ee9d0f223d03b4d6a  nss-3.15.2-stripped.tar.bz2
+154223568f9734c76c164b46c774450c  nss-3.15.2.tar.gz