From ea1f4bece8870857691a7123bdc899562760b3fe Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 20 Dec 2011 23:14:59 +0000
Subject: Tue Dec 20 23:14:59 UTC 2011

---
 extra/nss/PKGBUILD | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'extra/nss/PKGBUILD')

diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index e02510821..77d538605 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138102 2011-09-16 12:01:21Z ibiru $
+# $Id: PKGBUILD 145236 2011-12-19 19:17:54Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.12.11
-pkgrel=3
+pkgver=3.13.1
+pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -13,26 +13,22 @@ depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
 makedepends=('perl')
 replaces=('nss-nspr')
 options=('!strip')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
+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
         nss-no-rpath.patch
         nss.pc.in
         nss-config.in
-        distrust-diginotar.patch
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-md5sums=('ca0ca058380be200cf247ea2496b5352'
-         'e5c97db0c884d5f4cfda21e562dc9bba'
-         'c547b030c57fe1ed8b77c73bf52b3ded'
-         '46bee81908f1e5b26d6a7a2e14c64d9f'
-         'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf'
-         'ba2357c5b9881bfd7d54b037954ba0ff'
-         'd83c7b61abb7e9f8f7bcd157183d1ade')
+sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6'
+          'c8fcdb153af9d39689243119adb475905a657284'
+          'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
+          'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
+          '11e4980911a1fe7142264e9b783b89abdc750c5d'
+          '8a964a744ba098711b80c0d279a2993524e8eb92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
-  # Distrust DigiNotar root CA - backported from CVS (https://bugzilla.mozilla.org/show_bug.cgi?id=682927)
-  patch -Np0 -i "${srcdir}/distrust-diginotar.patch"
-  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
+  # 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
   patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
@@ -43,6 +39,10 @@ build() {
   sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
       -i security/coreconf/rules.mk
 
+  # Generate certdata.c from certdata.txt
+  cd security/nss/lib/ckfw/builtins
+  make generate
+
   cd "${srcdir}/${pkgname}-${pkgver}"
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-- 
cgit v1.2.3-54-g00ecf