summaryrefslogtreecommitdiff
path: root/devel/nss
diff options
context:
space:
mode:
Diffstat (limited to 'devel/nss')
-rw-r--r--devel/nss/Makefile18
-rw-r--r--devel/nss/PLIST12
-rw-r--r--devel/nss/distinfo21
-rw-r--r--devel/nss/patches/patch-ab12
-rw-r--r--devel/nss/patches/patch-ac15
-rw-r--r--devel/nss/patches/patch-ad15
-rw-r--r--devel/nss/patches/patch-ae12
-rw-r--r--devel/nss/patches/patch-af14
-rw-r--r--devel/nss/patches/patch-ag16
-rw-r--r--devel/nss/patches/patch-aj13
-rw-r--r--devel/nss/patches/patch-am24
-rw-r--r--devel/nss/patches/patch-an32
12 files changed, 103 insertions, 101 deletions
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 4e5ef133966..365dc660478 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/07/12 15:39:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/07/12 16:30:03 rillig Exp $
-DISTNAME= nss-3.9.2
-PKGREVISION= 4
+DISTNAME= nss-3.11
CATEGORIES= security
-MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/
+MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_RTM/src/
MAINTAINER= mjl@luckie.org.nz
HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/
@@ -11,14 +10,6 @@ COMMENT= Libraries to support development of security-enabled applications
BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
-# NSS will build and run on other platforms when MAINTAINER knows what
-# magic Makefile glue is required
-ONLY_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* Linux-*-* DragonFly-*-*
-# Solaris has missing symbols when linking. It looks like some of those problem
-# have been addressed in the nss source tree so this should be enabled after
-# the next update.
-#SunOS-*-*
-
BUILD_DIRS= mozilla/security/nss
USE_TOOLS+= gmake perl
@@ -78,6 +69,9 @@ do-install:
"-lnss3 -lsmime3 -lssl3 -lsoftokn3 "${BUILDLINK_LIBS.pthread:Q}; \
} >${PREFIX}/lib/pkgconfig/nss.pc
+post-install:
+ cd ${PREFIX}/include/nss && ${CHMOD} ${SHAREMODE} nss/*.h dbm/*.h nss/*.api
+
BUILDLINK_API_DEPENDS.nspr+= nspr>=4.4.1nb2
.include "../../devel/nspr/buildlink3.mk"
diff --git a/devel/nss/PLIST b/devel/nss/PLIST
index 32bbcf114f5..8168a77f453 100644
--- a/devel/nss/PLIST
+++ b/devel/nss/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/16 11:15:10 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/07/12 16:30:03 rillig Exp $
include/nss/dbm/cdefs.h
include/nss/dbm/mcom_db.h
include/nss/dbm/ncompat.h
@@ -55,6 +55,8 @@ include/nss/nss/p12plcy.h
include/nss/nss/p12t.h
include/nss/nss/pk11func.h
include/nss/nss/pk11pqg.h
+include/nss/nss/pk11priv.h
+include/nss/nss/pk11pub.h
include/nss/nss/pk11sdr.h
include/nss/nss/pkcs11.h
include/nss/nss/pkcs11f.h
@@ -91,19 +93,13 @@ include/nss/nss/ssl.h
include/nss/nss/sslerr.h
include/nss/nss/sslproto.h
include/nss/nss/sslt.h
-include/nss/nss/swfort.h
-include/nss/nss/swfortt.h
include/nss/nss/watcomfx.h
-include/nss/seccmd/secutil.h
-include/nss/seccmd/zconf.h
-include/nss/seccmd/zlib.h
-lib/nss/libfort.${SO_SUFFIX}
+lib/nss/libfreebl3.${SO_SUFFIX}
lib/nss/libnss3.${SO_SUFFIX}
lib/nss/libnssckbi.${SO_SUFFIX}
lib/nss/libsmime3.${SO_SUFFIX}
lib/nss/libsoftokn3.${SO_SUFFIX}
lib/nss/libssl3.${SO_SUFFIX}
-lib/nss/libswft.${SO_SUFFIX}
lib/pkgconfig/nss.pc
@dirrm include/nss/seccmd
@dirrm include/nss/nss
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index bc59c7c8cad..29c5a2f05bf 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.12 2006/07/12 15:38:28 rillig Exp $
+$NetBSD: distinfo,v 1.13 2006/07/12 16:30:03 rillig Exp $
-SHA1 (nss-3.9.2.tar.gz) = 017b748d92c5f7376bda78915d1b78b260b44133
-RMD160 (nss-3.9.2.tar.gz) = c9e41ac596af2e717da76546c3a5dfd37272c195
-Size (nss-3.9.2.tar.gz) = 4734817 bytes
+SHA1 (nss-3.11.tar.gz) = 0abccde9a351fb9fa662c75754eb980e04fad482
+RMD160 (nss-3.11.tar.gz) = 90be4b42e490084c23451ce8abcf089150357d1e
+Size (nss-3.11.tar.gz) = 5002908 bytes
SHA1 (patch-aa) = d2b5f4213c35e667866279f398fe9297232d27d1
-SHA1 (patch-ab) = 2bdf81b0b4b5961daaebd870463f2bb7c6170969
-SHA1 (patch-ac) = 52fb18a906ae1c019d2cc36521cdcaef1ff978f0
-SHA1 (patch-ad) = 9fdf832d0534440930fac74835360070f135f159
-SHA1 (patch-ae) = 90dd78206ac63bb1be4e6dc92f31dd94016f137b
-SHA1 (patch-af) = c135aec94829fdf45214d69f75e1f76727ce6a35
-SHA1 (patch-ag) = 80baad088424bc06e3978e7bc960175281036aac
+SHA1 (patch-ab) = 371e04afd51d4182a1324cbd04c1d93bdbb8949a
+SHA1 (patch-ae) = 1f4982d77ddf7dbf708ebc5a1737345010dddbf9
+SHA1 (patch-af) = c0e5a68911eb6503224c569552a5e94cfa036364
+SHA1 (patch-ag) = a25943a7df9093a8eb67515b0bb0eb73955ece45
SHA1 (patch-ah) = 01e8644a0a1dfc70985aed213fc753f376560865
SHA1 (patch-ai) = 995add5e536bb0fba425295cc7972b8725f4e10d
-SHA1 (patch-aj) = fb677fe29a99b6706684f8b67ce6cfeb4e9cd9c5
SHA1 (patch-ak) = 4816bf73acfa3edcd0a74d0e235eee7974b42dd6
SHA1 (patch-al) = 711ae5b0ed4a5b8dd8e3735b25fcc5419c27e63e
+SHA1 (patch-am) = c1495a4262a82b4795f667b1f89009658de1f236
+SHA1 (patch-an) = eccddecb756410c61fad1e745564eccebf740740
diff --git a/devel/nss/patches/patch-ab b/devel/nss/patches/patch-ab
index d2a64e5ad9b..a8af03230c9 100644
--- a/devel/nss/patches/patch-ab
+++ b/devel/nss/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2006/07/12 15:38:29 rillig Exp $
+$NetBSD: patch-ab,v 1.3 2006/07/12 16:30:03 rillig Exp $
---- mozilla/security/coreconf/command.mk 2002/08/08 17:20:41 1.1
-+++ mozilla/security/coreconf/command.mk 2002/08/08 17:20:54
-@@ -42,7 +42,7 @@
+--- mozilla/security/coreconf/command.mk.orig 2005-10-11 01:46:12.000000000 +0200
++++ mozilla/security/coreconf/command.mk 2006-07-12 17:44:52.000000000 +0200
+@@ -45,7 +45,7 @@ ASFLAGS += $(CFLAGS)
+ CCF = $(CC) $(CFLAGS)
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
- NFSPWD = $(NSINSTALL_DIR)/nfspwd
-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
++CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
$(XCFLAGS)
RANLIB = echo
TAR = /bin/tar
diff --git a/devel/nss/patches/patch-ac b/devel/nss/patches/patch-ac
deleted file mode 100644
index cc7ed3b5067..00000000000
--- a/devel/nss/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/07/12 15:38:29 rillig Exp $
-
---- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.orig 2004-03-23 02:02:04.000000000 +0000
-+++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
-@@ -94,8 +94,8 @@ EXTRA_LIBS += \
- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
- $(CRYPTO_LIB) \
- $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+ -lplc4 \
-+ -lplds4 \
- $(NULL)
-
- endif
diff --git a/devel/nss/patches/patch-ad b/devel/nss/patches/patch-ad
deleted file mode 100644
index 9682b897193..00000000000
--- a/devel/nss/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/07/12 15:38:29 rillig Exp $
-
---- mozilla/security/nss/lib/ckfw/builtins/Makefile.orig 2003-04-20 04:23:24.000000000 +0000
-+++ mozilla/security/nss/lib/ckfw/builtins/Makefile
-@@ -64,8 +64,8 @@ endif
- else
-
- EXTRA_LIBS += \
-- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+ -lplc4 \
-+ -lplds4 \
- $(NULL)
-
- endif
diff --git a/devel/nss/patches/patch-ae b/devel/nss/patches/patch-ae
index f0d2cf10e42..4722db8aa07 100644
--- a/devel/nss/patches/patch-ae
+++ b/devel/nss/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2006/07/12 15:38:29 rillig Exp $
+$NetBSD: patch-ae,v 1.4 2006/07/12 16:30:04 rillig Exp $
---- mozilla/security/nss/cmd/platlibs.mk.orig 2004-06-18 23:13:45.000000000 -0700
-+++ mozilla/security/nss/cmd/platlibs.mk 2005-08-12 12:21:35.000000000 -0700
-@@ -182,7 +182,7 @@
+--- mozilla/security/nss/cmd/platlibs.mk.orig 2005-11-15 19:19:18.000000000 +0100
++++ mozilla/security/nss/cmd/platlibs.mk 2006-07-12 17:53:02.000000000 +0200
+@@ -172,7 +172,7 @@ endif
# If GNU ld is used, we must use the -rpath-link option to tell
# the linker where to find libsoftokn3.so, an implicit dependency
# of libnss3.so.
@@ -11,11 +11,11 @@ $NetBSD: patch-ae,v 1.3 2006/07/12 15:38:29 rillig Exp $
EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
endif
-@@ -216,6 +216,7 @@
+@@ -213,6 +213,7 @@ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-lssl3 \
-lsmime3 \
+ -lsoftokn3 \
-lnss3 \
+ -L$(NSPR_LIB_DIR) \
-lplc4 \
- -lplds4 \
diff --git a/devel/nss/patches/patch-af b/devel/nss/patches/patch-af
index 87904ee66b4..761b084e66c 100644
--- a/devel/nss/patches/patch-af
+++ b/devel/nss/patches/patch-af
@@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.5 2006/07/12 15:38:29 rillig Exp $
+$NetBSD: patch-af,v 1.6 2006/07/12 16:30:04 rillig Exp $
Fix gcc4 error:
error: array type has incomplete element type
---- mozilla/security/nss/lib/pki1/oiddata.h.orig 2002-01-04 05:22:07.000000000 +0000
-+++ mozilla/security/nss/lib/pki1/oiddata.h
-@@ -43,6 +43,8 @@ static const char OIDDATA_CVS_ID[] = "@(
+--- mozilla/security/nss/lib/pki1/oiddata.h.orig 2005-03-14 19:02:00.000000000 +0100
++++ mozilla/security/nss/lib/pki1/oiddata.h 2006-07-12 17:49:52.000000000 +0200
+@@ -46,6 +46,8 @@ static const char OIDDATA_CVS_ID[] = "@(
#include "nsspki1t.h"
#endif /* NSSPKI1T_H */
+#include "pki1t.h"
+
- extern const NSSOID nss_builtin_oids[];
- extern const PRUint32 nss_builtin_oid_count;
-
+ extern const NSSOID *NSS_OID_RFC1274_UID;
+ extern const NSSOID *NSS_OID_RFC1274_EMAIL;
+ extern const NSSOID *NSS_OID_RFC2247_DC;
diff --git a/devel/nss/patches/patch-ag b/devel/nss/patches/patch-ag
index 2cf4ac44eea..311f6297c92 100644
--- a/devel/nss/patches/patch-ag
+++ b/devel/nss/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2006/07/12 15:38:29 rillig Exp $
+$NetBSD: patch-ag,v 1.3 2006/07/12 16:30:04 rillig Exp $
---- mozilla/security/nss/cmd/shlibsign/sign.sh.orig Sun Feb 6 17:41:50 2005
-+++ mozilla/security/nss/cmd/shlibsign/sign.sh Sun Feb 6 17:42:29 2005
-@@ -39,7 +39,7 @@
+--- mozilla/security/nss/cmd/shlibsign/sign.sh.orig 2005-11-16 03:17:36.000000000 +0100
++++ mozilla/security/nss/cmd/shlibsign/sign.sh 2006-07-12 17:51:33.000000000 +0200
+@@ -44,7 +44,7 @@ OpenVMS)
export LIBPATH
- SHLIB_PATH=${1}/lib:$SHLIB_PATH
+ SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
export SHLIB_PATH
-- LD_LIBRARY_PATH=${1}/lib:$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH=${1}/lib:$PREFIX/lib
+- LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
++ LD_LIBRARY_PATH=${1}/lib:${4}:$PREFIX/lib
export LD_LIBRARY_PATH
- DYLD_LIBRARY_PATH=${1}/lib:$DYLD_LIBRARY_PATH
+ DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
diff --git a/devel/nss/patches/patch-aj b/devel/nss/patches/patch-aj
deleted file mode 100644
index b07e16ee007..00000000000
--- a/devel/nss/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2006/07/12 15:38:29 rillig Exp $
-
---- mozilla/nsprpub/config/arch.mk.orig 2006-01-15 15:10:27.000000000 +0000
-+++ mozilla/nsprpub/config/arch.mk
-@@ -121,7 +121,7 @@ endif
- # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3
- #
-
--ifeq (,$(filter-out Linux FreeBSD,$(OS_ARCH)))
-+ifeq (,$(filter-out Linux FreeBSD DragonFly,$(OS_ARCH)))
- OS_RELEASE := $(shell echo "$(OS_RELEASE)" | sed 's/-.*//')
- endif
-
diff --git a/devel/nss/patches/patch-am b/devel/nss/patches/patch-am
new file mode 100644
index 00000000000..cb63e46b55e
--- /dev/null
+++ b/devel/nss/patches/patch-am
@@ -0,0 +1,24 @@
+$NetBSD: patch-am,v 1.1 2006/07/12 16:30:04 rillig Exp $
+
+Prevent an endless recursion, resulting in a segmentation fault.
+
+--- mozilla/security/nss/lib/freebl/loader.c.orig 2006-07-12 18:03:20.000000000 +0200
++++ mozilla/security/nss/lib/freebl/loader.c 2006-07-12 18:02:55.000000000 +0200
+@@ -39,6 +39,9 @@
+ * ***** END LICENSE BLOCK ***** */
+ /* $Id: patch-am,v 1.1 2006/07/12 16:30:04 rillig Exp $ */
+
++#undef NDEBUG
++#include <assert.h>
++
+ #include "loader.h"
+ #include "prmem.h"
+ #include "prerror.h"
+@@ -926,6 +928,7 @@ RNG_RNGInit(void)
+ {
+ if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
+ return SECFailure;
++ assert(vector->p_RNG_RNGInit != RNG_RNGInit);
+ return (vector->p_RNG_RNGInit)();
+ }
+
diff --git a/devel/nss/patches/patch-an b/devel/nss/patches/patch-an
new file mode 100644
index 00000000000..9d89862b603
--- /dev/null
+++ b/devel/nss/patches/patch-an
@@ -0,0 +1,32 @@
+$NetBSD: patch-an,v 1.1 2006/07/12 16:30:04 rillig Exp $
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=323977
+https://bugzilla.mozilla.org/attachment.cgi?id=209007&action=view
+
+Added DragonFly.
+
+Index: mozilla/security/nss/lib/freebl/Makefile
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/freebl/Makefile,v
+retrieving revision 1.70
+diff -u -r1.70 Makefile
+--- mozilla/security/nss/lib/freebl/Makefile 22 Nov 2005 07:13:32 -0000 1.70
++++ mozilla/security/nss/lib/freebl/Makefile 19 Jan 2006 21:47:47 -0000
+@@ -188,6 +188,17 @@
+ endif
+ endif
+
++# The blapi functions are defined not only in the freebl shared
++# libraries but also in the shared libraries linked with loader.c
++# (libsoftokn3.so and libssl3.so). We need to use GNU ld's
++# -Bsymbolic option or the equivalent option for other linkers
++# to bind the blapi function references in FREEBLVector vector
++# (ldvector.c) to the blapi functions defined in the freebl
++# shared libraries.
++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_TARGET)))
++ MKSHLIB += -Wl,-Bsymbolic
++endif
++
+ ifeq ($(OS_TARGET),SunOS)
+
+ # The -R '$ORIGIN' linker option instructs this library to search for its
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 06:19:24 +0000