[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (7dc0799dc40ed81d08dfefb16a518d8f16dd7f8c)

Ladislav Hagara scm at sourcemage.org
Wed Mar 24 22:23:43 EDT 2010


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 crypto/nss/BUILD     |    3 ++-
 crypto/nss/DETAILS   |   17 ++++++++++++-----
 crypto/nss/HISTORY   |    5 +++++
 crypto/nss/INSTALL   |    3 ++-
 crypto/nss/PRE_BUILD |   11 ++++++++---
 5 files changed, 29 insertions(+), 10 deletions(-)

New commits:
commit 7dc0799dc40ed81d08dfefb16a518d8f16dd7f8c
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    nss 3.12.6
    used firefox tarball, official nss tarball hasn't been released yet

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 4aa02ae..d031446 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -8,7 +8,8 @@ then
   MAKE_OPTS="USE_64=1"
 fi &&
 
-cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
+#cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
+cd $SOURCE_DIRECTORY/mozilla-1.9.2/security/coreconf &&
 
 echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk &&
 
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 6827968..4d6abe6 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,7 +1,7 @@
             SPELL=nss
 
 if [ -z "$NSS_BRANCH" ] || [ "$NSS_BRANCH" == "DEFAULT" ]; then
-  NSS_BRANCH=3.11
+  NSS_BRANCH=3.12
 fi
 
 case $NSS_BRANCH in
@@ -13,10 +13,17 @@ case $NSS_BRANCH in
        PATCHLEVEL=1
   ;;
   3.12)
-          VERSION=3.12.5
-           SOURCE=$SPELL-$VERSION.tar.gz
-    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_5_RTM/src/$SOURCE
-      SOURCE_HASH=sha512:8463659f0e7befa0c594383bbe7ee950c7af225c0bc8aa04d1fe693441c6a9ce00740d957c02c246ab10d648488798ad35b13ea38c104c4727cedc86311a82b2
+          VERSION=3.12.6
+        FFVERSION=3.6.2
+#           SOURCE=$SPELL-$VERSION.tar.gz
+#    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_5_RTM/src/$SOURCE
+#      SOURCE_HASH=sha512:8463659f0e7befa0c594383bbe7ee950c7af225c0bc8aa04d1fe693441c6a9ce00740d957c02c246ab10d648488798ad35b13ea38c104c4727cedc86311a82b2
+          SOURCE=firefox-$FFVERSION.source.tar.bz2
+         SOURCE2=$SOURCE.asc
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG=firefox.gpg:$SOURCE2:WORKS_FOR_ME
+   SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
   ;;
 esac
 
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index dda9326..33accea 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,8 @@
+2010-03-25 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.12.6, NSS_BRANCH=3.12
+	* DETAILS, PRE_BUILD, BUILD, INSTALL: used firefox tarball, official nss
+	  tarball hasn't been released yet
+
 2009-12-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.12.5
 
diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index e1721e0..fd93d14 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,4 +1,5 @@
-cd $SOURCE_DIRECTORY/mozilla/dist &&
+#cd $SOURCE_DIRECTORY/mozilla/dist &&
+cd $SOURCE_DIRECTORY/mozilla-1.9.2/dist &&
 install -v -d -m755 $INSTALL_ROOT/usr/lib/nss &&
 install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
 install -v -m755 */lib/*.so $INSTALL_ROOT/usr/lib &&
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 4c67d87..4c1b85b 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,8 +1,13 @@
-default_pre_build  &&
+#default_pre_build  &&
 
-cd $SOURCE_DIRECTORY &&
+#cd $SOURCE_DIRECTORY &&
 
-patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch &&
+mk_source_dir  $SOURCE_DIRECTORY  &&
+cd  $SOURCE_DIRECTORY             &&
+unpack_file  ''                   &&
+cd  mozilla-1.9.2                 &&
+
+patch -p2 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch &&
 
 if [[ "$NSS_PEM" == "y" ]]; then
 tar jxvf $SCRIPT_DIRECTORY/nss-pem-20080124.tar.bz2 &&



More information about the SM-Commit mailing list