[nss-softokn] Update to NSS_3_15_RTM
Elio Maldonado
emaldonado at fedoraproject.org
Thu May 30 03:19:13 UTC 2013
commit 81aa4486b73dcf76c8512dc9dfcf45c0843e3427
Author: Elio Maldonado <emaldona at redhat.com>
Date: Wed May 29 20:17:50 2013 -0700
Update to NSS_3_15_RTM
build-nss-softoken-only.patch | 45 ++++++++--------
nss-softokn.spec | 5 ++-
nss-split-softokn.sh | 9 +---
softoken-minimal-test-dependencies.patch | 86 ++++++++++++++----------------
sources | 2 +-
5 files changed, 70 insertions(+), 77 deletions(-)
---
diff --git a/build-nss-softoken-only.patch b/build-nss-softoken-only.patch
index 023d23f..c2f5089 100644
--- a/build-nss-softoken-only.patch
+++ b/build-nss-softoken-only.patch
@@ -1,30 +1,32 @@
diff -up nss/lib/Makefile.softokenonly nss/lib/Makefile
---- nss/lib/Makefile.softokenonly 2013-04-04 13:31:51.000000000 -0700
-+++ nss/lib/Makefile 2013-04-04 21:38:57.275863387 -0700
-@@ -38,6 +38,15 @@ endif
-
- ifndef MOZILLA_CLIENT
- ifeq ($(OS_ARCH),Linux)
+--- nss/lib/Makefile.softokenonly 2013-05-29 18:22:03.635077455 -0700
++++ nss/lib/Makefile 2013-05-29 18:24:15.721185676 -0700
+@@ -68,8 +68,13 @@ UTIL_SRCDIR =
+ FREEBL_SRCDIR =
+ SOFTOKEN_SRCDIR =
+ else
+ifeq ($(NSS_BUILD_SOFTOKEN_ONLY),1)
-+FREEBL_SRCDIR = freebl # Add the freebl directory to DIRS.
-+SOFTOKEN_SRCDIR = softoken # Add the softoken directory to DIRS.
-+endif
-+endif
-+endif
-+
-+ifndef MOZILLA_CLIENT
-+ifeq ($(OS_ARCH),Linux)
- SYSINIT_SRCDIR = sysinit # Add the sysinit directory to DIRS.
- endif
++SOFTOKEN_SRCDIR =
++FREEBL_SRCDIR = freebl
++SOFTOKEN_SRCDIR = softoken
+ # default is to include all
+ UTIL_SRCDIR = util
+ FREEBL_SRCDIR = freebl
+ SOFTOKEN_SRCDIR = softoken
endif
++endif
diff -up nss/lib/manifest.mn.softokenonly nss/lib/manifest.mn
---- nss/lib/manifest.mn.softokenonly 2013-04-04 13:31:53.000000000 -0700
-+++ nss/lib/manifest.mn 2013-04-04 21:42:14.744509844 -0700
-@@ -16,14 +16,7 @@ DEPTH = ..
- # smime
+--- nss/lib/manifest.mn.softokenonly 2013-05-29 18:25:22.309716087 -0700
++++ nss/lib/manifest.mn 2013-05-29 18:26:24.601206689 -0700
+@@ -17,18 +17,9 @@ DEPTH = ..
# ckfw (builtins module)
# crmf jar (not dll's)
--DIRS = util freebl $(SQLITE_SRCDIR) $(DBM_SRCDIR) softoken \
+ DIRS = \
+- $(UTIL_SRCDIR) \
+ $(FREEBL_SRCDIR) \
+ $(SQLITE_SRCDIR) \
+- $(DBM_SRCDIR) \
+ $(SOFTOKEN_SRCDIR) \
- base dev pki \
- libpkix \
- certdb certhigh pk11wrap cryptohi nss \
@@ -32,7 +34,6 @@ diff -up nss/lib/manifest.mn.softokenonly nss/lib/manifest.mn
- pkcs12 pkcs7 smime \
- crmf jar \
- ckfw $(SYSINIT_SRCDIR) \
-+DIRS = $(FREEBL_SRCDIR) $(SQLITE_SRCDIR) $(SOFTOKEN_SRCDIR) \
$(NULL)
# fortcrypt is no longer built
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 10d916c..eed9512 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -25,7 +25,7 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
Version: 3.15
-Release: 0.1%{?dist}.beta.3
+Release: 1%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -381,6 +381,9 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Wed May 29 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-1
+- Update to NSS_3_15_RTM
+
* Tue Apr 23 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-0.1.beta.3
- Reverse the last changes since pk11gcmtest properly belongs to nss
diff --git a/nss-split-softokn.sh b/nss-split-softokn.sh
index b05e797..4c96ba4 100755
--- a/nss-split-softokn.sh
+++ b/nss-split-softokn.sh
@@ -48,7 +48,7 @@ cp -a ${nss_source_dir} ${WORK}/${softokn_dir}
rm -rf ${WORK}/${softokn_dir}/nss/cmd
rm -rf ${WORK}/${softokn_dir}/nss/tests
rm -rf ${WORK}/${softokn_dir}/nss/lib
-rm -rf ${WORK}/${softokn_dir}/pkg
+rm -rf ${WORK}/${softokn_dir}/nss/pkg
# start with an empty lib directory and copy only what we need
mkdir ${WORK}/${softokn_dir}/nss/lib
# copy the top files from nss/lib/
@@ -61,13 +61,6 @@ mkdir ${WORK}/${softokn_dir}/nss/lib/util
cp -a ${nss_source_dir}/nss/lib/dbm ${WORK}/${softokn_dir}/nss/lib/dbm
cp -a ${nss_source_dir}/nss/lib/freebl ${WORK}/${softokn_dir}/nss/lib/freebl
cp -a ${nss_source_dir}/nss/lib/softoken ${WORK}/${softokn_dir}/nss/lib/softoken
-
-# copy the top files from nss/lib/util
-topFilesU=`find ${nss_source_dir}/nss/lib/util -maxdepth 1 -mindepth 1 -type f`
-for f in $topFilesU; do
- cp -p $f ${WORK}/${softokn_dir}/nss/
-done
-
# and some Makefiles and related files from nss
topFilesN=`find ${nss_source_dir}/nss/ -maxdepth 1 -mindepth 1 -type f`
for f in $topFilesN; do
diff --git a/softoken-minimal-test-dependencies.patch b/softoken-minimal-test-dependencies.patch
index a2626ab..4bc7404 100644
--- a/softoken-minimal-test-dependencies.patch
+++ b/softoken-minimal-test-dependencies.patch
@@ -1,31 +1,13 @@
-diff -up nss/cmd/Makefile.crypto nss/cmd/Makefile
---- nss/cmd/Makefile.crypto 2013-04-04 13:31:48.000000000 -0700
-+++ nss/cmd/Makefile 2013-04-04 21:50:32.874130072 -0700
-@@ -18,6 +18,14 @@ LOWHASHTEST_SRCDIR=
- ifeq ($(FREEBL_LOWHASH),1)
- LOWHASHTEST_SRCDIR = lowhashtest # Add the lowhashtest directory to DIRS.
- endif
-+
-+# compiled only as part of the nss-softoken build
-+BLTEST_SRCDIR=
-+FIPSTEST_SRCDIR=
-+ifeq ($(NSS_BUILD_SOFTOKEN_ONLY),1)
-+BLTEST_SRCDIR=bltest # Add the bltest directory to DIRS.
-+FIPSTEST_SRCDIR=fipstest # Add the fipstest directory to DIRS.
-+endif
-
- INCLUDES += \
- -I$(DIST)/../public/security \
diff -up nss/cmd/manifest.mn.crypto nss/cmd/manifest.mn
---- nss/cmd/manifest.mn.crypto 2013-04-04 13:31:51.000000000 -0700
-+++ nss/cmd/manifest.mn 2013-04-04 21:49:12.808338843 -0700
+--- nss/cmd/manifest.mn.crypto 2013-05-28 14:43:24.000000000 -0700
++++ nss/cmd/manifest.mn 2013-05-29 20:04:30.060145083 -0700
@@ -9,54 +9,10 @@ DEPTH = ..
REQUIRES = nss nspr libdbm
DIRS = lib \
- addbuiltin \
- atob \
-- bltest \
+ $(BLTEST_SRCDIR) \
- btoa \
- certcgi \
- certutil \
@@ -37,9 +19,7 @@ diff -up nss/cmd/manifest.mn.crypto nss/cmd/manifest.mn
- derdump \
- digest \
- httpserv \
-- fipstest \
-+ $(BLTEST_SRCDIR) \
-+ $(FIPSTEST_SRCDIR) \
+ $(FIPSTEST_SRCDIR) \
$(LOWHASHTEST_SRCDIR) \
- listsuites \
- makepqg \
@@ -63,7 +43,7 @@ diff -up nss/cmd/manifest.mn.crypto nss/cmd/manifest.mn
- selfserv \
- signtool \
- signver \
- shlibsign \
+ $(SHLIBSIGN_SRCDIR) \
- smimetools \
- ssltap \
- strsclnt \
@@ -77,11 +57,11 @@ diff -up nss/cmd/manifest.mn.crypto nss/cmd/manifest.mn
TEMPORARILY_DONT_BUILD = \
diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
---- nss/cmd/platlibs.mk.crypto 2013-04-04 13:31:51.000000000 -0700
-+++ nss/cmd/platlibs.mk 2013-04-04 21:45:26.740180661 -0700
-@@ -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)
+--- nss/cmd/platlibs.mk.crypto 2013-05-28 14:43:24.000000000 -0700
++++ nss/cmd/platlibs.mk 2013-05-29 20:04:30.061145091 -0700
+@@ -51,42 +51,13 @@ EXTRA_SHARED_LIBS += \
+ $(NULL)
+ endif
-PKIXLIB = \
- $(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
@@ -112,18 +92,17 @@ diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
- $(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+ $(SOFTOKENLIB) \
$(CRYPTOLIB) \
- $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
- $(PKIXLIB) \
- $(DBMLIB) \
-- $(DIST)/lib/$(LIB_PREFIX)$(SQLITE_LIB_NAME).$(LIB_SUFFIX) \
+ $(DIST)/lib/$(LIB_PREFIX)$(SQLITE_LIB_NAME).$(LIB_SUFFIX) \
$(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 +59,9 @@ EXTRA_LIBS += \
+@@ -102,30 +73,9 @@ EXTRA_LIBS += \
else
EXTRA_LIBS += \
@@ -140,7 +119,7 @@ diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
- $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+ $(SOFTOKENLIB) \
- $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
@@ -154,7 +133,7 @@ diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
$(NULL)
ifeq ($(OS_ARCH), AIX)
-@@ -145,9 +94,6 @@ ifeq ($(OS_ARCH), WINNT)
+@@ -158,9 +108,6 @@ ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
$(DIST)/lib/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \
@@ -164,7 +143,7 @@ diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
$(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
+@@ -186,9 +133,6 @@ endif
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
@@ -175,23 +154,40 @@ diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
-lnssutil3 \
-L$(NSPR_LIB_DIR) \
diff -up nss/tests/all.sh.crypto nss/tests/all.sh
---- nss/tests/all.sh.crypto 2012-06-13 11:16:39.000000000 -0700
-+++ nss/tests/all.sh 2012-12-22 11:51:35.178495551 -0800
-@@ -295,13 +295,13 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
+--- nss/tests/all.sh.crypto 2013-05-28 14:43:24.000000000 -0700
++++ nss/tests/all.sh 2013-05-29 20:04:30.062145099 -0700
+@@ -294,14 +294,14 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
+ . ./init.sh
fi
++last_built = [ -n ${NSS_BUILD_SOFTOKEN_ONLY} ] && shlibsign || modutil
# NOTE:
-# Since in make at the top level, modutil is the last file
-# created, we check for modutil to know whether the build
-+# Since in make at the top level, shlibsign is the last file
-+# created, we check for shlibsign to know whether the build
++# Since in make at the top level, ${last_built} is the last file
++# created, we check for ${last_built} to know whether the build
# is complete. If a new file is created after that, the
- # following test for modutil should check for that instead.
+-# following test for modutil should check for that instead.
++# following test for should check for that instead.
-if [ ! -f ${DIST}/${OBJDIR}/bin/modutil -a \
- ! -f ${DIST}/${OBJDIR}/bin/modutil.exe ]; then
-+if [ ! -f ${DIST}/${OBJDIR}/bin/shlibsign -a \
-+ ! -f ${DIST}/${OBJDIR}/bin/shlibsign.exe ]; then
++if [ ! -f ${DIST}/${OBJDIR}/bin/${last_built}${PROG_SUFFIX} -a ]; then
echo "Build Incomplete. Aborting test." >> ${LOGFILE}
html_head "Testing Initialization"
Exit "Checking for build"
+diff -up nss/tests/cipher/cipher.sh.crypto nss/tests/cipher/cipher.sh
+--- nss/tests/cipher/cipher.sh.crypto 2013-05-28 14:43:24.000000000 -0700
++++ nss/tests/cipher/cipher.sh 2013-05-29 20:09:49.740682762 -0700
+@@ -130,5 +130,10 @@ if [ ! -x ${DIST}/${OBJDIR}/bin/bltest${
+ fi
+ cipher_init
+ cipher_main
+-cipher_gcm
++if [ "${NSS_BUILD_SOFTOKEN_ONLY}" = "1" ]; then
++ echo "Skipping cipher_gcm because this a softoken only build"
++else
++ cipher_gcm
++
++fi
+ cipher_cleanup
diff --git a/sources b/sources
index 4b2fad0..0b1f1ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f969b16a605caab53d5b607d9b711df nss-softokn-3.15-stripped.tar.bz2
+ed9ea6ef659193de6229387db937e1ca nss-softokn-3.15-stripped.tar.bz2
More information about the scm-commits
mailing list