cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to nss 3.12.9, required by ffx4.0b8 and later,and

Browse Source 
soon-to-be-required by stable releases in other mozilla branches.
ok sthen@ martynas@
This commit is contained in:
landry 2011-01-15 16:59:37 +00:00
parent 32a276b54e
commit 20218047ab
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/nss/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.20 2010/11/20 17:22:44 espie Exp $
# $OpenBSD: Makefile,v 1.21 2011/01/15 16:59:37 landry Exp $
SHARED_ONLY= Yes
COMMENT= libraries to support development of security-enabled apps
VERSION= 3.12.8
VERSION= 3.12.9
DISTNAME= nss-${VERSION}
SO_VERSION= 26.0
SO_VERSION= 27.0
.for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor

10
security/nss/distinfo
View File

@ -1,5 +1,5 @@
MD5 (nss-3.12.8.tar.gz) = QL8bsMdWeCfTdo0fxggRAA==
RMD160 (nss-3.12.8.tar.gz) = CPgRjhlPz9UiXE3GSHPwiDuCeLY=
SHA1 (nss-3.12.8.tar.gz) = RGnnmoBklMEqKXITOSaZykHCyJk=
SHA256 (nss-3.12.8.tar.gz) = kXjOKXSejQnLk85ww48cLBBjCSayu3JZx9//QssJDBQ=
SIZE (nss-3.12.8.tar.gz) = 5951955
MD5 (nss-3.12.9.tar.gz) = vTLxg8ooRAwXRGUL4xqczA==
RMD160 (nss-3.12.9.tar.gz) = 1NoI+y82PqXqkFmb2Q5Uqq0KPlY=
SHA1 (nss-3.12.9.tar.gz) = W0naXm9hYQpxj80IONrDZaXhfeI=
SHA256 (nss-3.12.9.tar.gz) = Dcd3GAFmVLv2/92gnpaOKyh1wF2s7JZ6v1cltdquWXg=
SIZE (nss-3.12.9.tar.gz) = 5984608

10
security/nss/patches/patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.4 2010/10/22 19:14:56 landry Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.c.orig Fri Aug 27 17:46:44 2010
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.c Wed Oct 20 13:12:09 2010
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.5 2011/01/15 16:59:37 landry Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.c.orig Fri Dec 3 00:26:35 2010
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.c Thu Jan 13 14:02:49 2011
@@ -990,6 +990,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_310
static const CK_ATTRIBUTE_TYPE nss_builtins_types_311 [] = {
CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
@ -20,7 +20,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.4 2010/10/
#ifdef DEBUG
static const NSSItem nss_builtins_items_0 [] = {
{ (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
@@ -20864,6 +20876,332 @@ static const NSSItem nss_builtins_items_311 [] = {
@@ -20992,6 +21004,332 @@ static const NSSItem nss_builtins_items_311 [] = {
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
};
@ -353,7 +353,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.4 2010/10/
builtinsInternalObject
nss_builtins_data[] = {
@@ -21180,11 +21518,15 @@ nss_builtins_data[] = {
@@ -21308,11 +21646,15 @@ nss_builtins_data[] = {
{ 11, nss_builtins_types_308, nss_builtins_items_308, {NULL} },
{ 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} },
{ 11, nss_builtins_types_310, nss_builtins_items_310, {NULL} },

8
security/nss/patches/patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt,v 1.3 2010/10/22 19:14:56 landry Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.txt.orig Fri Aug 27 17:46:44 2010
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt Wed Oct 20 13:07:03 2010
@@ -18114,6 +18114,352 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNK
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt,v 1.4 2011/01/15 16:59:37 landry Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.txt.orig Fri Dec 3 00:26:35 2010
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt Thu Jan 13 14:02:49 2011
@@ -17410,6 +17410,352 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNK
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#

8
security/nss/patches/patch-mozilla_security_nss_lib_freebl_blapi_h
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-mozilla_security_nss_lib_freebl_blapi_h,v 1.1 2009/11/14 16:31:06 ajacoutot Exp $
$OpenBSD: patch-mozilla_security_nss_lib_freebl_blapi_h,v 1.2 2011/01/15 16:59:37 landry Exp $
From firefox in pkgsrc:
SHA1_Update conflicts with openssl which may be dynamically loaded
at runtime via libcups or libgssapi so causing a crash due to using
the wrong binding. So rename here to avoid conflict.
--- mozilla/security/nss/lib/freebl/blapi.h.orig Wed Nov 11 14:08:21 2009
+++ mozilla/security/nss/lib/freebl/blapi.h Wed Nov 11 14:08:42 2009
@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
--- mozilla/security/nss/lib/freebl/blapi.h.orig Sat Dec 4 19:59:01 2010
+++ mozilla/security/nss/lib/freebl/blapi.h Thu Jan 13 14:02:49 2011
@@ -1038,6 +1038,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
*/
extern void SHA1_Begin(SHA1Context *cx);