From 715d442ec70f6d91de57180d6db67fd929909755 Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik@crux.nu>
Date: Tue, 6 Aug 2013 18:33:47 +0200
Subject: nss: updated to 3.15.1

---
 nss/.md5sum |  2 +-
 nss/Pkgfile | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'nss')

diff --git a/nss/.md5sum b/nss/.md5sum
index 0df808f5d..aa7a50867 100644
--- a/nss/.md5sum
+++ b/nss/.md5sum
@@ -1,3 +1,3 @@
-b326c2be8df277f62fb9c65fb3428148  nss-3.14.3.tar.gz
+fb68f4d210ac9397dd0d3c39c4f938eb  nss-3.15.1.tar.gz
 17226659298a9d9bb3f323186d220f6f  nss-config.in
 4bb2893f773bb168271521e654861e29  nss.pc.in
diff --git a/nss/Pkgfile b/nss/Pkgfile
index 21ead6914..1059fad01 100644
--- a/nss/Pkgfile
+++ b/nss/Pkgfile
@@ -4,30 +4,30 @@
 # Depends on:  nspr sqlite3
 
 name=nss
-version=3.14.3
-release=2
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/$name-$version.tar.gz \
+version=3.15.1
+release=1
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/$name-$version.tar.gz \
         nss-config.in nss.pc.in)
 
 build() {
-    cd $name-$version
+    cd $name-$version/
 
     local file
 
          # Do not override CC from commands.mk
          # CCC is unused for g++, comment out
          # And respect system CFLAGS
-         sed -i mozilla/security/coreconf/Linux.mk \
-                 -e 's|^CC.*=.*gcc$|#&|' \
-                 -e 's|^CCC.*=.*g++$|#&|' \
-                 -e "s|^OS_CFLAGS.*= |& $CFLAGS |"
+        # sed -i mozilla/security/coreconf/Linux.mk \
+        #         -e 's|^CC.*=.*gcc$|#&|' \
+        #         -e 's|^CCC.*=.*g++$|#&|' \
+        #         -e "s|^OS_CFLAGS.*= |& $CFLAGS |"
 
     export NSPR_INCLUDE_DIR=/usr/include/nspr
     export NSPR_LIB_DIR=/usr/lib
     export NSS_USE_SYSTEM_SQLITE=1
     export BUILD_OPT=1
 
-    make -j1 USE_64=1 -C mozilla/security/nss build_coreconf build_dbm all
+    make -j1 USE_64=1 -C nss all
 
     install -d $PKG/usr/{bin,lib/pkgconfig,include/nss}
 
@@ -36,7 +36,7 @@ build() {
         libsoftokn3.chk libnssckbi.so libfreebl3.so libfreebl3.chk \
         libcrmf.a libnssb.a libnssckfw.a libnssutil3.so libnssdbm3.so
     do
-        install -m 0644 mozilla/dist/*.OBJ/lib/$file $PKG/usr/lib
+        cp -L dist/*.OBJ/lib/$file $PKG/usr/lib
     done
 
     chmod +x $PKG/usr/lib/*.so
@@ -44,12 +44,11 @@ build() {
     for file in \
         certutil cmsutil crlutil modutil pk12util signtool signver ssltap
     do
-        install -m 0755 mozilla/dist/*.OBJ/bin/$file $PKG/usr/bin
+        cp -L dist/*.OBJ/bin/$file $PKG/usr/bin
     done
 
-    install -m 0644 mozilla/dist/public/nss/*.h $PKG/usr/include/nss
+    cp -L dist/public/nss/*.h $PKG/usr/include/nss
 
-    # we have to provide our own nss-config, because xulrunner needs it
     install -m 0755 $SRC/nss-config.in $PKG/usr/bin/nss-config
 
     sed -i "s/@VERSION@/$version/" $PKG/usr/bin/nss-config
-- 
cgit v1.2.3