[arch-commits] Commit in nss/trunk (3 files)

[Ionut Biru]

    Date: Friday, February 24, 2012 @ 07:58:16
  Author: ibiru
Revision: 150998

update to 3.13.3

Modified:
  nss/trunk/PKGBUILD
  nss/trunk/add_spi+cacert_ca_certs.patch
Deleted:
  nss/trunk/bug702090.patch

-------------------------------+
 PKGBUILD                      |   16 ++++++----------
 add_spi+cacert_ca_certs.patch |    9 +++++----
 bug702090.patch               |   20 --------------------
 3 files changed, 11 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-24 12:58:04 UTC (rev 150997)
+++ PKGBUILD	2012-02-24 12:58:16 UTC (rev 150998)
@@ -2,35 +2,31 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nss
-pkgver=3.13.1
-pkgrel=2
+pkgver=3.13.3
+pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.8.9
+_nsprver=4.9
 depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
 makedepends=('perl')
-replaces=('nss-nspr')
 options=('!strip')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_WITH_CKBI_1_88_RTM/src/${pkgname}-${pkgver}.with.ckbi.1.88.tar.gz
-        bug702090.patch
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}/src/${pkgname}-${pkgver}.tar.gz
         nss-no-rpath.patch
         nss.pc.in
         nss-config.in
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6'
-          '057dd510ba567d344e705062436a786beb5592b6'
+sha1sums=('6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6'
           'c8fcdb153af9d39689243119adb475905a657284'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
-          '11e4980911a1fe7142264e9b783b89abdc750c5d'
+          '3d89f29e321d7df7269b7ae6d219654543feaa6a'
           '8a964a744ba098711b80c0d279a2993524e8eb92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
-  patch -Np2 -i "${srcdir}/bug702090.patch"
   # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
   patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
   # Adds transitional SSL renegotiate support - patch from Debian

Modified: add_spi+cacert_ca_certs.patch
===================================================================
--- add_spi+cacert_ca_certs.patch	2012-02-24 12:58:04 UTC (rev 150997)
+++ add_spi+cacert_ca_certs.patch	2012-02-24 12:58:16 UTC (rev 150998)
@@ -5,12 +5,13 @@
 
 Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
 ===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-11-05 17:03:08.370363036 +0100
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-11-05 17:03:28.082392262 +0100
-@@ -23580,3 +23580,557 @@
+--- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:32:14.000000000 +0100
++++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:35:07.577861466 +0100
+@@ -23475,3 +23475,558 @@
+ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
  CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
  CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
- 
++ 
 +#
 +# Certificate "CAcert.org Class 1 Root CA"
 +#

Deleted: bug702090.patch
===================================================================
--- bug702090.patch	2012-02-24 12:58:04 UTC (rev 150997)
+++ bug702090.patch	2012-02-24 12:58:16 UTC (rev 150998)
@@ -1,20 +0,0 @@
---- ./mozilla/security/nss/lib/util/pkcs11n.h.orig	2011-09-14 10:21:10.000000000 +0900
-+++ ./mozilla/security/nss/lib/util/pkcs11n.h	2011-11-19 00:45:01.131860104 +0900
-@@ -346,7 +346,7 @@
-  * labels have never been accurate to what was really implemented.
-  * The new labels correctly reflect what the values effectively mean.
-  */
--#if __GNUC__ > 3
-+#if defined(__GNUC__) && (__GNUC__ > 3)
- /* make GCC warn when we use these #defines */
- /*
-  *  This is really painful because GCC doesn't allow us to mark random
-@@ -362,7 +362,7 @@
-  *  cast the resulting value to the deprecated type in the #define, thus
-  *  producting the warning when the #define is used.
-  */
--#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
-+#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
- /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
-  * is a gcc version issue rather than mac or ppc specific */
- typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));