nss: update to 3.13.1.

srcpkgs/nss/depends

@@ -1,2 +1,2 @@
 abi_depends=">=3.12.4"
-api_depends="${abi_depends}"
+api_depends=">=3.13.1"

srcpkgs/nss/files/nss-config.in

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/usr/bin
+prefix=@prefix@
 
 major_version=@MOD_MAJOR_VERSION@
 minor_version=@MOD_MINOR_VERSION@

srcpkgs/nss/files/nss.pc.in

@@ -0,0 +1,11 @@
+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 -lnssutil3
+Cflags: -I${includedir}

srcpkgs/nss/nss-devel.template

@@ -5,17 +5,12 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
-Add_dependency run zlib-devel
 Add_dependency run nspr-devel
-Add_dependency run sqlite-devel
 Add_dependency run nss
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
+	vmove usr/bin/nss-config usr/bin
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	vmove usr/lib/pkgconfig usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/include usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 }

srcpkgs/nss/patches/nss-no-rpath.patch

@@ -0,0 +1,14 @@
+--- mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
++++ mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
+@@ -52,9 +52,9 @@
+ 
+ ifeq ($(OS_ARCH), Linux)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
+ else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
+ endif
+ endif
+ 

srcpkgs/nss/patches/series

@@ -1,3 +0,0 @@
-distrust-diginotar.patch
-add_spi+cacert_ca_certs.patch
-ssl-renegotiate-transitional.patch

srcpkgs/nss/template

@@ -1,14 +1,13 @@
 # Template file for 'nss'
 pkgname=nss
-version=3.12.11
+version=3.13.1
-revision=2
 _distver=$(echo $version|sed -e "s|\.|_|g")
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${_distver}_RTM/src/${pkgname}-${version}.tar.gz"
 short_desc="Mozilla Network Security Services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mozilla.org/projects/security/pki/nss/"
 license="GPL-2, MPL-1.1"
-checksum=d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16
+checksum=95d933b59be466f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660
 long_desc="
  Network Security Services (NSS) is a set of libraries designed to support
  cross-platform development of security-enabled server applications.
@@ -22,8 +21,14 @@ Add_dependency build zlib-devel
 Add_dependency build nspr-devel
 Add_dependency build sqlite-devel
 
-do_build()
+do_build() {
-{
+	# Respect LDFLAGS
+	sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
+		-i mozilla/security/coreconf/rules.mk
+
+	# Generate certdata.c from certdata.txt
+	make -C mozilla/security/nss/lib/ckfw/builtins generate
+
 	if [ "$XBPS_MACHINE" = "x86_64" ]; then
 		_use64="USE_64=1"
 	fi
@@ -32,49 +37,55 @@ do_build()
 			LIBRUNPATH= BUILD_OPT=1 \
 			NSS_USE_SYSTEM_SQLITE=1 \
 			NSPR_INCLUDE_DIR=/usr/include/nspr \
-			NSPR_LIB_DIR=/usr/lib ${_use64}
+			NSPR_LIB_DIR=/usr/lib \
+			XCFLAGS="${CFLAGS}" ${_use64}
 	done
 }
 
-do_install()
+do_install() {
-{
+	vmkdir usr/lib/pkgconfig
-	install -d ${DESTDIR}/usr/include/nss \
+	vmkdir usr/bin
-		${DESTDIR}/usr/lib/pkgconfig
+	vmkdir usr/include/nss
-	install -m644 mozilla/dist/public/nss/*.h \
-		${DESTDIR}/usr/include/nss
-	install -m755 mozilla/dist/*.OBJ/lib/*.so \
-		${DESTDIR}/usr/lib
-	for f in libcrmf.a libnssb.a libnssckfw.a; do
-		install -m644 mozilla/dist/*.OBJ/lib/${f} \
-			${DESTDIR}/usr/lib
-	done
-
-	( \
-	  echo "prefix=/usr"; \
-	  echo "exec_prefix=/usr/bin"; \
-	  echo "libdir=/usr/lib"; \
-	  echo "includedir=/usr/include/nss"; \
-	  echo; \
-	  echo "Name: NSS"; \
-	  echo "Description: Mozilla Network Security Services"; \
-	  echo "Version: ${version}"; \
-	  echo "Requires: nspr >= ${version}"; \
-	  echo "Cflags: -I/usr/include/nss"; \
-	  echo "Libs: -lnss3 -lsmime3 -lssl3 -lnssutil3"; \
-	) >${DESTDIR}/usr/lib/pkgconfig/nss.pc
-	chmod 644 ${DESTDIR}/usr/lib/pkgconfig/nss.pc
-	cd ${DESTDIR}/usr/lib/pkgconfig && ln -s nss.pc mozilla-nss.pc 
-
-	cd ${wrksrc}
-	mkdir -p ${DESTDIR}/usr/bin
 
 	NSS_VMAJOR=$(grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}')
 	NSS_VMINOR=$(grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}')
 	NSS_VPATCH=$(grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}')
-	sed "${FILESDIR}/nss-config.in" \
+
+	sed ${FILESDIR}/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%,${version},g" \
+		-e "s,%NSS_VERSION%,${version},g" > \
+		${DESTDIR}/usr/lib/pkgconfig/nss.pc
+
+	ln -sf nss.pc ${DESTDIR}/usr/lib/pkgconfig/mozilla-nss.pc
+	chmod 644 ${DESTDIR}/usr/lib/pkgconfig/*.pc
+
+	sed ${FILESDIR}/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" \
-		> "${DESTDIR}/usr/bin/nss-config"
+		> ${DESTDIR}/usr/bin/nss-config
-	chmod 755 "${DESTDIR}/usr/bin/nss-config"
+	chmod 755 ${DESTDIR}/usr/bin/nss-config
+
+	for f in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
+		libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so; do
+		install -m755 mozilla/dist/*.OBJ/lib/${f} ${DESTDIR}/usr/lib
+	done
+
+	install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a ${DESTDIR}/usr/lib
+	install -m644 mozilla/dist/*.OBJ/lib/*.chk ${DESTDIR}/usr/lib
+
+	for f in certutil cmsutil crlutil modutil pk12util shlibsign \
+		signtool signver ssltap; do
+		install -m755 mozilla/dist/*.OBJ/bin/${f} ${DESTDIR}/usr/bin
+	done
+
+	install -m644 mozilla/dist/public/nss/*.h ${DESTDIR}/usr/include/nss
 }