nss: additional headers, library, pkgconfig files

Add files to support building openjdk with sunec enabled.
This patch adds installing the freebl static library
and the headers necessary to build with it, as well as
pkg-config files for the nss-util and nss-softokn modules
which the icedtea build harness looks for when verifying
whether system supports sun elliptic curve crypto.

nss/.footprint

@@ -84,6 +84,9 @@ drwxr-xr-x	root/root	usr/include/nss/
 -rw-r--r--	root/root	usr/include/nss/pkcs7t.h
 -rw-r--r--	root/root	usr/include/nss/portreg.h
 -rw-r--r--	root/root	usr/include/nss/preenc.h
+drwxr-xr-x	root/root	usr/include/nss/private/
+-rw-r--r--	root/root	usr/include/nss/private/alghmac.h
+-rw-r--r--	root/root	usr/include/nss/private/blapi.h
 -rw-r--r--	root/root	usr/include/nss/secasn1.h
 -rw-r--r--	root/root	usr/include/nss/secasn1t.h
 -rw-r--r--	root/root	usr/include/nss/seccomon.h
@@ -114,6 +117,7 @@ drwxr-xr-x	root/root	usr/include/nss/
 -rw-r--r--	root/root	usr/include/nss/utilrename.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libcrmf.a
+-rw-r--r--	root/root	usr/lib/libfreebl.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
@@ -129,4 +133,6 @@ drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libsoftokn3.so
 -rwxr-xr-x	root/root	usr/lib/libssl3.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/nss-softokn.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/nss-util.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/nss.pc

nss/.md5sum

@@ -1,3 +1,5 @@
 4c1204af8372a9a07c6fc7ed5c636f74  nss-3.31.tar.gz
 17226659298a9d9bb3f323186d220f6f  nss-config.in
+bf2ff51cef976ccd0a4832835eec8195  nss-softokn.pc.in
+9ad2a26c137208ff292061143c7cc227  nss-util.pc.in
 a796e6ab6c87573ffb649ce8769bc07a  nss.pc.in

nss/Pkgfile

@@ -5,9 +5,9 @@
 
 name=nss
 version=3.31
-release=1
+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)
+        nss-config.in nss.pc.in nss-util.pc.in nss-softokn.pc.in)
 
 build() {
 	cd $name-$version/
@@ -28,15 +28,17 @@ build() {
 
 	make -j1 -C nss
 
-	install -d $PKG/usr/{bin,lib/pkgconfig,include/nss}
+	install -d $PKG/usr/{bin,lib/pkgconfig,include/nss/private}
 
 	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
+	install -t "$PKG/usr/lib" -m644 libcrmf.a libfreebl.a *.chk
 	cd ../../public/nss
 	install -t "$PKG/usr/include/nss" -m644 *.h
+	cd ../../private/nss
+	install -t "$PKG/usr/include/nss/private" -m644 blapi.h alghmac.h
 	install -m 0755 $SRC/nss-config.in $PKG/usr/bin/nss-config
 
 	_version=$(printf "%i.%i.%i" ${version//./ })
@@ -45,15 +47,17 @@ build() {
 	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
+	for module in nss nss-util nss-softokn; do
+		sed $SRC/$module.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/$module.pc
+	done
 
 }

nss/nss-softokn.pc.in

@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-SOFTOKN
+Description: Network Security Services Softoken PKCS #11 Module
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
+Libs: -lfreebl3 -lnssdbm3 -lsoftokn3
+Cflags: -I${includedir}/private

nss/nss-util.pc.in

@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-UTIL
+Description: Network Security Services Utility Library
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -L${libdir} -lnssutil3
+Cflags: -I${includedir}