[nss-softokn] Update to NSS_3_15_BETA1
Elio Maldonado
emaldonado at fedoraproject.org
Tue Apr 9 22:24:40 UTC 2013
commit bcfaf37aabec2ab25932f3ff0660b247502b4f95
Author: Elio Maldonado <emaldona at redhat.com>
Date: Tue Apr 9 15:24:13 2013 -0700
Update to NSS_3_15_BETA1
- Update spec file, patches, and helper scrips on account of a shallwer source tree
.gitignore | 3 +-
build-nss-softoken-only.patch | 16 +++---
iquote.patch | 28 +++++-----
mozilla-crypto-strip.sh | 4 +-
nss-softokn.spec | 60 ++++++++++---------
nss-split-softokn.sh | 95 +++++++++++++++---------------
softoken-minimal-test-dependencies.patch | 27 +++++----
sources | 3 +-
8 files changed, 120 insertions(+), 116 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5561ebe..9095481 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/nss-softokn-3.14.2-stripped.tar.bz2
-/nss-softokn-3.14.3-stripped.tar.bz2
+/nss-softokn-3.15-stripped.tar.bz2
diff --git a/build-nss-softoken-only.patch b/build-nss-softoken-only.patch
index 8bd59cf..023d23f 100644
--- a/build-nss-softoken-only.patch
+++ b/build-nss-softoken-only.patch
@@ -1,6 +1,6 @@
-diff -up ./mozilla/security/nss/lib/Makefile.softokenonly ./mozilla/security/nss/lib/Makefile
---- ./mozilla/security/nss/lib/Makefile.softokenonly 2012-04-25 07:49:24.000000000 -0700
-+++ ./mozilla/security/nss/lib/Makefile 2012-12-22 11:24:51.895928110 -0800
+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
@@ -17,14 +17,14 @@ diff -up ./mozilla/security/nss/lib/Makefile.softokenonly ./mozilla/security/nss
SYSINIT_SRCDIR = sysinit # Add the sysinit directory to DIRS.
endif
endif
-diff -up ./mozilla/security/nss/lib/manifest.mn.softokenonly ./mozilla/security/nss/lib/manifest.mn
---- ./mozilla/security/nss/lib/manifest.mn.softokenonly 2012-04-25 07:49:24.000000000 -0700
-+++ ./mozilla/security/nss/lib/manifest.mn 2012-12-22 11:23:23.875914651 -0800
-@@ -16,14 +16,7 @@ DEPTH = ../..
+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
# ckfw (builtins module)
# crmf jar (not dll's)
--DIRS = util freebl $(SQLITE_SRCDIR) softoken \
+-DIRS = util freebl $(SQLITE_SRCDIR) $(DBM_SRCDIR) softoken \
- base dev pki \
- libpkix \
- certdb certhigh pk11wrap cryptohi nss \
diff --git a/iquote.patch b/iquote.patch
index 2868329..a7c2212 100644
--- a/iquote.patch
+++ b/iquote.patch
@@ -1,6 +1,17 @@
-diff -up ./mozilla/security/coreconf/location.mk.iquote ./mozilla/security/coreconf/location.mk
---- ./mozilla/security/coreconf/location.mk.iquote 2013-02-01 09:10:55.124322280 -0800
-+++ ./mozilla/security/coreconf/location.mk 2013-02-01 09:18:47.201168455 -0800
+diff -up nss/cmd/bltest/Makefile.iquote nss/cmd/bltest/Makefile
+--- nss/cmd/bltest/Makefile.iquote 2013-04-04 21:56:59.329249213 -0700
++++ nss/cmd/bltest/Makefile 2013-04-04 21:57:47.583579084 -0700
+@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (6) Execute "component" rules. (OPTIONAL) #
+ #######################################################################
+
++INCLUDES += -iquote $(DIST)/../private/nss
+
+
+ #######################################################################
+diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
+--- nss/coreconf/location.mk.iquote 2013-04-04 21:54:59.710477106 -0700
++++ nss/coreconf/location.mk 2013-04-04 21:56:21.091163121 -0700
@@ -45,6 +45,10 @@ endif
ifdef NSS_INCLUDE_DIR
@@ -12,14 +23,3 @@ diff -up ./mozilla/security/coreconf/location.mk.iquote ./mozilla/security/corec
endif
ifndef NSS_LIB_DIR
-diff -up ./mozilla/security/nss/cmd/bltest/Makefile.iquote ./mozilla/security/nss/cmd/bltest/Makefile
---- ./mozilla/security/nss/cmd/bltest/Makefile.iquote 2013-02-01 09:14:25.092449279 -0800
-+++ ./mozilla/security/nss/cmd/bltest/Makefile 2013-02-01 09:21:26.200995421 -0800
-@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (6) Execute "component" rules. (OPTIONAL) #
- #######################################################################
-
-+INCLUDES += -iquote $(DIST)/../private/nss
-
-
- #######################################################################
diff --git a/mozilla-crypto-strip.sh b/mozilla-crypto-strip.sh
index 4edcbf0..7774d09 100755
--- a/mozilla-crypto-strip.sh
+++ b/mozilla-crypto-strip.sh
@@ -50,9 +50,9 @@ then
fi
TOPDIR=`ls -1`
-if test "x$TOPDIR" != "xmozilla"
+if test "x$TOPDIR" != "xnss"
then
- # try to deal with a single additional subdirectory above "mozilla"
+ # try to deal with a single additional subdirectory above "nss"
echo "== skipping toplevel directory $TOPDIR"
cd $TOPDIR
fi
diff --git a/nss-softokn.spec b/nss-softokn.spec
index d270ebb..f27c7ec 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
%global nspr_version 4.9.5
%global nss_name nss
-%global nss_util_version 3.14.3
+%global nss_util_version 3.15
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
@@ -24,8 +24,8 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
-Version: 3.14.3
-Release: 1%{?dist}
+Version: 3.15
+Release: 0.1%{?dist}.beta.1
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -185,21 +185,21 @@ USE_64=1
export USE_64
%endif
-# uncomment if the iguote patch is activated
+# uncomment if the iquote patch is activated
export IN_TREE_FREEBL_HEADERS_FIRST=1
# Use only the basicutil subset for sectools.a
export NSS_BUILD_SOFTOKEN_ONLY=1
# Compile softokn plus needed support
-%{__make} -C ./mozilla/security/coreconf
-%{__make} -C ./mozilla/security/dbm
-%{__make} -C ./mozilla/security/nss
+%{__make} -C ./nss/coreconf
+%{__make} -C ./nss/lib/dbm
+%{__make} -C ./nss
# Set up our package file
# The nspr_version and nss_util_version globals used here
# must match the ones nss-softokn has for its Requires.
-%{__mkdir_p} ./mozilla/dist/pkgconfig
+%{__mkdir_p} ./dist/pkgconfig
%{__cat} %{SOURCE3} | sed -e "s,%%libdir%%,%{_libdir},g" \
-e "s,%%prefix%%,%{_prefix},g" \
-e "s,%%exec_prefix%%,%{_prefix},g" \
@@ -207,11 +207,11 @@ export NSS_BUILD_SOFTOKEN_ONLY=1
-e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-e "s,%%NSSUTIL_VERSION%%,%{nss_util_version},g" \
-e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
- ./mozilla/dist/pkgconfig/nss-softokn.pc
+ ./dist/pkgconfig/nss-softokn.pc
-SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
-SOFTOKEN_VMINOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
-SOFTOKEN_VPATCH=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`
+SOFTOKEN_VMAJOR=`cat nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
+SOFTOKEN_VMINOR=`cat nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
+SOFTOKEN_VPATCH=`cat nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`
export SOFTOKEN_VMAJOR
export SOFTOKEN_VMINOR
@@ -224,9 +224,9 @@ export SOFTOKEN_VPATCH
-e "s, at MOD_MAJOR_VERSION@,$SOFTOKEN_VMAJOR,g" \
-e "s, at MOD_MINOR_VERSION@,$SOFTOKEN_VMINOR,g" \
-e "s, at MOD_PATCH_VERSION@,$SOFTOKEN_VPATCH,g" \
- > ./mozilla/dist/pkgconfig/nss-softokn-config
+ > ./dist/pkgconfig/nss-softokn-config
-chmod 755 ./mozilla/dist/pkgconfig/nss-softokn-config
+chmod 755 ./dist/pkgconfig/nss-softokn-config
%check
@@ -245,18 +245,18 @@ export USE_64
# End -- copied from the build section
# enable the following line to force a test failure
-# find ./mozilla -name \*.chk | xargs rm -f
+# find . -name \*.chk | xargs rm -f
# Run test suite.
-SPACEISBAD=`find ./mozilla/security/nss/tests | grep -c ' '` ||:
+SPACEISBAD=`find ./nss/tests | grep -c ' '` ||:
if [ $SPACEISBAD -ne 0 ]; then
echo "error: filenames containing space are not supported (xargs)"
exit 1
fi
-rm -rf ./mozilla/tests_results
-cd ./mozilla/security/nss/tests/
+rm -rf ./tests_results
+cd ./nss/tests/
# all.sh is the test suite script
# only run cipher tests for nss-softokn
@@ -269,7 +269,7 @@ HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TES
cd ../../../../
-TEST_FAILURES=`grep -c FAILED ./mozilla/tests_results/security/localhost.1/output.log` || :
+TEST_FAILURES=`grep -c FAILED ./tests_results/security/localhost.1/output.log` || :
# test suite is failing on arm and has for awhile let's run the test suite but make it non fatal on arm
%ifnarch %{arm}
if [ $TEST_FAILURES -ne 0 ]; then
@@ -295,17 +295,17 @@ echo "test suite completed"
# Copy the binary libraries we want
for file in libsoftokn3.so libnssdbm3.so libfreebl3.so
do
- %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+ %{__install} -p -m 755 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
done
# Copy the binaries we ship as unsupported
for file in bltest fipstest shlibsign
do
- %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+ %{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done
# Copy the include files we want
-for file in mozilla/dist/public/nss/*.h
+for file in dist/public/nss/*.h
do
%{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
done
@@ -313,18 +313,18 @@ done
# Copy some freebl include files we also want
for file in blapi.h alghmac.h
do
- %{__install} -p -m 644 mozilla/dist/private/nss/$file $RPM_BUILD_ROOT/%{_includedir}/nss3
+ %{__install} -p -m 644 dist/private/nss/$file $RPM_BUILD_ROOT/%{_includedir}/nss3
done
# Copy the static freebl library
for file in libfreebl.a
do
-%{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+%{__install} -p -m 644 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
done
# Copy the package configuration files
-%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
-%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
+%{__install} -p -m 644 ./dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
+%{__install} -p -m 755 ./dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
%clean
@@ -370,8 +370,8 @@ done
%dir %{_includedir}/nss3
#
# The following headers are those exported public in
-# mozilla/security/nss/lib/freebl/manifest.mn and
-# mozilla/security/nss/lib/softoken/manifest.mn
+# nss/lib/freebl/manifest.mn and
+# nss/lib/softoken/manifest.mn
#
# The following list is short because many headers, such as
# the pkcs #11 ones, have been provided by nss-util-devel
@@ -382,6 +382,10 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Fri Apr 05 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-0.1.beta.1
+- Update to NSS_3_15_BETA1
+- Update spec file, patches, and helper scrips on account of a shallwer source tree
+
* Fri Feb 15 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.3-1
- Update to NSS_3_14_3_RTM
- Resolves: rhbz#909781 - specfile support for AArch64
diff --git a/nss-split-softokn.sh b/nss-split-softokn.sh
index ff280b0..b05e797 100755
--- a/nss-split-softokn.sh
+++ b/nss-split-softokn.sh
@@ -28,84 +28,85 @@ softokn_dir=${name}-softokn-${version}
# make_nss_softokn
#-------------------------------------------------
# create the nss-softokn subset consisting of
-# mozilla/dbm --- full directory
-# mozilla/security --- top empty
-# mozilla/security/coreconf --- full directory
-# mozilla/security/nss --- top files only
-# mozilla/security/nss/lib --- top files only
-# mozilla/security/nss/lib/freebl --- full directory
-# mozilla/security/nss/lib/softoken --- full directory
-# mozilla/security/nss/lib/softoken/dbm --- full directory
+# nss/dbm full directory
+# nss/coreconf full directory
+# nss top files only
+# nss/lib top files only
+# nss/lib/freebl full directory
+# nss/lib/softoken full directory
+# nss/lib/softoken/dbm full directory
#-------------------------------------------------------
-SOFTOKN_WORK=${softokn_dir}-work
-rm -rf ${SOFTOKN_WORK}
-mkdir ${SOFTOKN_WORK}
+WORK=${softokn_dir}-work
+rm -rf ${WORK}
+mkdir ${WORK}
# copy everything
-cp -a ${nss_source_dir} ${SOFTOKN_WORK}/${softokn_dir}
+cp -a ${nss_source_dir} ${WORK}/${softokn_dir}
# remove subdirectories that we don't want
-rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
-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`
+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
+# 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/
+topFilesL=`find ${nss_source_dir}/nss/lib/ -maxdepth 1 -mindepth 1 -type f`
for f in $topFilesL; do
- cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
+ cp -p $f ${WORK}/${softokn_dir}/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`
+mkdir ${WORK}/${softokn_dir}/nss/lib/util
+# copy entire dbm, freebl and softoken directories recursively
+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 ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/
+ cp -p $f ${WORK}/${softokn_dir}/nss/
done
-# and some Makefiles and related files from mozilla/security/nss
-topFilesN=`find ${nss_source_dir}/mozilla/security/nss/ -maxdepth 1 -mindepth 1 -type f`
+# 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
- cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/
+ cp -p $f ${WORK}/${softokn_dir}/nss/
done
-# we do need bltest, lib, lowhashtest, and shlibsign from mozilla/security/nss/cmd
-mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
+# we do need bltest, lib, lowhashtest, and shlibsign from nss/cmd
+mkdir ${WORK}/${softokn_dir}/nss/cmd
# copy some files at the top and the slhlib subdirectory
-topFilesC=`find ${nss_source_dir}/mozilla/security/nss/cmd/ -maxdepth 1 -mindepth 1 -type f`
+topFilesC=`find ${nss_source_dir}/nss/cmd/ -maxdepth 1 -mindepth 1 -type f`
for f in $topFilesC; do
- cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/
+ cp -p $f ${WORK}/${softokn_dir}/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
+cp -a ${nss_source_dir}/nss/cmd/bltest ${WORK}/${softokn_dir}/nss/cmd/bltest
+cp -a ${nss_source_dir}/nss/cmd/fipstest ${WORK}/${softokn_dir}/nss/cmd/fipstest
+cp -a ${nss_source_dir}/nss/cmd/lib ${WORK}/${softokn_dir}/nss/cmd/lib
+cp -a ${nss_source_dir}/nss/cmd/lowhashtest ${WORK}/${softokn_dir}/nss/cmd/lowhashtest
+cp -a ${nss_source_dir}/nss/cmd/shlibsign ${WORK}/${softokn_dir}/nss/cmd/shlibsign
-# plus common and crypto from mozilla/security/nss/tests
-mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
-topFilesT=`find ${nss_source_dir}/mozilla/security/nss/tests/ -maxdepth 1 -mindepth 1 -type f`
+# plus common and crypto from nss/tests
+mkdir ${WORK}/${softokn_dir}/nss/tests
+topFilesT=`find ${nss_source_dir}/nss/tests/ -maxdepth 1 -mindepth 1 -type f`
for f in $topFilesT; do
- cp -p $f ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests/
+ cp -p $f ${WORK}/${softokn_dir}/nss/tests/
done
keepers="cipher common"
for t in $keepers; do
- cp -a ${nss_source_dir}/mozilla/security/nss/tests/$t ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests/$t
+ cp -a ${nss_source_dir}/nss/tests/$t ${WORK}/${softokn_dir}/nss/tests/$t
done
-pushd ${SOFTOKN_WORK}
+pushd ${WORK}
# the compressed tar ball for nss-softokn
tar -cjf ../${name}-softokn-${version}-stripped.tar.bz2 ${softokn_dir}
popd
# cleanup after ourselves
rm -fr ${nss_source_dir}
-rm -rf ${SOFTOKN_WORK}
+rm -rf ${WORK}
diff --git a/softoken-minimal-test-dependencies.patch b/softoken-minimal-test-dependencies.patch
index 85f9a99..a2626ab 100644
--- a/softoken-minimal-test-dependencies.patch
+++ b/softoken-minimal-test-dependencies.patch
@@ -1,6 +1,6 @@
-diff -up ./mozilla/security/nss/cmd/Makefile.crypto ./mozilla/security/nss/cmd/Makefile
---- ./mozilla/security/nss/cmd/Makefile.crypto 2012-12-22 11:53:10.493563258 -0800
-+++ ./mozilla/security/nss/cmd/Makefile 2012-12-22 11:56:09.472669390 -0800
+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.
@@ -16,10 +16,10 @@ diff -up ./mozilla/security/nss/cmd/Makefile.crypto ./mozilla/security/nss/cmd/M
INCLUDES += \
-I$(DIST)/../public/security \
-diff -up ./mozilla/security/nss/cmd/manifest.mn.crypto ./mozilla/security/nss/cmd/manifest.mn
---- ./mozilla/security/nss/cmd/manifest.mn.crypto 2012-11-17 03:52:36.000000000 -0800
-+++ ./mozilla/security/nss/cmd/manifest.mn 2012-12-22 11:51:35.171495546 -0800
-@@ -9,53 +9,10 @@ DEPTH = ../..
+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
+@@ -9,54 +9,10 @@ DEPTH = ..
REQUIRES = nss nspr libdbm
DIRS = lib \
@@ -52,6 +52,7 @@ diff -up ./mozilla/security/nss/cmd/manifest.mn.crypto ./mozilla/security/nss/cm
- p7sign \
- p7verify \
- pk12util \
+- pk11gcmtest \
- pk11mode \
- pk1sign \
- pkix-errcodes \
@@ -75,9 +76,9 @@ diff -up ./mozilla/security/nss/cmd/manifest.mn.crypto ./mozilla/security/nss/cm
$(NULL)
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-11-13 17:14:08.000000000 -0800
-+++ ./mozilla/security/nss/cmd/platlibs.mk 2012-12-22 11:51:35.175495549 -0800
+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)
@@ -173,9 +174,9 @@ diff -up ./mozilla/security/nss/cmd/platlibs.mk.crypto ./mozilla/security/nss/cm
-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 11:16:39.000000000 -0700
-+++ ./mozilla/security/nss/tests/all.sh 2012-12-22 11:51:35.178495551 -0800
+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
fi
diff --git a/sources b/sources
index f65b0e9..4b2fad0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d200ec78ced4c79a9a52a70590027878 nss-softokn-3.14.2-stripped.tar.bz2
-2eb085eb0e9f62b555af1b05ebe86faa nss-softokn-3.14.3-stripped.tar.bz2
+4f969b16a605caab53d5b607d9b711df nss-softokn-3.15-stripped.tar.bz2
More information about the scm-commits
mailing list