From 21396a546544e1e89324faf56cd2cb17ad45346c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 7 Sep 2010 12:34:55 +0000 Subject: main/nss: upgrade to 3.12.7 --- main/nss/APKBUILD | 9 ++-- main/nss/add_spi+cacert_ca_certs.patch | 84 +++++++++++++++++----------------- 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD index c795669ea7..927f4802f6 100644 --- a/main/nss/APKBUILD +++ b/main/nss/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=nss -pkgver=3.12.6 -_ver=3_12_6 +pkgver=3.12.7 +_ver=3_12_7 pkgrel=0 pkgdesc="Mozilla Network Security Services" url="http://www.mozilla.org/projects/security/pki/nss/" @@ -39,6 +39,7 @@ build() { export BUILD_OPT=1 export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + export FREEBL_NO_DEPEND=0 export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` export XCFLAGS="${CFLAGS}" @@ -110,10 +111,10 @@ libnss() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="da42596665f226de5eb3ecfc1ec57cd1 nss-3.12.6.tar.gz +md5sums="6c29faba412d822f41c7b1ea4f27a561 nss-3.12.7.tar.gz 1d8305dc458d28c6f32746d9132b9873 nss-nolocalsql.patch e5c97db0c884d5f4cfda21e562dc9bba nss-no-rpath.patch c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in 46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in -a744b499e7da252acd9ac8ff09af3d48 add_spi+cacert_ca_certs.patch +aff5f4b62bfa0bf4799964cf1fb23a68 add_spi+cacert_ca_certs.patch d83c7b61abb7e9f8f7bcd157183d1ade ssl-renegotiate-transitional.patch" diff --git a/main/nss/add_spi+cacert_ca_certs.patch b/main/nss/add_spi+cacert_ca_certs.patch index a8969ee43f..ac16b47021 100644 --- a/main/nss/add_spi+cacert_ca_certs.patch +++ b/main/nss/add_spi+cacert_ca_certs.patch @@ -4,57 +4,57 @@ ## DP: Adds the SPI Inc. and CAcert.org CA certificates diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.c b/mozilla/security/nss/lib/ckfw/builtins/certdata.c -index 2c6fdab..2fb754c 100644 +index 52b78ad..28fe53c 100644 --- a/mozilla/security/nss/lib/ckfw/builtins/certdata.c +++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.c @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #ifdef DEBUG --static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $"; -+static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $"; +-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64 $ $Date: 2010/04/08 14:28:59 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $"; #endif /* DEBUG */ #ifndef BUILTINS_H -@@ -1020,6 +1020,24 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 [] = { - static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = { +@@ -960,6 +960,24 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_300 [] = { + static const CK_ATTRIBUTE_TYPE nss_builtins_types_301 [] = { 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_302 [] = { + 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_303 [] = { + 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_304 [] = { + 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_305 [] = { + 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_326 [] = { ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_306 [] = { + 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_327 [] = { ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_307 [] = { + 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) }, -@@ -1028,7 +1046,7 @@ static const NSSItem nss_builtins_items_0 [] = { +@@ -968,7 +986,7 @@ static const NSSItem nss_builtins_items_0 [] = { { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)"CVS ID", (PRUint32)7 }, { (void *)"NSS", (PRUint32)4 }, -- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $", (PRUint32)160 } -+ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $", (PRUint32)160 } +- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $", (PRUint32)160 } ++ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64 $ $Date: 2010/04/08 14:28:59 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $", (PRUint32)160 } }; #endif /* DEBUG */ static const NSSItem nss_builtins_items_1 [] = { -@@ -21537,6 +21555,531 @@ static const NSSItem nss_builtins_items_321 [] = { - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +@@ -20303,6 +20321,531 @@ static const NSSItem nss_builtins_items_301 [] = { + { (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_302 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -201,7 +201,7 @@ index 2c6fdab..2fb754c 100644 +"\103" +, (PRUint32)1857 } +}; -+static const NSSItem nss_builtins_items_323 [] = { ++static const NSSItem nss_builtins_items_303 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -228,7 +228,7 @@ index 2c6fdab..2fb754c 100644 + { (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_304 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -353,7 +353,7 @@ index 2c6fdab..2fb754c 100644 +"\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_305 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -380,7 +380,7 @@ index 2c6fdab..2fb754c 100644 + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +}; -+static const NSSItem nss_builtins_items_326 [] = { ++static const NSSItem nss_builtins_items_306 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -548,7 +548,7 @@ index 2c6fdab..2fb754c 100644 +"\243\140" +, (PRUint32)2066 } +}; -+static const NSSItem nss_builtins_items_327 [] = { ++static const NSSItem nss_builtins_items_307 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -582,34 +582,34 @@ index 2c6fdab..2fb754c 100644 builtinsInternalObject nss_builtins_data[] = { -@@ -21863,11 +22406,17 @@ 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} }, -+ { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, -+ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } +@@ -20609,11 +21152,17 @@ nss_builtins_data[] = { + { 11, nss_builtins_types_298, nss_builtins_items_298, {NULL} }, + { 13, nss_builtins_types_299, nss_builtins_items_299, {NULL} }, + { 11, nss_builtins_types_300, nss_builtins_items_300, {NULL} }, +- { 13, nss_builtins_types_301, nss_builtins_items_301, {NULL} } ++ { 13, nss_builtins_types_301, nss_builtins_items_301, {NULL} }, ++ { 11, nss_builtins_types_302, nss_builtins_items_302, {NULL} }, ++ { 13, nss_builtins_types_303, nss_builtins_items_303, {NULL} }, ++ { 11, nss_builtins_types_304, nss_builtins_items_304, {NULL} }, ++ { 13, nss_builtins_types_305, nss_builtins_items_305, {NULL} }, ++ { 11, nss_builtins_types_306, nss_builtins_items_306, {NULL} }, ++ { 13, nss_builtins_types_307, nss_builtins_items_307, {NULL} } }; const PRUint32 #ifdef DEBUG -- nss_builtins_nObjects = 321+1; -+ nss_builtins_nObjects = 327+1; +- nss_builtins_nObjects = 301+1; ++ nss_builtins_nObjects = 307+1; #else -- nss_builtins_nObjects = 321; -+ nss_builtins_nObjects = 327; +- nss_builtins_nObjects = 301; ++ nss_builtins_nObjects = 307; #endif /* DEBUG */ diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -index 22ed023..a8b94dd 100644 +index 93f1854..539f4e1 100644 --- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -@@ -22200,3 +22200,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# -- cgit v1.2.3