[nss-softokn] Update to NSS_3_14_1_RTM
Elio Maldonado
emaldonado at fedoraproject.org
Mon Dec 17 05:17:17 UTC 2012
commit a3ce9e45494133e0aa3653419639d333af2bec84
Author: Elio Maldonado <emaldona at redhat.com>
Date: Sun Dec 16 21:16:46 2012 -0800
Update to NSS_3_14_1_RTM
.gitignore | 2 +-
build-nss-softoken-only.patch | 19 +++++++++++
nss-softokn.spec | 13 +++++--
nss-split-softokn.sh | 39 ++++++++++++++--------
softoken-minimal-test-dependencies.patch | 51 +++++++++++++++++++++++------
sources | 2 +-
6 files changed, 95 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c722f4e..21e3583 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.14-stripped.tar.bz2
+/nss-softokn-3.14.1-stripped.tar.bz2
diff --git a/build-nss-softoken-only.patch b/build-nss-softoken-only.patch
new file mode 100644
index 0000000..32d82ad
--- /dev/null
+++ b/build-nss-softoken-only.patch
@@ -0,0 +1,19 @@
+diff -up ./mozilla/security/nss/lib/manifest.mn.softokenonly ./mozilla/security/nss/lib/manifest.mn
+--- ./mozilla/security/nss/lib/manifest.mn.softokenonly 2012-12-16 21:08:47.622870608 -0800
++++ ./mozilla/security/nss/lib/manifest.mn 2012-12-16 21:10:08.043398218 -0800
+@@ -16,14 +16,7 @@ DEPTH = ../..
+ # smime
+ # ckfw (builtins module)
+ # crmf jar (not dll's)
+-DIRS = util freebl $(SQLITE_SRCDIR) softoken \
+- base dev pki \
+- libpkix \
+- certdb certhigh pk11wrap cryptohi nss \
+- $(ZLIB_SRCDIR) ssl \
+- pkcs12 pkcs7 smime \
+- crmf jar \
+- ckfw $(SYSINIT_SRCDIR) \
++DIRS = freebl $(SQLITE_SRCDIR) softoken \
+ $(NULL)
+
+ # fortcrypt is no longer built
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 91dc927..0449e61 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -15,8 +15,8 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
-Version: 3.14
-Release: 6%{?dist}
+Version: 3.14.1
+Release: 1%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -56,6 +56,7 @@ Source2: nss-split-softokn.sh
Source3: nss-softokn.pc.in
Source4: nss-softokn-config.in
+Patch1: build-nss-softoken-only.patch
Patch8: softoken-minimal-test-dependencies.patch
# This patch uses the gcc-iquote dir option documented at
# http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
@@ -66,7 +67,7 @@ Patch8: softoken-minimal-test-dependencies.patch
# 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=762198
-Patch10: Bug-829088-nss-3.13.4-fips-sha224-selftest.patch
+# Patch10: Bug-829088-nss-3.13.4-fips-sha224-selftest.patch
%description
@@ -118,10 +119,11 @@ Header and library files for doing development with Network Security Services.
%prep
%setup -q
+%patch1 -p0 -b .softokenonly
%patch8 -p0 -b .crypto
# activate if needed when doing a major update with new apis
%patch9 -p0 -b .iquote
-%patch10 -p0 -b .829088
+#%patch10 -p0 -b .829088
%build
@@ -375,6 +377,9 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-1
+- Update to NSS_3_14_1_RTM
+
* Mon Dec 03 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-6
- Bug 883114 - Install bltest and fipstest as unsupported tools
diff --git a/nss-split-softokn.sh b/nss-split-softokn.sh
index 3d5c626..ff280b0 100755
--- a/nss-split-softokn.sh
+++ b/nss-split-softokn.sh
@@ -52,34 +52,45 @@ rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/pkg
# rstart with an empty lib directory and copy only what we need
mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
+# copy the top files from mozilla/security/nss/lib/
+topFilesL=`find ${nss_source_dir}/mozilla/security/nss/lib/ -maxdepth 1 -mindepth 1 -type f`
+for f in $topFilesL; do
+ cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
+done
+mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/util
# copy entire freebl and softoken directories recursively
cp -a ${nss_source_dir}/mozilla/security/nss/lib/freebl ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/freebl
cp -a ${nss_source_dir}/mozilla/security/nss/lib/softoken ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/softoken
+# copy the top files from mozilla/security/nss/lib/util
+topFilesU=`find ${nss_source_dir}/mozilla/security/nss/lib/util -maxdepth 1 -mindepth 1 -type f`
+for f in $topFilesU; do
+ cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/
+done
-# and some Makefiles and related files
-cp ${nss_source_dir}/mozilla/security/nss/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
-cp ${nss_source_dir}/mozilla/security/nss/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
-cp ${nss_source_dir}/mozilla/security/nss/trademarks.txt ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
-cp ${nss_source_dir}/mozilla/security/nss/lib/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
-cp ${nss_source_dir}/mozilla/security/nss/lib/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
+# 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
+ cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/
+done
-# we do need bltest, lib, and shlibsign from cmd
+# we do need bltest, lib, lowhashtest, and shlibsign from mozilla/security/nss/cmd
mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
# copy some files at the top and the slhlib subdirectory
-cp -p ${nss_source_dir}/mozilla/security/nss/cmd/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-cp -p ${nss_source_dir}/mozilla/security/nss/cmd/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platlibs.mk ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platrules.mk ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
+topFilesC=`find ${nss_source_dir}/mozilla/security/nss/cmd/ -maxdepth 1 -mindepth 1 -type f`
+for f in $topFilesC; do
+ cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/
+done
cp -a ${nss_source_dir}/mozilla/security/nss/cmd/bltest ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/bltest
cp -a ${nss_source_dir}/mozilla/security/nss/cmd/fipstest ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/fipstest
cp -a ${nss_source_dir}/mozilla/security/nss/cmd/lib ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/lib
+cp -a ${nss_source_dir}/mozilla/security/nss/cmd/lowhashtest ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/lowhashtest
cp -a ${nss_source_dir}/mozilla/security/nss/cmd/shlibsign ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/shlibsign
-# plus common and crypto from nss/tests
+# plus common and crypto from mozilla/security/nss/tests
mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
-topFiles=`find ${nss_source_dir}/mozilla/security/nss/tests/ -maxdepth 1 -mindepth 1 -type f`
-for f in $topFiles; do
+topFilesT=`find ${nss_source_dir}/mozilla/security/nss/tests/ -maxdepth 1 -mindepth 1 -type f`
+for f in $topFilesT; do
cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests/
done
keepers="cipher common"
diff --git a/softoken-minimal-test-dependencies.patch b/softoken-minimal-test-dependencies.patch
index b8daa9c..c3a63cb 100644
--- a/softoken-minimal-test-dependencies.patch
+++ b/softoken-minimal-test-dependencies.patch
@@ -1,7 +1,7 @@
diff -up ./mozilla/security/nss/cmd/manifest.mn.crypto ./mozilla/security/nss/cmd/manifest.mn
---- ./mozilla/security/nss/cmd/manifest.mn.crypto 2012-09-01 18:29:28.000000000 +0000
-+++ ./mozilla/security/nss/cmd/manifest.mn 2012-10-02 15:59:32.213547057 +0000
-@@ -9,52 +9,10 @@ DEPTH = ../..
+--- ./mozilla/security/nss/cmd/manifest.mn.crypto 2012-12-16 19:25:37.765914728 -0800
++++ ./mozilla/security/nss/cmd/manifest.mn 2012-12-16 19:27:26.978561206 -0800
+@@ -9,53 +9,10 @@ DEPTH = ../..
REQUIRES = nss nspr libdbm
DIRS = lib \
@@ -25,6 +25,7 @@ diff -up ./mozilla/security/nss/cmd/manifest.mn.crypto ./mozilla/security/nss/cm
- makepqg \
- multinit \
- ocspclnt \
+- ocspresp \
- oidcalc \
- p7content \
- p7env \
@@ -55,10 +56,28 @@ diff -up ./mozilla/security/nss/cmd/manifest.mn.crypto ./mozilla/security/nss/cm
TEMPORARILY_DONT_BUILD = \
diff -up ./mozilla/security/nss/cmd/platlibs.mk.crypto ./mozilla/security/nss/cmd/platlibs.mk
---- ./mozilla/security/nss/cmd/platlibs.mk.crypto 2012-07-17 15:22:42.000000000 +0000
-+++ ./mozilla/security/nss/cmd/platlibs.mk 2012-10-02 16:03:14.388622383 +0000
-@@ -56,25 +56,9 @@ PKIXLIB = \
- ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+--- ./mozilla/security/nss/cmd/platlibs.mk.crypto 2012-12-16 19:27:51.157703769 -0800
++++ ./mozilla/security/nss/cmd/platlibs.mk 2012-12-16 20:03:35.615006804 -0800
+@@ -38,43 +38,13 @@ DEFINES += -DNSS_USE_STATIC_LIBS
+ # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
+ CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+
+-PKIXLIB = \
+- $(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixutil.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixsystem.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixcrlsel.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixmodule.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixstore.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixparams.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixchecker.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixpki.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixresults.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
+-
+ # can't do this in manifest.mn because OS_ARCH isn't defined there.
+ ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
@@ -83,7 +102,7 @@ diff -up ./mozilla/security/nss/cmd/platlibs.mk.crypto ./mozilla/security/nss/cm
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-@@ -89,30 +73,9 @@ EXTRA_LIBS += \
+@@ -89,30 +59,9 @@ EXTRA_LIBS += \
else
EXTRA_LIBS += \
@@ -114,7 +133,7 @@ diff -up ./mozilla/security/nss/cmd/platlibs.mk.crypto ./mozilla/security/nss/cm
$(NULL)
ifeq ($(OS_ARCH), AIX)
-@@ -145,9 +108,6 @@ ifeq (,$(filter-out WINNT WINCE,$(OS_ARC
+@@ -145,9 +94,6 @@ ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
$(DIST)/lib/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \
@@ -124,9 +143,19 @@ diff -up ./mozilla/security/nss/cmd/platlibs.mk.crypto ./mozilla/security/nss/cm
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
+@@ -173,9 +119,6 @@ endif
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+ -L$(DIST)/lib \
+- -lssl3 \
+- -lsmime3 \
+- -lnss3 \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
+ -L$(NSPR_LIB_DIR) \
diff -up ./mozilla/security/nss/tests/all.sh.crypto ./mozilla/security/nss/tests/all.sh
---- ./mozilla/security/nss/tests/all.sh.crypto 2012-06-13 18:16:39.000000000 +0000
-+++ ./mozilla/security/nss/tests/all.sh 2012-10-02 15:59:32.217547061 +0000
+--- ./mozilla/security/nss/tests/all.sh.crypto 2012-12-16 19:56:30.345259712 -0800
++++ ./mozilla/security/nss/tests/all.sh 2012-12-16 20:04:52.709493293 -0800
@@ -295,13 +295,13 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
fi
diff --git a/sources b/sources
index be105f8..5f7fd50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7418e42e25adc3d2579f67de91c4dcf nss-softokn-3.14-stripped.tar.bz2
+630baa0395eab789e091dd4d2a69a99d nss-softokn-3.14.1-stripped.tar.bz2
More information about the scm-commits
mailing list