[nss-softokn/f18] Update to NSS_3_14_2_RTM

[Elio Maldonado]

commit 812d7542039d42e70ee671ba12756b51bc42e658
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Feb 1 21:42:03 2013 -0800

    Update to NSS_3_14_2_RTM
    
    - Use nss sqlite copy until this fedora branch is updated to sqlite-3.17.5
    - Modify softokn split script to include sqlite in the softokn sources
    - Add temporary patch that adds sqlite to list of source directories to compile

 nss-softokn.spec                 |   23 +++++++++++++++--------
 nss-split-softokn.sh             |    3 +++
 sources                          |    2 +-
 temporarily-include-sqlite.patch |   15 +++++++++++++++
 4 files changed, 34 insertions(+), 9 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 12cc786..782d5ea 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -9,8 +9,9 @@
 # NOTE: The LD_LIBRARY_PATH line guarantees shlibsign links
 # against the freebl that we just built. This is necessary
 # because the signing algorithm changed on 3.14 to DSA2 with SHA256
-# whereas we previously signed with DSA and SHA1. We must Keep this line
-# until all mock platforms have been updated.
+# whereas we previously signed with DSA and SHA1. We must keep the line
+# export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} after the
+# %%{__os_install_post} one # until all mock platforms have been updated.
 #
 %define __spec_install_post \
     %{?__debug_package:%{__debug_install_post}} \
@@ -60,6 +61,8 @@ Source0:          %{name}-%{version}-stripped.tar.bz2
 # A file named {name}-{version}-stripped.tar.bz2 should appear
 # which is ready for uploading to the lookaside cache.
 Source1:          mozilla-crypto-strip.sh
+# FIXME: The split script is including sqlite until
+# the system is updated to sqlite-3.7.15
 Source2:          nss-split-softokn.sh
 Source3:          nss-softokn.pc.in
 Source4:          nss-softokn-config.in
@@ -74,8 +77,8 @@ Patch8:           softoken-minimal-test-dependencies.patch
 # NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers. 
 # Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
 Patch9:           iquote.patch
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=820207
-Patch10:           add-rsaperf_low-test.patch
+# Remove when system sqlite is updated to sqlite-3.7.15
+Patch10:           temporarily-include-sqlite.patch
 
 
 %description
@@ -131,8 +134,7 @@ Header and library files for doing development with Network Security Services.
 %patch8 -p0 -b .crypto
 # activate if needed when doing a major update with new apis
 %patch9 -p0 -b .iquote
-# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=820207
-%patch10 -p0 -b .rsaperf
+%patch10 -p0 -b .includesqlite
 
 
 %build
@@ -181,8 +183,10 @@ export NSPR_LIB_DIR
 export NSSUTIL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
 export NSSUTIL_LIB_DIR=%{_libdir}
 
-NSS_USE_SYSTEM_SQLITE=1
-export NSS_USE_SYSTEM_SQLITE
+# FIXME: Uncomment these two lines as soon as system sqlite
+# in this fedora branch is updated to sqlite-3.17.5
+#NSS_USE_SYSTEM_SQLITE=1
+#export NSS_USE_SYSTEM_SQLITE
 
 %ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
@@ -388,6 +392,9 @@ done
 %changelog
 * Fri Feb 01 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.2-1
 - Update to NSS_3_14_2_RTM
+- Use nss sqlite copy until this fedora branch is updated to sqlite-3.17.5
+- Modify softokn split script to include sqlite in the softokn sources
+- Add temporary patch that adds sqlite to list of source directories to compile
 
 * Wed Jan 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.1-7
 - Actually add the LD_LIBRARY_PATH line to the post-install scriptlet 
diff --git a/nss-split-softokn.sh b/nss-split-softokn.sh
index ff280b0..e2f385d 100755
--- a/nss-split-softokn.sh
+++ b/nss-split-softokn.sh
@@ -67,6 +67,9 @@ for f in $topFilesU; do
   cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/
 done
 
+# TEMPORARY: copying the sqlite directory until fedora has the version we need
+cp -a ${nss_source_dir}/mozilla/security/nss/lib/sqlite ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/sqlite
+
 # and some Makefiles and related files from mozilla/security/nss
 topFilesN=`find ${nss_source_dir}/mozilla/security/nss/ -maxdepth 1 -mindepth 1 -type f`
 for f in $topFilesN; do
diff --git a/sources b/sources
index 7ecf740..0585a03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d200ec78ced4c79a9a52a70590027878  nss-softokn-3.14.2-stripped.tar.bz2
+91d502abf2356f15ecaa46a898719a57  nss-softokn-3.14.2-stripped.tar.bz2
diff --git a/temporarily-include-sqlite.patch b/temporarily-include-sqlite.patch
new file mode 100644
index 0000000..64a6b23
--- /dev/null
+++ b/temporarily-include-sqlite.patch
@@ -0,0 +1,15 @@
+diff -up ./mozilla/security/nss/lib/Makefile.includesqlite ./mozilla/security/nss/lib/Makefile
+--- ./mozilla/security/nss/lib/Makefile.includesqlite	2013-02-01 20:52:57.668407661 -0800
++++ ./mozilla/security/nss/lib/Makefile	2013-02-01 20:59:45.471356579 -0800
+@@ -41,6 +41,11 @@ ifeq ($(OS_ARCH),Linux)
+ ifeq ($(NSS_BUILD_SOFTOKEN_ONLY),1)
+ FREEBL_SRCDIR = freebl      # Add the freebl directory to DIRS.
+ SOFTOKEN_SRCDIR = softoken  # Add the softoken directory to DIRS.
++# Temporarily include sqlite until system sqlite in fedora stable
++# branches is updated to the version we require
++ifeq ($(NSS_USE_SYSTEM_SQLITE),1)
++SQLITE_SRCDIR = sqlite      # Add the slite directory to DIRS.
++endif
+ endif
+ endif
+ endif