Update to 3.11.9

4 files changed, 23 insertions, 43 deletions

diff --git a/security/nss/Makefile b/security/nss/Makefile
index 89b3b9a68cb4..654a7f5f40ab 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/security/nss/Makefile,v 1.6 2006/12/17 21:46:42 marcus Exp $
+#    $MCom ports-experimental/security/nss/Makefile,v 1.4 2008/02/23 15:47:28 ahze Exp $
 
 PORTNAME=	nss
 PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
 
 _MAJOR=	3
 _MINOR=	11
-_PATCH=	7
+_PATCH=	9
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/mozilla/security/nss
 
@@ -29,7 +29,7 @@ USE_PERL5_BUILD=yes
 MAKE_ENV=	BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
 		BUILD_OPT=1
 ALL_TARGET=	nss_build_all
-CFLAGS+=	-I${LOCALBASE}/include/nspr
+CFLAGS+=	-I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib
 
 DIST=		${WRKSRC:H:H}/dist
 
diff --git a/security/nss/distinfo b/security/nss/distinfo
index f4dfc54dff5d..274df27a30ff 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,3 +1,3 @@
-MD5 (nss-3.11.7.tar.gz) = 82594a0773cedd7bb7aa25009a25f5a3
-SHA256 (nss-3.11.7.tar.gz) = e0cb80cbd08d677f9e73d19bbdedfd75fe931777ea732ec352dc1f133f999b98
-SIZE (nss-3.11.7.tar.gz) = 3731160
+MD5 (nss-3.11.9.tar.gz) = 5df54e8522bebf0f8c8c22e8f0df18fa
+SHA256 (nss-3.11.9.tar.gz) = fa55182f675d5c180eb928a17a9eec94cd317172ba4b070b628c52230b9a5028
+SIZE (nss-3.11.9.tar.gz) = 3760535
diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk
index 1c308ac6c8ca..062bad1423e6 100644
--- a/security/nss/files/patch-..::coreconf::FreeBSD.mk
+++ b/security/nss/files/patch-..::coreconf::FreeBSD.mk
@@ -1,5 +1,5 @@
---- ../coreconf/FreeBSD.mk.orig	2007-10-31 14:02:28.000000000 -0500
-+++ ../coreconf/FreeBSD.mk	2007-10-31 14:05:56.000000000 -0500
+--- ../coreconf/FreeBSD.mk.orig	Sat Jan 21 03:36:11 2006
++++ ../coreconf/FreeBSD.mk	Tue Jan 30 21:13:41 2007
 @@ -37,9 +37,9 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -13,22 +13,7 @@
  RANLIB			= ranlib
  
  ifeq ($(OS_TEST),alpha)
-@@ -49,8 +49,14 @@
- endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+OS_LIBS			= $(BSD_LDOPTS)
-+OPTIMIZER		=
- 
-+ifeq ($(OS_TEST),sparc64)
- DSO_CFLAGS		= -fPIC
-+else
-+DSO_CFLAGS		= -fpic
-+endif
- DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
- 
- #
-@@ -60,20 +66,19 @@
+@@ -60,20 +66,18 @@
  USE_PTHREADS		= 1
  DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
  OS_LIBS			+= -pthread
@@ -49,15 +34,14 @@
 -DLL_SUFFIX		= so.1.0
 +MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
  endif
- 
+-
 -MKSHLIB			= $(CC) $(DSO_LDOPTS)
  ifdef MAPFILE
  	MKSHLIB += -Wl,--version-script,$(MAPFILE)
  endif
-@@ -82,4 +87,5 @@
- 
+@@ -83,3 +87,5 @@
  G++INCLUDES		= -I/usr/include/g++
  
--INCLUDES		+= -I/usr/X11R6/include
+ INCLUDES		+= -I/usr/X11R6/include
 +USE_SYSTEM_ZLIB		= 1
 +ZLIB_LIBS		= -lz
diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb
index f8101b93d445..7cb3cbf1ffa9 100644
--- a/security/nss/files/patch-sysdb
+++ b/security/nss/files/patch-sysdb
@@ -1,8 +1,3 @@
-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
 @@ -43,6 +43,6 @@
@@ -13,16 +8,7 @@ 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	Tue Mar 29 13:21:18 2005
 +++ lib/softoken/dbmshim.c	Fri Jul 22 00:35:33 2005
 @@ -40,5 +40,6 @@
   * $Id: dbmshim.c,v 1.11 2005/03/29 18:21:18 nelsonb%netscape.com Exp $
@@ -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/dbinit.c.orig	2008-03-12 08:43:36.000000000 -0400
++++ lib/softoken/dbinit.c	2008-03-12 08:44:10.000000000 -0400
+@@ -39,6 +39,7 @@
+ /* $Id: dbinit.c,v 1.28.2.1 2006/09/22 00:21:03 julien.pierre.bugs%sun.com Exp $ */
+ 
+ #include <ctype.h>
++#include <fcntl.h>
+ #include "seccomon.h"
+ #include "prinit.h"
+ #include "prprf.h"