nss: => 3.13.1

9 files changed, 14 insertions, 10 deletions

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 7a287c01b9..58702b8bc2 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -9,7 +9,6 @@ then
 fi &&
 
 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/DEPENDS b/crypto/nss/DEPENDS
index 193a11da02..489833f15c 100755
--- a/crypto/nss/DEPENDS
+++ b/crypto/nss/DEPENDS
@@ -2,4 +2,3 @@ depends  nspr  &&
 depends  perl  &&
 depends  sqlite &&
 depends  zip
-#depends  CVS
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 1eeb8fa775..ef46d002a1 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -28,9 +28,15 @@ case $NSS_BRANCH in
 #   SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
 #  SOURCE2_URL[0]=$SOURCE_URL.asc
   ;;
+  3.13)
+          VERSION=3.13.1
+           SOURCE=nss-3.13.1.with.ckbi.1.88.tar.gz
+    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_1_WITH_CKBI_1_88_RTM/src/$SOURCE
+      SOURCE_HASH=sha512:63ac912ee85730fdb084c6546de5759465dd2723ca26995af515181d660aa56f5a6120221760af58f73e2f008d5ffb496b700be4bace8896708f74f521f7e315
+  ;;
 esac
 
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
          WEB_SITE=http://www.mozilla.org/projects/security/pki/nss/
           ENTERED=20030919
        LICENSE[0]=MPL
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 7855a77f27..eaafe31473 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2011-12-20 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS, PREPARE, {PRE_}SUB_DEPENDS: added 3.13 branch
+
 2011-11-16 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 3.12.11.with.ckbi.1.88, SECURITY_PATCH=3
 
diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index 9c595d1558..e1721e0dba 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,5 +1,4 @@
 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/PREPARE b/crypto/nss/PREPARE
index 3f859e1945..50f62f70e8 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1 +1 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?" DEFAULT 3.11 3.12
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?" DEFAULT 3.11 3.12 3.13
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 9c1a176af9..7a3df5145e 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -2,11 +2,6 @@ default_pre_build  &&
 
 cd $SOURCE_DIRECTORY &&
 
-#mk_source_dir  $SOURCE_DIRECTORY  &&
-#cd  $SOURCE_DIRECTORY             &&
-#unpack_file  ''                   &&
-#cd  mozilla-1.9.2                 &&
-
 patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch &&
 
 if [[ "$NSS_PEM" == "y" ]]; then
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index 40b1d65887..dcd5d5642a 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
 case $THIS_SUB_DEPENDS in
    3.12.x) if [ $NSS_BRANCH == "3.12" ]; then return 0; fi;;
+   3.13.x) if [ $NSS_BRANCH == "3.13" ]; then return 0; fi;;
    PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
 esac
 return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index d89a37a763..4ec4937b51 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -1,6 +1,8 @@
 case $THIS_SUB_DEPENDS in
    3.12.x) echo "3.12.x release needed, forcing it."  &&
              NSS_BRANCH="3.12"                          ;;
+   3.13.x) echo "3.13.x release needed, forcing it."  &&
+             NSS_BRANCH="3.13"                          ;;
    PEM) echo "nss with pem needed, forcing it." &&
              NSS_PEM="y"                                ;;
    *)        echo "unknown sub-depends!"; return 1         ;;