Update to September 5th, 2007 cvs snapshot

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9530 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 54 insertions, 35 deletions

diff --git a/security/nss/Makefile b/security/nss/Makefile
index c11bbb4e1..4aa169edd 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -3,16 +3,15 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/security/nss/Makefile,v 1.9 2007/07/10 14:55:03 ahze Exp $
+#    $MCom: ports/security/nss/Makefile,v 1.10 2007/08/15 18:29:15 mezz Exp $
 
 PORTNAME=	nss
-DISTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}-1
+DISTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}-2
 CATEGORIES=	security
 MASTER_SITES=	LOCAL
 MASTER_SITE_SUBDIR=	ahze
 #MASTER_SITES=	${MASTER_SITE_MOZILLA}
 #MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
-DISTNAME=	${PORTNAME}-3.11.5-1
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
@@ -20,6 +19,8 @@ COMMENT=	Libraries to support development of security-enabled applications
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
 
+USE_BZIP2=yes
+
 _MAJOR=	3
 _MINOR=	11
 _PATCH=	7
diff --git a/security/nss/distinfo b/security/nss/distinfo
index e0326a2d5..353b58a36 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,3 +1,3 @@
-MD5 (nss-3.11.5-1.tar.gz) = 4f2e51ce3adaf6d4ba605b0d677ca38b
-SHA256 (nss-3.11.5-1.tar.gz) = e0c1b083c7cc303d47f8aaeace3363e03daf3779c5fd97b580a963e1a7d8f7a8
-SIZE (nss-3.11.5-1.tar.gz) = 3663275
+MD5 (nss-3.11.7-2.tar.bz2) = 777e9249d32a1cac9ba79379eb180899
+SHA256 (nss-3.11.7-2.tar.bz2) = 97586947ccf84b091358618af59b937c9100bfd6e5ca911fa16b2d7c5e6315f2
+SIZE (nss-3.11.7-2.tar.bz2) = 3791065
diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb
index 58c0be72e..45f4a02ca 100644
--- a/security/nss/files/patch-sysdb
+++ b/security/nss/files/patch-sysdb
@@ -1,10 +1,5 @@
-This patches NSS' code to use the Operating System's standard <db.h> header
-and the db-implementation from -lc. Seems to work on FreeBSD.
-
-	-mi
-
---- lib/softoken/cdbhdl.h	Sun Apr 25 11:03:16 2004
-+++ lib/softoken/cdbhdl.h	Fri Jul 22 00:25:16 2005
+--- lib/softoken/legacydb/cdbhdl.h	Sun Apr 25 11:03:16 2004
++++ lib/softoken/legacydb/cdbhdl.h	Fri Jul 22 00:25:16 2005
 @@ -43,6 +43,6 @@
  #define _CDBHDL_H_
  
@@ -13,27 +8,18 @@ and the db-implementation from -lc. Seems to work on FreeBSD.
 +#include <nspr.h>
 +#include <db.h>
  #include "pcertt.h"
- 
---- lib/softoken/dbinit.c	Tue Mar 29 13:21:18 2005
-+++ lib/softoken/dbinit.c	Fri Jul 22 00:33:35 2005
-@@ -40,4 +40,5 @@
- 
- #include <ctype.h>
-+#include <fcntl.h>
- #include "seccomon.h"
- #include "prinit.h"
---- lib/softoken/dbmshim.c	Tue Mar 29 13:21:18 2005
-+++ lib/softoken/dbmshim.c	Fri Jul 22 00:35:33 2005
+ --- lib/softoken/legacydb/dbmshim.c	Tue Mar 29 13:21:18 2005
++++ lib/softoken/legacydb/dbmshim.c	Fri Jul 22 00:35:33 2005
 @@ -40,5 +40,6 @@
-  * $Id: patch-sysdb,v 1.3 2007-07-05 16:50:42 ahze Exp $
+  * $Id: patch-sysdb,v 1.4 2007-09-05 12:40:41 ahze Exp $
   */
 -#include "mcom_db.h"
 +#include <db.h>
 +#include <fcntl.h>
  #include "secitem.h"
  #include "secder.h"
---- lib/softoken/keydb.c	Fri Jun  4 20:50:32 2004
-+++ lib/softoken/keydb.c	Fri Jul 22 00:37:01 2005
+--- lib/softoken/legacydb/keydb.c	Fri Jun  4 20:50:32 2004
++++ lib/softoken/legacydb/keydb.c	Fri Jul 22 00:37:01 2005
 @@ -46,5 +46,6 @@
  #include "secitem.h"
  #include "pcert.h"
@@ -42,8 +28,8 @@ and the db-implementation from -lc. Seems to work on FreeBSD.
 +#include <fcntl.h>
  #include "lowpbe.h"
  #include "secerr.h"
---- lib/softoken/pcertdb.c	Tue Mar 29 13:21:18 2005
-+++ lib/softoken/pcertdb.c	Fri Jul 22 00:40:00 2005
+--- lib/softoken/legacydb/pcertdb.c	Tue Mar 29 13:21:18 2005
++++ lib/softoken/legacydb/pcertdb.c	Fri Jul 22 00:40:00 2005
 @@ -44,5 +44,6 @@
  #include "lowkeyti.h"
  #include "pcert.h"
@@ -52,8 +38,8 @@ and the db-implementation from -lc. Seems to work on FreeBSD.
 +#include <fcntl.h>
  #include "pcert.h"
  #include "secitem.h"
---- lib/softoken/pk11db.c	Fri Apr  1 19:46:13 2005
-+++ lib/softoken/pk11db.c	Fri Jul 22 00:42:01 2005
+--- lib/softoken/legacydb/pk11db.c	Fri Apr  1 19:46:13 2005
++++ lib/softoken/legacydb/pk11db.c	Fri Jul 22 00:42:01 2005
 @@ -42,5 +42,6 @@
  #include "pk11pars.h"
  #include "pkcs11i.h"
@@ -62,8 +48,8 @@ and the db-implementation from -lc. Seems to work on FreeBSD.
 +#include <fcntl.h>
  #include "cdbhdl.h"
  #include "secerr.h"
---- lib/softoken/keydbi.h	Tue Apr 27 19:04:38 2004
-+++ lib/softoken/keydbi.h	Fri Jul 22 00:43:24 2005
+--- lib/softoken/legacydb/keydbi.h	Tue Apr 27 19:04:38 2004
++++ lib/softoken/legacydb/keydbi.h	Fri Jul 22 00:43:24 2005
 @@ -42,7 +42,7 @@
  #define _KEYDBI_H_
  
@@ -74,8 +60,8 @@ and the db-implementation from -lc. Seems to work on FreeBSD.
 +#include <db.h>
  
  /*
---- lib/softoken/config.mk	Mon May 24 20:13:11 2004
-+++ lib/softoken/config.mk	Fri Jul 22 00:55:20 2005
+--- lib/softoken/legacydb/config.mk	Mon May 24 20:13:11 2004
++++ lib/softoken/legacydb/config.mk	Fri Jul 22 00:55:20 2005
 @@ -47,5 +47,4 @@
  	$(CRYPTOLIB) \
  	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
@@ -177,3 +163,13 @@ and the db-implementation from -lc. Seems to work on FreeBSD.
 +#include <db.h>
  #include "secoidt.h"
  #include "secdert.h"
+--- lib/softoken/legacydb/lginit.c.orig	2007-09-05 06:52:46.000000000 -0400
++++ lib/softoken/legacydb/lginit.c	2007-09-05 06:53:06.000000000 -0400
+@@ -38,6 +38,7 @@
+  * ***** END LICENSE BLOCK ***** */
+ /* $Id: patch-sysdb,v 1.4 2007-09-05 12:40:41 ahze Exp $ */
+ 
++#include <fcntl.h>
+ #include "lowkeyi.h"
+ #include "pcert.h"
+ #include "keydbi.h"
diff --git a/security/nss/pkg-plist b/security/nss/pkg-plist
index cc12145c7..080d0d859 100644
--- a/security/nss/pkg-plist
+++ b/security/nss/pkg-plist
@@ -87,8 +87,25 @@ include/nss/nss/pkcs11u.h
 include/nss/nss/pkcs12.h
 include/nss/nss/pkcs12t.h
 include/nss/nss/pkcs7t.h
+include/nss/nss/pkix.h
+include/nss/nss/pkix_certsel.h
+include/nss/nss/pkix_certselector.h
+include/nss/nss/pkix_certstore.h
+include/nss/nss/pkix_checker.h
+include/nss/nss/pkix_comcertselparams.h
+include/nss/nss/pkix_crlsel.h
+include/nss/nss/pkix_errorstrings.h
+include/nss/nss/pkix_params.h
+include/nss/nss/pkix_pl_pki.h
+include/nss/nss/pkix_pl_system.h
+include/nss/nss/pkix_results.h
+include/nss/nss/pkix_revchecker.h
+include/nss/nss/pkix_sample_modules.h
+include/nss/nss/pkix_util.h
+include/nss/nss/pkixt.h
 include/nss/nss/portreg.h
 include/nss/nss/preenc.h
+include/nss/nss/sdb.h
 include/nss/nss/secasn1.h
 include/nss/nss/secasn1t.h
 include/nss/nss/seccomon.h
@@ -107,6 +124,7 @@ include/nss/nss/secoidt.h
 include/nss/nss/secpkcs5.h
 include/nss/nss/secpkcs7.h
 include/nss/nss/secport.h
+include/nss/nss/sftkdbt.h
 include/nss/nss/shsign.h
 include/nss/nss/smime.h
 include/nss/nss/ssl.h
@@ -121,10 +139,14 @@ lib/nss/libnss3.so
 lib/nss/libnss3.so.1
 lib/nss/libnssckbi.so
 lib/nss/libnssckbi.so.1
+lib/nss/libnssdbm3.so
+lib/nss/libnssdbm3.so.1
 lib/nss/libsmime3.so
 lib/nss/libsmime3.so.1
 lib/nss/libsoftokn3.so
 lib/nss/libsoftokn3.so.1
+lib/nss/libsqlite3.so
+lib/nss/libsqlite3.so.1
 lib/nss/libssl3.so
 lib/nss/libssl3.so.1
 libdata/pkgconfig/nss.pc