[nss-softokn] Split off nss-softokn from the full nss sources as released upstream
Elio Maldonado
emaldonado at fedoraproject.org
Wed Oct 23 18:01:22 UTC 2013
commit 5f0ffa2cf1b5dfbaf856887b21d18d6957478487
Author: Elio Maldonado <emaldona at redhat.com>
Date: Wed Oct 23 11:01:15 2013 -0700
Split off nss-softokn from the full nss sources as released upstream
- Bug 1019244 - ECDHE in openssl available -> NSS needs too for Firefox/Thunderbird
.gitignore | 2 +-
nss-softokn.spec | 42 +++++++++++++++++++++---------------------
nss-split-softokn.sh | 10 +++++-----
sources | 2 +-
4 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aa61db7..31dd004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.15.2-stripped.tar.bz2
+/nss-softokn-3.15.2.tar.gz
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 8173819..5129bd6 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.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -42,34 +42,26 @@ BuildRequires: gawk
BuildRequires: psmisc
BuildRequires: perl
-Source0: %{name}-%{version}-stripped.tar.bz2
-# The nss-softokn tar ball is a subset of nss-{version}-stripped.tar.bz2.
-# We use the nss-split-softokn.sh script to keep only what we need.
-# We first produce the full source archive from from the upstream,
-# nss-{version}-stripped.tar.gz, by running mozilla-crypto-strip.sh
-# to remove any non-free sources and then split off nss-softokn from nss
-# via nss-split-util.sh ${version}
+Source0: %{name}-%{version}.tar.gz
+# The nss-softokn tar ball is a subset of nss-{version}.tar.gz.
+# We use the nss-split-softokn.sh script to keep only what we need
+# via via nss-split-softokn.sh ${version}
# Detailed Steps:
# fedpkg clone nss-softokn
# cd nss-softokn
-# Download the nss-{version}-stripped.tar.gz tarball from upstream
-# Strip-off unwanted sources with
-# ./mozilla-crypto-srip.sh nss-{version}-stripped.tar.gz
-# which produces nss-{version}-stripped.tar.bz2
-# Make the source tarball for nss-softokn out of the nss stripped one:
+# Split off nss-softokn out of the full nss source tar ball:
# sh ./nss-split-softokn.sh ${version}
-# A file named {name}-{version}-stripped.tar.bz2 should appear
+# A file named {name}-{version}.tar.bz2 should appear
# which is ready for uploading to the lookaside cache.
-Source1: mozilla-crypto-strip.sh
-Source2: nss-split-softokn.sh
-Source3: nss-softokn.pc.in
-Source4: nss-softokn-config.in
+Source1: nss-split-softokn.sh
+Source2: nss-softokn.pc.in
+Source3: nss-softokn-config.in
Patch1: build-nss-softoken-only.patch
# Build only the softoken and freebl related tools
Patch8: softoken-minimal-test-dependencies.patch
# Select the tests to run based on the type of build
-# TODO: submit this patch upstream
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=902171
Patch9: nss-versus-softoken-tests.patch
# This patch uses the gcc-iquote dir option documented at
# http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
@@ -189,6 +181,8 @@ USE_64=1
export USE_64
%endif
+export NSS_ENABLE_ECC=1
+
# uncomment if the iquote patch is activated
export IN_TREE_FREEBL_HEADERS_FIRST=1
@@ -204,7 +198,7 @@ export NSS_BUILD_SOFTOKEN_ONLY=1
# The nspr_version and nss_util_version globals used here
# must match the ones nss-softokn has for its Requires.
%{__mkdir_p} ./dist/pkgconfig
-%{__cat} %{SOURCE3} | sed -e "s,%%libdir%%,%{_libdir},g" \
+%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
-e "s,%%prefix%%,%{_prefix},g" \
-e "s,%%exec_prefix%%,%{_prefix},g" \
-e "s,%%includedir%%,%{_includedir}/nss3,g" \
@@ -221,7 +215,7 @@ export SOFTOKEN_VMAJOR
export SOFTOKEN_VMINOR
export SOFTOKEN_VPATCH
-%{__cat} %{SOURCE4} | sed -e "s, at libdir@,%{_libdir},g" \
+%{__cat} %{SOURCE3} | sed -e "s, at libdir@,%{_libdir},g" \
-e "s, at prefix@,%{_prefix},g" \
-e "s, at exec_prefix@,%{_prefix},g" \
-e "s, at includedir@,%{_includedir}/nss3,g" \
@@ -250,6 +244,8 @@ export USE_64
# to test for the last tool built correctly
export NSS_BUILD_SOFTOKEN_ONLY=1
+export NSS_ENABLE_ECC=1
+
# End -- copied from the build section
# enable the following line to force a test failure
@@ -390,6 +386,10 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Thu Oct 17 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
+- Split off nss-softokn from the full nss sources as released upstream
+- Bug 1019244 - ECDHE in openssl available -> NSS needs too for Firefox/Thunderbird
+
* Thu Sep 26 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-1
- Update to NSS_3_15_2_RTM
- Update softokn splitting script to copy lowhash from full nss sources
diff --git a/nss-split-softokn.sh b/nss-split-softokn.sh
index d228e32..eb784f0 100755
--- a/nss-split-softokn.sh
+++ b/nss-split-softokn.sh
@@ -2,8 +2,8 @@
#
# Splits NSS into nss-util and nss-softokn
# Takes as command line input the version of nss
-# and assumes that a file nss-${nss_version}-stripped.tar.bz2
-# exits in the current directory
+# and assumes that a file nss-${nss_version}.tar.gz
+# exists in the current directory
set -e
@@ -16,9 +16,9 @@ fi
export name=nss
export version=$1
-echo "Extracting ${name}-${version}-stripped.tar.bz2"
+echo "Extracting ${name}-${version}.tar.gz"
-tar -xjf ${name}-${version}-stripped.tar.bz2
+tar -xzf ${name}-${version}.tar.gz
# the directory will be named ${name}-${version}
@@ -94,7 +94,7 @@ done
pushd ${WORK}
# the compressed tar ball for nss-softokn
-tar -cjf ../${name}-softokn-${version}-stripped.tar.bz2 ${softokn_dir}
+tar -czf ../${name}-softokn-${version}.tar.gz ${softokn_dir}
popd
# cleanup after ourselves
diff --git a/sources b/sources
index 5312224..0daa9d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec74edbdcf9dccf6972e3f5fe77aae56 nss-softokn-3.15.2-stripped.tar.bz2
+7fb9441bae687b4a1625e96b7e72c65a nss-softokn-3.15.2.tar.gz
More information about the scm-commits
mailing list