From 89f60053b6ecd4357cdf4c3d7040711222badf20 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Wed, 7 Aug 2013 17:56:01 -0400
Subject: [PATCH] Add nspr and nss

---
 config/packages-list   |  2 ++
 stage5/hv-install-1    |  3 +++
 stage5/packages-update |  3 +++
 stage5/pkg/nspr        | 14 ++++++++++++++
 stage5/pkg/nss         | 27 +++++++++++++++++++++++++++
 5 files changed, 49 insertions(+)
 create mode 100644 stage5/pkg/nspr
 create mode 100644 stage5/pkg/nss

diff --git a/config/packages-list b/config/packages-list
index 7a15a35..30e88c5 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -286,6 +286,8 @@ NETTLE="nettle-2.5"
 NEWLIB="newlib-1.16.0"
 NFS_UTILS="nfs-utils-1.2.5"
 NMAP="nmap-6.01"
+NSPR="nspr-4.10"
+NSS="nss-3.15.1"
 
 OPENJADE="openjade-1.3.2"
 OPENLDAP="openldap-2.4.23"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 4c3b61a..0b962a5 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -167,6 +167,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         NOCOLOR=1 ipkg ${MIDORI}
     fi
 
+    ipkg -m noac ${NSPR} "--with-mozilla --with-pthreads \
+        $([ $(uname -m) = x86_64 ] && echo --enable-64bit)"
+    ipkg -m noac ${NSS}
     ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
     ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
 
diff --git a/stage5/packages-update b/stage5/packages-update
index 7887002..59a0f32 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -134,6 +134,9 @@ fpkg -e "tar.xz" ${WEBKIT} "http://webkitgtk.org/releases"
 fpkg -m gnome ${VALA}
 fpkg ${MIDORI} "http://archive.xfce.org/src/apps/midori/$(get_pkg_ver2 ${MIDORI})"
 
+fpkg -m hv ${NSPR}
+fpkg -m hv ${NSS}
+
 fpkg -f "${FIREFOX}.source" ${FIREFOX} \
     "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
 
diff --git a/stage5/pkg/nspr b/stage5/pkg/nspr
new file mode 100644
index 0000000..34d8acf
--- /dev/null
+++ b/stage5/pkg/nspr
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+hvconfig_pre()
+{
+    cd ${LFS_TMP}/${PACKAGE}/nspr
+
+    ./configure ${CONFIGURE_OPTS}
+}
+
+hvbuild()
+{
+    ${HVMAKE}
+    ${HVMAKE} install
+}
diff --git a/stage5/pkg/nss b/stage5/pkg/nss
new file mode 100644
index 0000000..4a88ef4
--- /dev/null
+++ b/stage5/pkg/nss
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+hvbuild()
+{
+    cd ${LFS_TMP}/${PACKAGE}/nss
+
+    # This package does not support parallel build
+    make BUILD_OPT=1 \
+        NSPR_INCLUDE_DIR=/usr/include/nspr \
+        USE_SYSTEM_ZLIB=1 \
+        ZLIB_LIBS=-lz \
+        $([ $(uname -m) = x86_64 ] && echo USE_64=1) \
+        $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)
+}
+
+hvbuild_post()
+{
+    cd ${LFS_TMP}/${PACKAGE}/dist
+
+    install -v -m755 Linux*/lib/*.so /usr/lib
+    install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib
+    install -v -m755 -d /usr/include/nss
+    cp -v -RL {public,private}/nss/* /usr/include/nss
+    chmod 644 /usr/include/nss/*
+    install -v -m755 Linux*/bin/{certutil,nss-config,pk12util} /usr/bin
+    install -v -m644 Linux*/lib/pkgconfig/nss.pc /usr/lib/pkgconfig
+}
-- 
2.20.1