[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9ef38d0d3307e888d75bef5b66f7f05a685498af)

Ladislav Hagara scm at sourcemage.org
Fri Mar 26 06:17:04 EDT 2010


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

 crypto/nss/BUILD     |    4 ++--
 crypto/nss/DETAILS   |   20 ++++++++++----------
 crypto/nss/HISTORY   |    3 +++
 crypto/nss/INSTALL   |    4 ++--
 crypto/nss/PRE_BUILD |   14 +++++++-------
 5 files changed, 24 insertions(+), 21 deletions(-)

New commits:
commit 9ef38d0d3307e888d75bef5b66f7f05a685498af
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    nss: used official nss tarball
    
    some developers / users don't want to download huge firefox tarball
    sources are the same
    
    $ ls -l firefox-3.6.2.source.tar.bz2 nss-3.12.6.tar.gz
    -rw-r--r-- 1 root root 48919538 Mar 23 08:27 firefox-3.6.2.source.tar.bz2
    -rw-r--r-- 1 root root  5947630 Mar 25 13:50 nss-3.12.6.tar.gz

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index d031446..d037513 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -8,8 +8,8 @@ then
   MAKE_OPTS="USE_64=1"
 fi &&
 
-#cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
-cd $SOURCE_DIRECTORY/mozilla-1.9.2/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 4d6abe6..c5d4fdf 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -14,16 +14,16 @@ case $NSS_BRANCH in
   ;;
   3.12)
           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
+#        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_6_RTM/src/$SOURCE
+      SOURCE_HASH=sha512:2d60ae88bef62f873db03225df2216790b945e2da13b032eff8fd41cec88945f8aedec9ee9a1dede5d295e0cf38326bca74a248b7bb6a16e91918125cdb9459d
+#          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 33accea..fefab15 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2010-03-26 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS, PRE_BUILD, BUILD, INSTALL: used official nss tarball
+
 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
diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index fd93d14..9c595d1 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,5 +1,5 @@
-#cd $SOURCE_DIRECTORY/mozilla/dist &&
-cd $SOURCE_DIRECTORY/mozilla-1.9.2/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 4c1b85b..8bb47d3 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,13 +1,13 @@
-#default_pre_build  &&
+default_pre_build  &&
 
-#cd $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
 
-mk_source_dir  $SOURCE_DIRECTORY  &&
-cd  $SOURCE_DIRECTORY             &&
-unpack_file  ''                   &&
-cd  mozilla-1.9.2                 &&
+#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 &&
+patch -p1 < $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