[crux-commits] ports/opt (2.4): nss: updated to 3.12.

27 Jun 2008

commit 7ea91a86884cd9bd583d9989e7392962ea44700f
Author: Tilman Sauerbeck <tilman@crux.nu>
Date:   Tue Jun 24 19:40:48 2008 +0200

    nss: updated to 3.12.
    
    Dropped nss.pc because it doesn't seem to be needed strictly and
    upstream isn't supplying it.

diff --git a/nss/.footprint b/nss/.footprint
index 331b7fc..c144631 100644
--- a/nss/.footprint
+++ b/nss/.footprint
@@ -1,72 +1,15 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/certutil
+-rwxr-xr-x	root/root	usr/bin/cmsutil
+-rwxr-xr-x	root/root	usr/bin/crlutil
 -rwxr-xr-x	root/root	usr/bin/modutil
--rwxr-xr-x	root/root	usr/bin/nspr-config
 -rwxr-xr-x	root/root	usr/bin/nss-config
 -rwxr-xr-x	root/root	usr/bin/pk12util
 -rwxr-xr-x	root/root	usr/bin/signtool
+-rwxr-xr-x	root/root	usr/bin/signver
 -rwxr-xr-x	root/root	usr/bin/ssltap
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/nspr/
--rw-r--r--	root/root	usr/include/nspr/nspr.h
-drwxr-xr-x	root/root	usr/include/nspr/obsolete/
--rw-r--r--	root/root	usr/include/nspr/obsolete/pralarm.h
--rw-r--r--	root/root	usr/include/nspr/obsolete/probslet.h
--rw-r--r--	root/root	usr/include/nspr/obsolete/protypes.h
--rw-r--r--	root/root	usr/include/nspr/obsolete/prsem.h
--rw-r--r--	root/root	usr/include/nspr/plarena.h
--rw-r--r--	root/root	usr/include/nspr/plarenas.h
--rw-r--r--	root/root	usr/include/nspr/plbase64.h
--rw-r--r--	root/root	usr/include/nspr/plerror.h
--rw-r--r--	root/root	usr/include/nspr/plgetopt.h
--rw-r--r--	root/root	usr/include/nspr/plhash.h
--rw-r--r--	root/root	usr/include/nspr/plresolv.h
--rw-r--r--	root/root	usr/include/nspr/plstr.h
--rw-r--r--	root/root	usr/include/nspr/pratom.h
--rw-r--r--	root/root	usr/include/nspr/prbit.h
--rw-r--r--	root/root	usr/include/nspr/prclist.h
--rw-r--r--	root/root	usr/include/nspr/prcmon.h
--rw-r--r--	root/root	usr/include/nspr/prcountr.h
--rw-r--r--	root/root	usr/include/nspr/prcpucfg.h
--rw-r--r--	root/root	usr/include/nspr/prcvar.h
--rw-r--r--	root/root	usr/include/nspr/prdtoa.h
--rw-r--r--	root/root	usr/include/nspr/prenv.h
--rw-r--r--	root/root	usr/include/nspr/prerr.h
--rw-r--r--	root/root	usr/include/nspr/prerror.h
--rw-r--r--	root/root	usr/include/nspr/prinet.h
--rw-r--r--	root/root	usr/include/nspr/prinit.h
--rw-r--r--	root/root	usr/include/nspr/prinrval.h
--rw-r--r--	root/root	usr/include/nspr/prio.h
--rw-r--r--	root/root	usr/include/nspr/pripcsem.h
-drwxr-xr-x	root/root	usr/include/nspr/private/
--rw-r--r--	root/root	usr/include/nspr/private/pprio.h
--rw-r--r--	root/root	usr/include/nspr/private/pprthred.h
--rw-r--r--	root/root	usr/include/nspr/private/prpriv.h
--rw-r--r--	root/root	usr/include/nspr/prlink.h
--rw-r--r--	root/root	usr/include/nspr/prlock.h
--rw-r--r--	root/root	usr/include/nspr/prlog.h
--rw-r--r--	root/root	usr/include/nspr/prlong.h
--rw-r--r--	root/root	usr/include/nspr/prmem.h
--rw-r--r--	root/root	usr/include/nspr/prmon.h
--rw-r--r--	root/root	usr/include/nspr/prmwait.h
--rw-r--r--	root/root	usr/include/nspr/prnetdb.h
--rw-r--r--	root/root	usr/include/nspr/prolock.h
--rw-r--r--	root/root	usr/include/nspr/prpdce.h
--rw-r--r--	root/root	usr/include/nspr/prprf.h
--rw-r--r--	root/root	usr/include/nspr/prproces.h
--rw-r--r--	root/root	usr/include/nspr/prrng.h
--rw-r--r--	root/root	usr/include/nspr/prrwlock.h
--rw-r--r--	root/root	usr/include/nspr/prshm.h
--rw-r--r--	root/root	usr/include/nspr/prshma.h
--rw-r--r--	root/root	usr/include/nspr/prsystem.h
--rw-r--r--	root/root	usr/include/nspr/prthread.h
--rw-r--r--	root/root	usr/include/nspr/prtime.h
--rw-r--r--	root/root	usr/include/nspr/prtpool.h
--rw-r--r--	root/root	usr/include/nspr/prtrace.h
--rw-r--r--	root/root	usr/include/nspr/prtypes.h
--rw-r--r--	root/root	usr/include/nspr/prvrsion.h
--rw-r--r--	root/root	usr/include/nspr/prwin16.h
 drwxr-xr-x	root/root	usr/include/nss/
 -rw-r--r--	root/root	usr/include/nss/base64.h
 -rw-r--r--	root/root	usr/include/nss/blapit.h
@@ -156,28 +99,19 @@ drwxr-xr-x	root/root	usr/include/nss/
 -rw-r--r--	root/root	usr/include/nss/sslerr.h
 -rw-r--r--	root/root	usr/include/nss/sslproto.h
 -rw-r--r--	root/root	usr/include/nss/sslt.h
+-rw-r--r--	root/root	usr/include/nss/utilrename.h
 -rw-r--r--	root/root	usr/include/nss/watcomfx.h
 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
--rw-r--r--	root/root	usr/lib/libfreebl3.so
--rw-r--r--	root/root	usr/lib/libnspr4.a
-lrwxrwxrwx	root/root	usr/lib/libnspr4.so -> libnspr4.so.7
--rw-r--r--	root/root	usr/lib/libnspr4.so.7
--rw-r--r--	root/root	usr/lib/libnss3.so
+-rwxr-xr-x	root/root	usr/lib/libfreebl3.so
+-rwxr-xr-x	root/root	usr/lib/libnss3.so
 -rw-r--r--	root/root	usr/lib/libnssb.a
--rw-r--r--	root/root	usr/lib/libnssckbi.so
+-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/libplc4.a
-lrwxrwxrwx	root/root	usr/lib/libplc4.so -> libplc4.so.7
--rw-r--r--	root/root	usr/lib/libplc4.so.7
--rw-r--r--	root/root	usr/lib/libplds4.a
-lrwxrwxrwx	root/root	usr/lib/libplds4.so -> libplds4.so.7
--rw-r--r--	root/root	usr/lib/libplds4.so.7
--rw-r--r--	root/root	usr/lib/libsmime3.so
+-rwxr-xr-x	root/root	usr/lib/libnssdbm3.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
--rw-r--r--	root/root	usr/lib/libsoftokn3.so
--rw-r--r--	root/root	usr/lib/libssl3.so
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/nspr.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/nss.pc
+-rwxr-xr-x	root/root	usr/lib/libsoftokn3.so
+-rwxr-xr-x	root/root	usr/lib/libssl3.so
diff --git a/nss/.md5sum b/nss/.md5sum
index 16f8ccc..69ca89e 100644
--- a/nss/.md5sum
+++ b/nss/.md5sum
@@ -1,5 +1,2 @@
-f937c37f45b116130fef34b15afb6fac  nspr-4.7.tar.gz
-2083f33e11dfe15feb7bf9bca0f6c44b  nspr.pc.in
-5df54e8522bebf0f8c8c22e8f0df18fa  nss-3.11.9.tar.gz
-dcdd6c57768e7edbf0b145f7b16b55d7  nss-config.in
-b73f54ab40847797d0f2284b4fba03b3  nss.pc.in
+917f4e05f3982bd7fceaede197f0e1d4  nss-3.12.tar.gz
+17226659298a9d9bb3f323186d220f6f  nss-config.in
diff --git a/nss/Pkgfile b/nss/Pkgfile
index 98fd709..c7febcc 100644
--- a/nss/Pkgfile
+++ b/nss/Pkgfile
@@ -1,122 +1,47 @@
 # Description: Mozilla Network Security Services (NSS)
-# URL: http://www.mozilla.org/projects/security/pki/nss/
-# Maintainer: Brett Goulder, predatorfreak at dcaf-security dot org
-# Packager: Simone Rota, sip at varlock dot com
+# URL:         http://www.mozilla.org/projects/security/pki/nss/
+# Maintainer:  Tilman Sauerbeck, tilman at crux dot nu
+# Depends on:  nspr sqlite3
 
 name=nss
-version=3.11.9
-nspr_version=4.7
-release=2
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_9_RTM/src/nss-$version.tar.gz \
-	ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$nspr_version/src/nspr-$nspr_version.tar.gz \
-	nspr.pc.in nss.pc.in nss-config.in)
+version=3.12.0
+release=1
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_RTM/src/$name-3.12.tar.gz \
+        nss-config.in)
 
 build() {
-	local file files NSPR_LIBS NSPR_CFLAGS NSPR_VERSION \
-	NSS_VMAJOR NSS_VMINOR NSS_VPATCH
+    cd $name-${version%.*}
 
-	export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-	export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+    local file
 
-	cd nss-$version
-	mv $SRC/nspr-$nspr_version/mozilla/* mozilla/
+    export NSPR_INCLUDE_DIR=/usr/include/nspr
+    export NSPR_LIB_DIR=/usr/lib
+    export NSS_USE_SYSTEM_SQLITE=1
+    export BUILD_OPT=1
 
-	./mozilla/nsprpub/configure \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--includedir=/usr/include/nspr \
-		--enable-optimize="$CFLAGS" \
-		--disable-debug
+    make -j1 -C mozilla/security/nss build_coreconf build_dbm all
 
-	make
-	export MINOR_VERSION=7
-	make DESTDIR=$PKG install
+    install -d $PKG/usr/{bin,lib,include/nss}
 
-	pushd $PKG/usr/lib
-	for file in *.so; do
-		mv $file "$file.$MINOR_VERSION"
-		ln -s "$file.$MINOR_VERSION" $file
-	done
-	popd
+    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
+        install -m 0644 mozilla/dist/*.OBJ/lib/$file $PKG/usr/lib
+    done
 
-	export NSPR_INCLUDE_DIR="$SRC/nss-$version/dist/include/nspr"
-	export NSPR_LIB_DIR="$SRC/nss-$version/dist/lib"
+    chmod +x $PKG/usr/lib/*.so
 
-	NSPR_LIBS=`./config/nspr-config --libs`
-	NSPR_CFLAGS=`./config/nspr-config --cflags`
-	NSPR_VERSION=`./config/nspr-config --version`
+    for file in \
+        certutil cmsutil crlutil modutil pk12util signtool signver ssltap
+    do
+        install -m 0755 mozilla/dist/*.OBJ/bin/$file $PKG/usr/bin
+    done
 
-	install -d $PKG/usr/lib/pkgconfig
+    install -m 0644 mozilla/dist/public/nss/*.h $PKG/usr/include/nss
 
-	sed $SRC/nspr.pc.in \
-		-e "s,@libdir@,/usr/lib," \
-		-e "s,@prefix@,/usr," \
-		-e "s,@exec_prefix@,/usr/bin," \
-		-e "s,@includedir@,/usr/include/nspr," \
-		-e "s,@NSPR_VERSION@,$NSPR_VERSION," \
-		-e "s,@FULL_NSPR_LIBS@,$NSPR_LIBS," \
-		-e "s,@FULL_NSPR_CFLAGS@,$NSPR_CFLAGS," > \
-		$PKG/usr/lib/pkgconfig/nspr.pc
-
-	pushd $PKG/usr/lib/pkgconfig
-	popd
-	install -D -m 0755 config/nspr-config $PKG/usr/bin/nspr-config
-
-	make -j 1 BUILD_OPT=1 XCFLAGS="$CFLAGS" -C mozilla/security/coreconf
-	make -j 1 BUILD_OPT=1 XCFLAGS="$CFLAGS" -C mozilla/security/dbm
-	make -j 1 BUILD_OPT=1 XCFLAGS="$CFLAGS" -C mozilla/security/nss
-
-	find $PKG/usr/lib/ -type f -exec chmod a-x {} \;
-	install -d $PKG/usr/include/nss
-	file='mozilla/security/nss/lib/nss/nss.h'
-	NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" $file | awk '{print $3}'`
-	NSS_VMINOR=`grep "#define.*NSS_VMINOR" $file | awk '{print $3}'`
-	NSS_VPATCH=`grep "#define.*NSS_VPATCH" $file | awk '{print $3}'`
-
-	sed $SRC/nss.pc.in \
-		-e "s,@libdir@,/usr/lib,g" \
-		-e "s,@prefix@,/usr,g" \
-		-e "s,@exec_prefix@,/usr/bin,g" \
-		-e "s,@includedir@,/usr/include/nss,g" \
-		-e "s,@NSPR_VERSION@,$NSPR_VERSION,g" \
-		-e "s,@NSS_VERSION@,$version,g" > \
-		$PKG/usr/lib/pkgconfig/nss.pc
-
-	chmod 0644 $PKG/usr/lib/pkgconfig/*.pc
-
-	sed $SRC/nss-config.in \
-		-e "s,@libdir@,/usr/lib,g" \
-		-e "s,@prefix@,/usr/bin,g" \
-		-e "s,@exec_prefix@,/usr/bin,g" \
-		-e "s,@includedir@,/usr/include/nss,g" \
-		-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
-		-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
-		-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
-		> $PKG/usr/bin/nss-config
-
-	chmod 0755 $PKG/usr/bin/nss-config
-
-	files="libnss3.so libssl3.so libsmime3.so libsoftokn3.so \
-		libsoftokn3.chk libnssckbi.so libfreebl3.so libfreebl3.chk \
-		libcrmf.a libnssb.a libnssckfw.a"
-	
-	for file in $files; do
-		install -m 0644 mozilla/dist/*.OBJ/lib/$file $PKG/usr/lib/
-	done
-
-	for file in certutil modutil pk12util signtool ssltap; do
-		install -m 0755 mozilla/dist/*.OBJ/bin/$file $PKG/usr/bin/
-	done
-
-	install -m 0644 mozilla/dist/public/nss/*.h $PKG/usr/include/nss/
-
-	rm \
-		$PKG/usr/bin/compile-et.pl \
-		$PKG/usr/bin/prerr.properties \
-		$PKG/usr/share/aclocal/nspr.m4
-
-	rm -r \
-		$PKG/usr/include/nspr/md \
-		$PKG/usr/share
+    # 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
 }
-
diff --git a/nss/nspr.pc.in b/nss/nspr.pc.in
deleted file mode 100644
index 9951a5b..0000000
--- a/nss/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: @NSPR_VERSION@
-Libs: @FULL_NSPR_LIBS@
-Cflags: @FULL_NSPR_CFLAGS@
diff --git a/nss/nss-config.in b/nss/nss-config.in
index c2e3af3..1a5aec4 100644
--- a/nss/nss-config.in
+++ b/nss/nss-config.in
@@ -1,10 +1,7 @@
 #!/bin/sh
 
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
+prefix=/usr
+version=@VERSION@
 
 usage()
 {
@@ -20,6 +17,7 @@ Options:
 	[--cflags]
 Dynamic Libraries:
 	nss
+	nssutil
 	ssl
 	smime
 EOF
@@ -33,6 +31,7 @@ fi
 lib_ssl=yes
 lib_smime=yes
 lib_nss=yes
+lib_nssutil=yes
 
 while test $# -gt 0; do
   case "$1" in
@@ -66,7 +65,7 @@ while test $# -gt 0; do
       echo_libdir=yes
       ;;
     --version)
-      echo ${major_version}.${minor_version}.${patch_version}
+      echo $version
       ;;
     --cflags)
       echo_cflags=yes
@@ -83,6 +82,9 @@ while test $# -gt 0; do
     nss)
       lib_nss=yes
       ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -92,13 +94,13 @@ done
 
 # Set variables that may be dependent upon other variables
 if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
+    exec_prefix=${prefix}
 fi
 if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
+    includedir=${prefix}/include/nss
 fi
 if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
+    libdir=${exec_prefix}/lib
 fi
 
 if test "$echo_prefix" = "yes"; then
@@ -122,15 +124,19 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+      libdirs="-L$libdir"
       if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
+	libdirs="$libdirs -lssl3"
       fi
       if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
+	libdirs="$libdirs -lsmime3"
       fi
       if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
+	libdirs="$libdirs -lnss3"
+      fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil3"
       fi
       echo $libdirs
 fi
+
diff --git a/nss/nss.pc.in b/nss/nss.pc.in
deleted file mode 100644
index 95e023e..0000000
--- a/nss/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: NSS
-Description: Network Security Services
-Version: @NSS_VERSION@
-Requires: nspr >= @NSPR_VERSION@
-Libs: -lssl3 -lsmime3 -lnss3
-Cflags: -I${includedir}

    

[crux-commits] ports/opt (2.4): nss: updated to 3.12.

crux＠crux.nu