[arch-commits] Commit in nss/repos (6 files)

Sun Jun 22 17:39:16 UTC 2008

Date: Sunday, June 22, 2008 @ 13:39:16
  Author: jgc
Revision: 3411

Merged revisions 2-3410 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/nss/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r3292 | jgc | 2008-06-21 22:45:35 +0000 (Sat, 21 Jun 2008) | 2 lines
  
  upgpkg: nss 3.12rc4-1
      Update to 3.12 RC4 as required by Xulrunner 1.9/Firefox 3.0
........

Added:
  nss/repos/extra-x86_64/nss-nolocalsql.patch
    (from rev 3292, nss/trunk/nss-nolocalsql.patch)
Modified:
  nss/repos/extra-x86_64/	(properties)
  nss/repos/extra-x86_64/PKGBUILD
  nss/repos/extra-x86_64/nss-config.in
  nss/repos/extra-x86_64/nss.pc.in
Deleted:
  nss/repos/extra-x86_64/nss.pc

----------------------+
 PKGBUILD             |   34 ++++++++++++++++++-------------
 nss-config.in        |    8 +++++++
 nss-nolocalsql.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++++++
 nss.pc               |   11 ----------
 nss.pc.in            |    2 -
 5 files changed, 82 insertions(+), 26 deletions(-)


Property changes on: nss/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /nss/trunk:1
   + /nss/trunk:1-3410

Modified: extra-x86_64/PKGBUILD
===================================================================

--- extra-x86_64/PKGBUILD	2008-06-22 17:37:12 UTC (rev 3410)
+++ extra-x86_64/PKGBUILD	2008-06-22 17:39:16 UTC (rev 3411)
@@ -2,23 +2,31 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=nss
-pkgver=3.11.9
+pkgver=3.12rc4
+_nssver=3.12.0.3
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.7
-depends=("nspr>=${_nsprver}")
+_nsprver=4.7.1
+depends=("nspr>=${_nsprver}" 'sqlite3>=3.5.9-2')
 replaces=('nss-nspr')
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_9_RTM/src/${pkgname}-${pkgver}.tar.gz
+source=(#ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_9_RTM/src/${pkgname}-${pkgver}.tar.gz
+	ftp://ftp.archlinux.org/other/nss/nss-${pkgver}.tar.bz2
+	nss-nolocalsql.patch
 	nss.pc.in
 	nss-config.in)
+md5sums=('9a18090d4f43f3019246d0a1cd55925c'
+         '1837781eed35bfb6f826cfb3efcd6409'
+         'c547b030c57fe1ed8b77c73bf52b3ded'
+         '46bee81908f1e5b26d6a7a2e14c64d9f')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/nss-nolocalsql.patch || return 1
+  unset CFLAGS
+  unset CXXFLAGS
   export BUILD_OPT=1
-  export XCFLAGS=${CFLAGS}
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
   export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
@@ -43,7 +51,7 @@
 				-e "s,%exec_prefix%,/usr/bin,g" \
 				-e "s,%includedir%,/usr/include/nss,g" \
 				-e "s,%NSPR_VERSION%,${_nsprver},g" \
-				-e "s,%NSS_VERSION%,${pkgver},g" > \
+				-e "s,%NSS_VERSION%,${_nssver},g" > \
 			${startdir}/pkg/usr/lib/pkgconfig/nss.pc || return 1
   ln -sf nss.pc ${startdir}/pkg/usr/lib/pkgconfig/mozilla-nss.pc || return 1
   chmod 644 ${startdir}/pkg/usr/lib/pkgconfig/*.pc || return 1
@@ -58,18 +66,16 @@
 			    > ${startdir}/pkg/usr/bin/nss-config || return 1
   chmod 755 ${startdir}/pkg/usr/bin/nss-config || return 1
 
-  for file in libnss3.so libssl3.so libsmime3.so \
-	      libsoftokn3.so libnssckbi.so \
-	      libfreebl3.so; do
+  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
+              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
+  do
     install -m755 mozilla/dist/*.OBJ/lib/${file} ${startdir}/pkg/usr/lib/ || return 1
   done
-  
-
-  for file in libcrmf.a libnssb.a libnssckfw.a libfreebl3.chk libsoftokn3.chk; do
+  for file in libcrmf.a libnssb.a libnssckfw.a; do
     install -m644 mozilla/dist/*.OBJ/lib/${file} ${startdir}/pkg/usr/lib/ || return 1
   done
 
-  for file in certutil modutil pk12util signtool ssltap; do
+  for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap; do
     install -m755 mozilla/dist/*.OBJ/bin/${file} ${startdir}/pkg/usr/bin/ || return 1
   done
 

Modified: extra-x86_64/nss-config.in
===================================================================
--- extra-x86_64/nss-config.in	2008-06-22 17:37:12 UTC (rev 3410)
+++ extra-x86_64/nss-config.in	2008-06-22 17:39:16 UTC (rev 3411)
@@ -20,6 +20,7 @@
 	[--cflags]
 Dynamic Libraries:
 	nss
+	nssutil
 	ssl
 	smime
 EOF
@@ -33,6 +34,7 @@
 lib_ssl=yes
 lib_smime=yes
 lib_nss=yes
+lib_nssutil=yes
 
 while test $# -gt 0; do
   case "$1" in
@@ -83,6 +85,9 @@
     nss)
       lib_nss=yes
       ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -132,6 +137,9 @@
       if test -n "$lib_nss"; then
 	libdirs="$libdirs -lnss${major_version}"
       fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
       echo $libdirs
 fi      
 

Copied: nss/repos/extra-x86_64/nss-nolocalsql.patch (from rev 3292, nss/trunk/nss-nolocalsql.patch)
===================================================================
--- extra-x86_64/nss-nolocalsql.patch	                        (rev 0)
+++ extra-x86_64/nss-nolocalsql.patch	2008-06-22 17:39:16 UTC (rev 3411)
@@ -0,0 +1,53 @@
+diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile
+--- mozilla/security/nss/lib/Makefile.nolocalsql	2007-11-06 15:12:37.000000000 +0100
++++ mozilla/security/nss/lib/Makefile	2007-11-06 15:13:35.000000000 +0100
+@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
+ DIRS := $(filter-out fortcrypt,$(DIRS))
+ endif
+ 
+-ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
+-DIRS := sqlite $(DIRS)
+-endif
+-endif
++#ifndef MOZILLA_CLIENT
++#ifndef NSS_USE_SYSTEM_SQLITE
++#DIRS := sqlite $(DIRS)
++#endif
++#endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn
+--- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-11-06 15:10:59.000000000 +0100
++++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2007-11-06 15:11:07.000000000 +0100
+@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ CSRCS = \
+ 	dbmshim.c \
+diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn
+--- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2007-11-06 15:08:14.000000000 +0100
++++ mozilla/security/nss/lib/softoken/manifest.mn	2007-11-06 15:10:21.000000000 +0100
+@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ EXPORTS = \
+ 	pkcs11.h \
+diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk

Deleted: extra-x86_64/nss.pc
===================================================================
--- extra-x86_64/nss.pc	2008-06-22 17:37:12 UTC (rev 3410)
+++ extra-x86_64/nss.pc	2008-06-22 17:39:16 UTC (rev 3411)
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: NSS
-Description: Mozilla Network Security Services
-Version: 3.11
-Requires: mozilla-nspr >= 4.6.0
-Libs: -L${libdir} -lnss3 -lsmime3 -lssl3
-Cflags: -I${includedir}/nss

Modified: extra-x86_64/nss.pc.in
===================================================================
--- extra-x86_64/nss.pc.in	2008-06-22 17:37:12 UTC (rev 3410)
+++ extra-x86_64/nss.pc.in	2008-06-22 17:39:16 UTC (rev 3411)
@@ -7,5 +7,5 @@
 Description: Network Security Services
 Version: %NSS_VERSION%
 Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
 Cflags: -I${includedir}



