From ba655a9046f3ffa7fef5aa3640c8a1ba060a1a4f Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Tue, 7 Feb 2017 01:33:21 +0100
Subject: [PATCH] nss: fixed build

---
 nss/.footprint |   8 +++-
 nss/Pkgfile    | 104 +++++++++++++++++++++----------------------------
 2 files changed, 51 insertions(+), 61 deletions(-)

diff --git a/nss/.footprint b/nss/.footprint
index 08b83e0..f92bb84 100644
--- a/nss/.footprint
+++ b/nss/.footprint
@@ -6,9 +6,11 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/modutil
 -rwxr-xr-x	root/root	usr/bin/nss-config
 -rwxr-xr-x	root/root	usr/bin/pk12util
+-rwxr-xr-x	root/root	usr/bin/shlibsign
 -rwxr-xr-x	root/root	usr/bin/signtool
 -rwxr-xr-x	root/root	usr/bin/signver
 -rwxr-xr-x	root/root	usr/bin/ssltap
+-rwxr-xr-x	root/root	usr/bin/symkeyutil
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/nss/
 -rw-r--r--	root/root	usr/include/nss/base64.h
@@ -113,11 +115,13 @@ drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libcrmf.a
 -rw-r--r--	root/root	usr/lib/libfreebl3.chk
 -rwxr-xr-x	root/root	usr/lib/libfreebl3.so
+-rw-r--r--	root/root	usr/lib/libfreeblpriv3.chk
+-rwxr-xr-x	root/root	usr/lib/libfreeblpriv3.so
 -rwxr-xr-x	root/root	usr/lib/libnss3.so
--rw-r--r--	root/root	usr/lib/libnssb.a
 -rwxr-xr-x	root/root	usr/lib/libnssckbi.so
--rw-r--r--	root/root	usr/lib/libnssckfw.a
+-rw-r--r--	root/root	usr/lib/libnssdbm3.chk
 -rwxr-xr-x	root/root	usr/lib/libnssdbm3.so
+-rwxr-xr-x	root/root	usr/lib/libnsssysinit.so
 -rwxr-xr-x	root/root	usr/lib/libnssutil3.so
 -rwxr-xr-x	root/root	usr/lib/libsmime3.so
 -rw-r--r--	root/root	usr/lib/libsoftokn3.chk
diff --git a/nss/Pkgfile b/nss/Pkgfile
index eb03094..32da2e0 100644
--- a/nss/Pkgfile
+++ b/nss/Pkgfile
@@ -6,66 +6,52 @@
 
 name=nss
 version=3.28.1
-release=1
-source=(http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${version//./_}_RTM/src/$name-$version.tar.gz \
+release=2
+source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${version//./_}_RTM/src/$name-$version.tar.gz \
         nss-config.in nss.pc.in)
 
 build() {
-    cd $name-$version/
-
-    local file
-
-    sed -i nss/coreconf/Linux.mk \
-        -e 's|^CC.*=.*gcc$|#&|' \
-        -e 's|^CCC.*=.*g++$|#&|'
-
-    export NSPR_INCLUDE_DIR=/usr/include/nspr
-    export NSPR_LIB_DIR=/usr/lib
-    export NSS_USE_SYSTEM_SQLITE=1
-    export NSS_ENABLE_ECC=1
-    export BUILD_OPT=1
-    export XCFLAGS="-Wno-error ${CFLAGS}"
-    export NSS_DISABLE_GTESTS=1
-
-    make -j1 -C nss
-
-    install -d $PKG/usr/{bin,lib/pkgconfig,include/nss}
-
-    for file in \
-        libnss3.so libssl3.so libsmime3.so libsoftokn3.so \
-        libsoftokn3.chk libnssckbi.so libfreebl3.so libfreebl3.chk \
-        libcrmf.a libnssb.a libnssckfw.a libnssutil3.so libnssdbm3.so
-    do
-        cp -L dist/*.OBJ/lib/$file $PKG/usr/lib
-    done
-
-    chmod +x $PKG/usr/lib/*.so
-
-    for file in \
-        certutil cmsutil crlutil modutil pk12util signtool signver ssltap
-    do
-        cp -L dist/*.OBJ/bin/$file $PKG/usr/bin
-    done
-
-    cp -L dist/public/nss/*.h $PKG/usr/include/nss
-
-    install -m 0755 $SRC/nss-config.in $PKG/usr/bin/nss-config
-
-    _version=$(printf "%i.%i.%i" ${version//./ })
-    sed -i "s/@VERSION@/$_version/" $PKG/usr/bin/nss-config
-
-    NSS_LIBS=`$PKG/usr/bin/nss-config --libs`
-    NSS_CFLAGS=`$PKG/usr/bin/nss-config --cflags`
-    NSPR_VERSION=`pkg-config --modversion nspr`
-    sed $SRC/nss.pc.in \
-        -e "s,%libdir%,/usr/lib," \
-        -e "s,%prefix%,/usr," \
-        -e "s,%exec_prefix%,/usr/bin," \
-        -e "s,%includedir%,/usr/include/nss," \
-        -e "s,%NSS_VERSION%,$version," \
-        -e "s,%NSPR_VERSION%,$NSPR_VERSION," \
-        -e "s,%FULL_NSS_LIBS%,$NSS_LIBS," \
-        -e "s,%FULL_NSS_CFLAGS%,$NSS_CFLAGS," > \
-            $PKG/usr/lib/pkgconfig/nss.pc
-
+cd $name-$version/
+  sed -i nss/coreconf/Linux.mk \
+    -e 's|^CC.*=.*gcc$|#&|' \
+    -e 's|^CCC.*=.*g++$|#&|'
+
+  export NSPR_INCLUDE_DIR=/usr/include/nspr
+  export NSPR_LIB_DIR=/usr/lib
+  export NSS_USE_SYSTEM_SQLITE=1
+  export NSS_ENABLE_ECC=1
+  export NSS_ENABLE_TLS_1_3=1
+  export BUILD_OPT=1
+  export XCFLAGS="-Wno-error ${CFLAGS}"
+  export NSS_DISABLE_GTESTS=1
+
+  make -j1 -C nss
+
+  install -d $PKG/usr/{bin,lib/pkgconfig,include/nss}
+
+  cd dist/*.OBJ/bin
+  install -t "$PKG/usr/bin" *util shlibsign signtool signver ssltap
+  cd ../lib
+  install -t "$PKG/usr/lib" *.so
+  install -t "$PKG/usr/lib" -m644 libcrmf.a *.chk
+  cd ../../public/nss
+  install -t "$PKG/usr/include/nss" -m644 *.h
+  install -m 0755 $SRC/nss-config.in $PKG/usr/bin/nss-config
+
+  _version=$(printf "%i.%i.%i" ${version//./ })
+  sed -i "s/@VERSION@/$_version/" $PKG/usr/bin/nss-config
+
+  NSS_LIBS=`$PKG/usr/bin/nss-config --libs`
+  NSS_CFLAGS=`$PKG/usr/bin/nss-config --cflags`
+  NSPR_VERSION=`pkg-config --modversion nspr`
+  sed $SRC/nss.pc.in \
+    -e "s,%libdir%,/usr/lib," \
+    -e "s,%prefix%,/usr," \
+    -e "s,%exec_prefix%,/usr/bin," \
+    -e "s,%includedir%,/usr/include/nss," \
+    -e "s,%NSS_VERSION%,$version," \
+    -e "s,%NSPR_VERSION%,$NSPR_VERSION," \
+    -e "s,%FULL_NSS_LIBS%,$NSS_LIBS," \
+    -e "s,%FULL_NSS_CFLAGS%,$NSS_CFLAGS," > \
+  $PKG/usr/lib/pkgconfig/nss.pc
 }
-- 
2.26.2