Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MER#58 - update nss to newer version.
Signed-off-by: Marko Saukko <marko.saukko@gmail.com>
  • Loading branch information
saukko committed Mar 6, 2012
1 parent beb1dcb commit 927287a
Show file tree
Hide file tree
Showing 6 changed files with 235 additions and 79 deletions.
128 changes: 128 additions & 0 deletions mozilla-crypto-strip.sh
@@ -0,0 +1,128 @@
#!/bin/sh
set -e

if test -z $1
then
echo "usage: $0 <input-tarball>"
exit
fi

ORIGDIR=`pwd`
WORKDIR=nss_ecc_strip_working_dir
EXTENSION=`echo $1 | sed -r 's#^(.*)(.tar.bz2|.tbz2|.tar.gz|.tgz)$#\2#'`
BASE=`echo $1 | sed -r 's#^(.*)(.tar.bz2|.tbz2|.tar.gz|.tgz)$#\1#'`
COMPRESS=""

if test "x$EXTENSION" = "x.tar.bz2" || test "x$EXTENSION" = "x.tbz2"
then
COMPRESS="j"
fi

if test "x$EXTENSION" = "x.tar.gz" || test "x$EXTENSION" = "x.tgz"
then
COMPRESS="z"
fi

if test "x$COMPRESS" = "x"
then
echo "unable to process, input file $1 has unsupported extension"
exit
fi

echo "== extension is $EXTENSION - ok"
echo "== new extension will be $JEXTENSION"
echo "== cleaning old workdir $WORKDIR"

rm -rf $WORKDIR
mkdir $WORKDIR

echo "== extracting input archive $1"
tar -x -$COMPRESS -C $WORKDIR -f $1

echo "changing into $WORKDIR"
pushd $WORKDIR

DIRCOUNT=`ls -1 | wc -l`
if test $DIRCOUNT -ne 1
then
echo "unable to process, $1 contains more than one toplevel directory"
exit
fi

TOPDIR=`ls -1`
if test "x$TOPDIR" != "xmozilla"
then
# try to deal with a single additional subdirectory above "mozilla"
echo "== skipping toplevel directory $TOPDIR"
cd $TOPDIR
fi

DIRCOUNT=`ls -1 | wc -l`
if test $DIRCOUNT -ne 1
then
echo "unable to process, $1 contains more than one second level directory"
exit
fi

SINGLEDIR=`ls -1`
if test "x$SINGLEDIR" != "xmozilla"
then
echo "unable to process, first or second level directory is not mozilla"
exit
fi

echo "== input archive accepted, now processing"

REALFREEBLDIR=mozilla/security/nss/lib/freebl
FREEBLDIR=./$REALFREEBLDIR

rm -rf ./mozilla/security/nss/cmd/ecperf

mv ${FREEBLDIR}/ecl/ecl-exp.h ${FREEBLDIR}/save
rm -rf ${FREEBLDIR}/ecl/tests
rm -rf ${FREEBLDIR}/ecl/CVS
for i in ${FREEBLDIR}/ecl/* ; do
echo clobbering $i
> $i
done
mv ${FREEBLDIR}/save ${FREEBLDIR}/ecl/ecl-exp.h

for j in ${FREEBLDIR}/ec.*; do
echo unifdef $j
cat $j | \
awk 'BEGIN {ech=1; prt=0;} \
/^#[ \t]*ifdef.*NSS_ENABLE_ECC/ {ech--; next;} \
/^#[ \t]*if/ {if(ech < 1) ech--;} \
{if(ech>0) {;print $0};} \
/^#[ \t]*endif/ {if(ech < 1) ech++;} \
{if (prt && (ech<=0)) {;print $0}; } \
{if (ech>0) {prt=0;} } \
/^#[ \t]*else/ {if (ech == 0) prt=1;}' > $j.hobbled && \
mv $j.hobbled $j
done

echo "== returning to original directory"
popd

JCOMPRESS=j
JEXTENSION=.tar.bz2
NEWARCHIVE=$BASE-stripped$JEXTENSION
echo "== finally producing new archive $NEWARCHIVE"
tar -c -$JCOMPRESS -C $WORKDIR -f $NEWARCHIVE $TOPDIR

echo "== all done, listing of old and new archive:"
ls -l $1
ls -l $NEWARCHIVE

LISTING_DIR=""
if test "x$TOPDIR" != "xmozilla"
then
LISTING_DIR="$TOPDIR/$REALFREEBLDIR/ecl"
else
LISTING_DIR="$REALFREEBLDIR/ecl"
fi

echo "== FYI, producing listing of stripped dir in new archive"
tar -t -v -$JCOMPRESS -C $WORKDIR -f $NEWARCHIVE $LISTING_DIR


Binary file removed nss-3.12.10-stripped.tar.gz
Binary file not shown.
87 changes: 57 additions & 30 deletions nss-3.12.10-notimestamps.patch → nss-3.13.3-notimestamps.patch
@@ -1,6 +1,7 @@
diff -ru nss-3.12.10/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c
--- nss-3.12.10/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c 2004-08-31 19:28:50.000000000 +0200
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c 2011-11-25 20:35:27.536298403 +0100
diff --git a/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c b/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c
index f9b1a87..221e1a7 100644
--- a/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c
+++ b/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c
@@ -52,7 +52,7 @@
*/
const char __nss_builtins_rcsid[] = "$Header: NSS Builtin Trusted Root CAs "
Expand All @@ -11,9 +12,10 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/ckfw/builtins/ckbiver.c nss-3.12.1
NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c
--- nss-3.12.10/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c 2005-11-04 03:05:04.000000000 +0100
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c 2011-11-25 20:35:27.543298349 +0100
diff --git a/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c b/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c
index d692905..6255340 100644
--- a/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c
+++ b/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c
@@ -53,7 +53,7 @@
*/
const char __nss_ckcapi_rcsid[] = "$Header: NSS Access to Microsoft Certificate Store "
Expand All @@ -24,9 +26,10 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/ckfw/capi/ckcapiver.c nss-3.12.10-
NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c
--- nss-3.12.10/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c 2005-11-24 00:04:08.000000000 +0100
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c 2011-11-25 20:35:27.584298033 +0100
diff --git a/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c b/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c
index 9cbb2d2..d5940db 100644
--- a/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c
+++ b/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c
@@ -53,7 +53,7 @@
*/
const char __nss_ckmk_rcsid[] = "$Header: NSS Access to the MAC OS X Key Ring "
Expand All @@ -37,9 +40,10 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/ckfw/nssmkey/ckmkver.c nss-3.12.10
NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/ckfw/pem/ckpemver.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/ckfw/pem/ckpemver.c
--- nss-3.12.10/mozilla/security/nss/lib/ckfw/pem/ckpemver.c 2010-11-25 19:49:27.000000000 +0100
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/ckfw/pem/ckpemver.c 2011-11-25 20:35:27.611297824 +0100
diff --git a/mozilla/security/nss/lib/ckfw/pem/ckpemver.c b/mozilla/security/nss/lib/ckfw/pem/ckpemver.c
index 76ab5df..6498c3e 100644
--- a/mozilla/security/nss/lib/ckfw/pem/ckpemver.c
+++ b/mozilla/security/nss/lib/ckfw/pem/ckpemver.c
@@ -53,7 +53,7 @@
*/
const char __nss_ckpem_rcsid[] = "$Header: NSS Access to Flat Files in PEM format"
Expand All @@ -50,9 +54,10 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/ckfw/pem/ckpemver.c nss-3.12.10-no
NSS_CKPEM_LIBRARY_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/freebl/freeblver.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/freebl/freeblver.c
--- nss-3.12.10/mozilla/security/nss/lib/freebl/freeblver.c 2006-12-05 00:31:35.000000000 +0100
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/freebl/freeblver.c 2011-11-25 20:35:12.541413873 +0100
diff --git a/mozilla/security/nss/lib/freebl/freeblver.c b/mozilla/security/nss/lib/freebl/freeblver.c
index 2c59545..f3e38ed 100644
--- a/mozilla/security/nss/lib/freebl/freeblver.c
+++ b/mozilla/security/nss/lib/freebl/freeblver.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
Expand All @@ -62,9 +67,10 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/freebl/freeblver.c nss-3.12.10-not
const char __nss_freebl_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/nss/nssver.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/nss/nssver.c
--- nss-3.12.10/mozilla/security/nss/lib/nss/nssver.c 2004-04-25 17:03:12.000000000 +0200
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/nss/nssver.c 2011-11-25 20:35:12.660412957 +0100
diff --git a/mozilla/security/nss/lib/nss/nssver.c b/mozilla/security/nss/lib/nss/nssver.c
index 9d7f813..5f66ead 100644
--- a/mozilla/security/nss/lib/nss/nssver.c
+++ b/mozilla/security/nss/lib/nss/nssver.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
Expand All @@ -74,9 +80,10 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/nss/nssver.c nss-3.12.10-notimesta
const char __nss_base_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/smime/smimever.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/smime/smimever.c
--- nss-3.12.10/mozilla/security/nss/lib/smime/smimever.c 2004-04-25 17:03:16.000000000 +0200
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/smime/smimever.c 2011-11-25 20:35:13.069409807 +0100
diff --git a/mozilla/security/nss/lib/smime/smimever.c b/mozilla/security/nss/lib/smime/smimever.c
index df838e3..fb9585f 100644
--- a/mozilla/security/nss/lib/smime/smimever.c
+++ b/mozilla/security/nss/lib/smime/smimever.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
Expand All @@ -86,9 +93,27 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/smime/smimever.c nss-3.12.10-notim
const char __nss_smime_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/softoken/softkver.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/softoken/softkver.c
--- nss-3.12.10/mozilla/security/nss/lib/softoken/softkver.c 2006-12-05 00:31:35.000000000 +0100
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/softoken/softkver.c 2011-11-25 20:35:13.248408430 +0100
diff --git a/mozilla/security/nss/lib/softoken/legacydb/lginit.c b/mozilla/security/nss/lib/softoken/legacydb/lginit.c
index c1b1578..ca28f9e 100644
--- a/mozilla/security/nss/lib/softoken/legacydb/lginit.c
+++ b/mozilla/security/nss/lib/softoken/legacydb/lginit.c
@@ -60,10 +60,8 @@
* NOTE: the first component of the concatenated rcsid string
* must not end in a '$' to prevent rcs keyword substitution.
*/
-const char __nss_dbm_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
-const char __nss_dbm_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+const char __nss_dbm_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING " $";
+const char __nss_dbm_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING;

typedef struct LGPrivateStr {
NSSLOWCERTCertDBHandle *certDB;
diff --git a/mozilla/security/nss/lib/softoken/softkver.c b/mozilla/security/nss/lib/softoken/softkver.c
index 931d620..1b93143 100644
--- a/mozilla/security/nss/lib/softoken/softkver.c
+++ b/mozilla/security/nss/lib/softoken/softkver.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
Expand All @@ -98,9 +123,10 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/softoken/softkver.c nss-3.12.10-no
const char __nss_softokn_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/ssl/sslver.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/ssl/sslver.c
--- nss-3.12.10/mozilla/security/nss/lib/ssl/sslver.c 2004-04-25 17:03:17.000000000 +0200
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/ssl/sslver.c 2011-11-25 20:35:14.066402131 +0100
diff --git a/mozilla/security/nss/lib/ssl/sslver.c b/mozilla/security/nss/lib/ssl/sslver.c
index 782048f..d1e2266 100644
--- a/mozilla/security/nss/lib/ssl/sslver.c
+++ b/mozilla/security/nss/lib/ssl/sslver.c
@@ -51,6 +51,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
Expand All @@ -110,9 +136,10 @@ diff -ru nss-3.12.10/mozilla/security/nss/lib/ssl/sslver.c nss-3.12.10-notimesta
const char __nss_ssl_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " "Built in OBS" " " "see rpm -q --info nss for more information";
diff -ru nss-3.12.10/mozilla/security/nss/lib/util/secoid.c nss-3.12.10-notimestamps/mozilla/security/nss/lib/util/secoid.c
--- nss-3.12.10/mozilla/security/nss/lib/util/secoid.c 2010-08-16 20:28:39.000000000 +0200
+++ nss-3.12.10-notimestamps/mozilla/security/nss/lib/util/secoid.c 2011-11-25 20:35:14.162401391 +0100
diff --git a/mozilla/security/nss/lib/util/secoid.c b/mozilla/security/nss/lib/util/secoid.c
index c722897..c44bbf3 100644
--- a/mozilla/security/nss/lib/util/secoid.c
+++ b/mozilla/security/nss/lib/util/secoid.c
@@ -59,9 +59,9 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
Expand Down
Binary file added nss-3.13.3-stripped.tar.bz2
Binary file not shown.
6 changes: 5 additions & 1 deletion nss.changes
@@ -1,3 +1,8 @@
* Tue Feb 28 2012 Marko Saukko <marko.saukko@gmail.com> - 3.13.3
- Fixes MER#58: Update to version 3.13.3.
- Moved libs from /lib/ to /usr/lib/ part of MER#174
- Use system sqlite and zlib

* Fri Nov 25 2011 Carsten Munk <carsten@maemo.org> - 3.12.10
- Add patch to remove timestamps from nss, reducing rebuilds severely.

Expand All @@ -6,7 +11,6 @@
- patch nss-sysinit-fix-trustorder.patch removed
- patch nss-sysinit-userdb-first.patch upgraded


* Wed Jul 13 2011 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 3.12.9
- Removed patch nss-bug524013.patch from project directory

Expand Down

0 comments on commit 927287a

Please sign in to comment.