[Lunar-commits] <moonbase> nss: Updated to 3_12_5, uses new nspr module

[Terry Chan]

commit 0a279eae7476b6d70c4e13f663ed95ee49b8a71c
Author: Terry Chan <tchan at lunar-linux.org>
Date:   Mon Jan 4 10:48:04 2010 -0600

    nss: Updated to 3_12_5, uses new nspr module
---
 libs/nss/BUILD   |   46 ++++++++++++++++++++++++++++++----------------
 libs/nss/DEPENDS |    2 ++
 libs/nss/DETAILS |   18 +++++++++---------
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/libs/nss/BUILD b/libs/nss/BUILD
index 2c24d68..b9b5df1 100644
--- a/libs/nss/BUILD
+++ b/libs/nss/BUILD
@@ -1,40 +1,54 @@
 (
+  
+  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+
   export WORKINGDIR=$PWD  &&
   export BUILD_OPT=1      &&
   export NSS_USE_SYSTEM_SQLITE=1 &&
+  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` &&
+  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L//'` &&
+  export USE_SYSTEM_ZLIB=1 &&
+  export NSDISTMODE=copy &&
+  export NSS_ENABLE_ECC=1 &&
+  export FREEBL_NO_DEPEND=1 &&
+  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 &&
+  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 &&
+
+  cd mozilla/security/coreconf &&
+  sedit 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk &&
 
   if [ "`arch`" == "x86_64" ]; then
     export USE_64=1
   fi &&
 
-  patch_it $SOURCE2 1     &&
-
-  cd mozilla/security/nss &&
-  make nss_build_all      &&
+  make &&
+  cd ../dbm &&
+  make &&
+  cd ../nss &&
+  make &&
   cd ../..                &&
 
   export NSS_LINUXDIR=$(basename `ls -d $WORKINGDIR/mozilla/dist/Linux*`)
 
   prepare_install &&
 
-  install -v -m755 nsprpub/$NSS_LINUXDIR/config/nspr-config \
-                   security/nss/cmd/config/nss-config \
-                   /usr/bin &&
+  install -v -m755 security/nss/config/nss-config /usr/bin &&
 
   mkdir -p /usr/lib/pkgconfig &&
-  install -v -m644 nsprpub/lib/pkgconfig/nspr.pc \
-                   security/nss/lib/pkgconfig/nss.pc \
-                   /usr/lib/pkgconfig &&
+  install -v -m644 security/nss/config/nss.pc /usr/lib/pkgconfig &&
 
   cd dist &&
 
-  install -v -m755 ${NSS_LINUXDIR}/lib/*.so /usr/lib &&
-  install -v -m644 ${NSS_LINUXDIR}/lib/{*.chk,libcrmf.a} /usr/lib &&
-
-  mkdir -p /usr/include/{nss,nspr} &&
+  mkdir -p /usr/lib/nss &&
+  install -v -m755 ${NSS_LINUXDIR}/lib/*.so /usr/lib/nss &&
+  install -v -m644 ${NSS_LINUXDIR}/lib/{*.chk,*.a} /usr/lib/nss &&
+  mkdir -p /usr/include/nss &&
   install -v -m644 {public,private}/nss/* /usr/include/nss/ &&
-  cp -v -RL ${NSS_LINUXDIR}/include/* /usr/include/nspr/ &&
 
-  chmod -v 0644 /usr/include/nspr/prvrsion.h
+  cd /usr/lib/nss &&
+  for file in *.so; do
+    mv ${file} ${file}.${MINOR_VER}
+    ln -s ${file}.${MINOR_VER} ${file}
+  done
 
 ) > $C_FIFO 2>&1
diff --git a/libs/nss/DEPENDS b/libs/nss/DEPENDS
index 1f6ab23..4cea4dc 100644
--- a/libs/nss/DEPENDS
+++ b/libs/nss/DEPENDS
@@ -1 +1,3 @@
 depends sqlite
+depends zlib
+depends nspr
diff --git a/libs/nss/DETAILS b/libs/nss/DETAILS
index f7e72da..a68b591 100644
--- a/libs/nss/DETAILS
+++ b/libs/nss/DETAILS
@@ -1,15 +1,15 @@
           MODULE=nss
-         VERSION=3.12
-         SUB_VER=with-nspr-4.7
-          SOURCE=$MODULE-$VERSION-$SUB_VER.tar.gz
-          SOURCE2=nss-3.11-fedora_fixes-1.patch
-      SOURCE_URL=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_RTM/src/
+         VERSION=3.12.5
+       MINOR_VER=12
+          SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=$MODULE-$VERSION-gentoo-fixups.diff 
+      SOURCE_URL=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_5_RTM/src/
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:b0234852906a2b0a1f3d88600e1089de469a9fe2
-     SOURCE2_VFY=sha1:efa36f9b25571b1ba30cd5900a3d646fc02c86d5
-        WEB_SITE=http://www.mozilla.org
+      SOURCE_VFY=sha1:ec12c6eddba5fb4609a174b079095b374935d37c
+     SOURCE2_VFY=sha1:e50b55be77f62516f735acfb41a1e47509572cd8
+        WEB_SITE=http://www.mozilla.org/projects/security/pki/nss
          ENTERED=20060418
-         UPDATED=20080812
+         UPDATED=20100104
            PSAFE="no"
            SHORT="a set of libraries to support development of security-enabled applications"
 cat << EOF