Update to nss 3.12.8, required by upcoming moz* updates. Bump major and
switch to newer lib_depends while here.
This commit is contained in:
landry
parent
3c6ab0d536
commit
54921dc6b1
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.18 2010/06/07 17:40:28 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.19 2010/10/22 19:14:56 landry Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= libraries to support development of security-enabled apps
|
||||
|
||||
VERSION= 3.12.6
|
||||
VERSION= 3.12.8
|
||||
DISTNAME= nss-${VERSION}
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
SO_VERSION= 25.0
|
||||
SO_VERSION= 26.0
|
||||
.for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3
|
||||
SHARED_LIBS+= ${_lib} ${SO_VERSION}
|
||||
.endfor
|
||||
@ -22,13 +21,13 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB += c pthread z
|
||||
WANTLIB += c pthread z nspr4 plc4 plds4 sqlite3
|
||||
|
||||
MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION:S/./_/g}_RTM/src/ \
|
||||
http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION:S/./_/g}_RTM/src/
|
||||
|
||||
LIB_DEPENDS= nspr4.>=20.1,plc4.>=20.1,plds4.>=20.1:nspr->=4.8:devel/nspr \
|
||||
sqlite3.>=13.3:sqlite3->=3.6.13:databases/sqlite3
|
||||
LIB_DEPENDS= :nspr->=4.8:devel/nspr \
|
||||
:sqlite3->=3.6.13:databases/sqlite3
|
||||
|
||||
MAKE_ENV= BUILD_OPT=1 \
|
||||
LOCALBASE="${LOCALBASE}" \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (nss-3.12.6.tar.gz) = 2kJZZmXyJt5es+z8HsV80Q==
|
||||
RMD160 (nss-3.12.6.tar.gz) = yxHhVHMKEscvaExgNvpvJ9ENK2A=
|
||||
SHA1 (nss-3.12.6.tar.gz) = Rh6Brb3vbD+Ej8/uDcWtjC2+vUY=
|
||||
SHA256 (nss-3.12.6.tar.gz) = j5dZvhzpKOgoMJI/3mKmbicMRkXxCkwXas/MtgIal5U=
|
||||
SIZE (nss-3.12.6.tar.gz) = 5947630
|
||||
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
|
||||
|
||||
@ -1,30 +1,30 @@
|
||||
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.3 2010/06/07 17:40:28 landry Exp $
|
||||
--- mozilla/security/nss/lib/ckfw/builtins/certdata.c.orig Tue Feb 16 23:14:34 2010
|
||||
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.c Tue Mar 30 23:38:42 2010
|
||||
@@ -1020,6 +1020,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320
|
||||
static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
|
||||
$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
|
||||
@@ -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
|
||||
};
|
||||
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_322 [] = {
|
||||
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_312 [] = {
|
||||
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
|
||||
+};
|
||||
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_323 [] = {
|
||||
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_313 [] = {
|
||||
+ 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
|
||||
+};
|
||||
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_324 [] = {
|
||||
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_314 [] = {
|
||||
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
|
||||
+};
|
||||
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_325 [] = {
|
||||
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_315 [] = {
|
||||
+ 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
|
||||
+};
|
||||
#ifdef DEBUG
|
||||
static const NSSItem nss_builtins_items_0 [] = {
|
||||
{ (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||
@@ -21537,6 +21549,332 @@ static const NSSItem nss_builtins_items_321 [] = {
|
||||
{ (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
|
||||
@@ -20864,6 +20876,332 @@ static const NSSItem nss_builtins_items_311 [] = {
|
||||
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
|
||||
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
|
||||
};
|
||||
+static const NSSItem nss_builtins_items_322 [] = {
|
||||
+static const NSSItem nss_builtins_items_312 [] = {
|
||||
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
|
||||
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||
@ -171,7 +171,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.3 2010/06/
|
||||
+"\103"
|
||||
+, (PRUint32)1857 }
|
||||
+};
|
||||
+static const NSSItem nss_builtins_items_323 [] = {
|
||||
+static const NSSItem nss_builtins_items_313 [] = {
|
||||
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
|
||||
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||
@ -198,7 +198,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.3 2010/06/
|
||||
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
|
||||
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
|
||||
+};
|
||||
+static const NSSItem nss_builtins_items_324 [] = {
|
||||
+static const NSSItem nss_builtins_items_314 [] = {
|
||||
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
|
||||
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||
@ -323,7 +323,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.3 2010/06/
|
||||
+"\322\156\245\033\231\047\200\347\013\251\250\000"
|
||||
+, (PRUint32)1548 }
|
||||
+};
|
||||
+static const NSSItem nss_builtins_items_325 [] = {
|
||||
+static const NSSItem nss_builtins_items_315 [] = {
|
||||
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
|
||||
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||
@ -353,22 +353,22 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.3 2010/06/
|
||||
|
||||
builtinsInternalObject
|
||||
nss_builtins_data[] = {
|
||||
@@ -21863,11 +22201,15 @@ nss_builtins_data[] = {
|
||||
{ 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
|
||||
{ 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
|
||||
{ 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
|
||||
- { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
|
||||
+ { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} },
|
||||
+ { 11, nss_builtins_types_322, nss_builtins_items_322, {NULL} },
|
||||
+ { 13, nss_builtins_types_323, nss_builtins_items_323, {NULL} },
|
||||
+ { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
|
||||
+ { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }
|
||||
@@ -21180,11 +21518,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} },
|
||||
- { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} }
|
||||
+ { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} },
|
||||
+ { 11, nss_builtins_types_312, nss_builtins_items_312, {NULL} },
|
||||
+ { 13, nss_builtins_types_313, nss_builtins_items_313, {NULL} },
|
||||
+ { 11, nss_builtins_types_314, nss_builtins_items_314, {NULL} },
|
||||
+ { 13, nss_builtins_types_315, nss_builtins_items_315, {NULL} }
|
||||
};
|
||||
const PRUint32
|
||||
#ifdef DEBUG
|
||||
- nss_builtins_nObjects = 321+1;
|
||||
+ nss_builtins_nObjects = 325+1;
|
||||
- nss_builtins_nObjects = 311+1;
|
||||
+ nss_builtins_nObjects = 315+1;
|
||||
#else
|
||||
- nss_builtins_nObjects = 321;
|
||||
+ nss_builtins_nObjects = 325;
|
||||
- nss_builtins_nObjects = 311;
|
||||
+ nss_builtins_nObjects = 315;
|
||||
#endif /* DEBUG */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt,v 1.2 2010/04/03 09:21:00 landry Exp $
|
||||
--- mozilla/security/nss/lib/ckfw/builtins/certdata.txt.orig Tue Feb 16 23:14:35 2010
|
||||
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt Tue Mar 30 23:35:30 2010
|
||||
@@ -19538,6 +19538,352 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNK
|
||||
$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
|
||||
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
|
||||
|
||||
#
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.7 2010/04/03 09:21:00 landry Exp $
|
||||
--- mozilla/security/nss/lib/freebl/unix_rand.c.orig Wed Jun 10 02:42:17 2009
|
||||
+++ mozilla/security/nss/lib/freebl/unix_rand.c Tue Mar 30 23:35:30 2010
|
||||
$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.8 2010/10/22 19:14:56 landry Exp $
|
||||
--- mozilla/security/nss/lib/freebl/unix_rand.c.orig Fri Apr 30 02:20:02 2010
|
||||
+++ mozilla/security/nss/lib/freebl/unix_rand.c Wed Oct 20 13:07:03 2010
|
||||
@@ -849,7 +849,6 @@ safe_pclose(FILE *fp)
|
||||
/* Fork netstat to collect its output by default. Do not unset this unless
|
||||
* another source of entropy is available
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.7 2010/04/03 09:
|
||||
|
||||
/* If the user points us to a random file, pass it through the rng */
|
||||
randfile = getenv("NSRANDFILE");
|
||||
@@ -1159,7 +1158,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
|
||||
@@ -1161,7 +1160,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
|
||||
size_t fileBytes = 0;
|
||||
unsigned char *buffer = dest;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user