[arch-commits] Commit in nss/trunk (PKGBUILD add_spi+cacert_ca_certs.patch)

Jan de Groot jgc at archlinux.org
Wed Aug 18 04:16:00 EDT 2010


    Date: Wednesday, August 18, 2010 @ 04:15:59
  Author: jgc
Revision: 87754

upgpkg: nss 3.12.7-1
Update to 3.12.7, renew patches

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

-------------------------------+
 PKGBUILD                      |   44 ++++++++++----------
 add_spi+cacert_ca_certs.patch |   84 ++++++++++++++++++++--------------------
 2 files changed, 64 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-18 07:22:34 UTC (rev 87753)
+++ PKGBUILD	2010-08-18 08:15:59 UTC (rev 87754)
@@ -1,13 +1,13 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=nss
-pkgver=3.12.6
-pkgrel=3
+pkgver=3.12.7
+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.4
+_nsprver=4.8.6
 depends=("nspr>=${_nsprver}" 'sqlite3>=3.6.17' 'zlib')
 replaces=('nss-nspr')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
@@ -18,24 +18,24 @@
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
 options=('!strip')
-md5sums=('da42596665f226de5eb3ecfc1ec57cd1'
+md5sums=('6c29faba412d822f41c7b1ea4f27a561'
          '1d8305dc458d28c6f32746d9132b9873'
          'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '46bee81908f1e5b26d6a7a2e14c64d9f'
-         'a744b499e7da252acd9ac8ff09af3d48'
+         'aff5f4b62bfa0bf4799964cf1fb23a68'
          'd83c7b61abb7e9f8f7bcd157183d1ade')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
-  patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch" || return 1
+  patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
   # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch" || return 1
+  patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch"
   # Builds against system sqlite - patch from Fedora
-  patch -Np0 -i "${srcdir}/nss-nolocalsql.patch" || return 1
+  patch -Np0 -i "${srcdir}/nss-nolocalsql.patch"
   # Removes rpath
-  patch -Np0 -i "${srcdir}/nss-no-rpath.patch" || return 1
+  patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
 
   unset CFLAGS
   unset CXXFLAGS
@@ -47,9 +47,9 @@
 
   [ "$CARCH" = "x86_64" ] && export USE_64=1
 
-  make -j 1 -C mozilla/security/coreconf || return 1
-  make -j 1 -C mozilla/security/dbm || return 1
-  make -j 1 -C mozilla/security/nss || return 1
+  make -j 1 -C mozilla/security/coreconf
+  make -j 1 -C mozilla/security/dbm
+  make -j 1 -C mozilla/security/nss
 
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m755 -d "${pkgdir}/usr/bin"
@@ -65,9 +65,9 @@
 				-e "s,%includedir%,/usr/include/nss,g" \
 				-e "s,%NSPR_VERSION%,${pkgver},g" \
 				-e "s,%NSS_VERSION%,${pkgver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc" || return 1
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" || return 1
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc || return 1
+			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
+  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
+  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
 
   sed "${srcdir}/nss-config.in" -e "s, at libdir@,/usr/lib,g" \
   				    -e "s, at prefix@,/usr/bin,g" \
@@ -76,21 +76,21 @@
 				    -e "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
 				    -e "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
 				    -e "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config" || return 1
-  chmod 755 "${pkgdir}/usr/bin/nss-config" || return 1
+			    > "${pkgdir}/usr/bin/nss-config"
+  chmod 755 "${pkgdir}/usr/bin/nss-config"
 
   for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
               libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
   do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1
+    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
   done
 
-  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/" || return 1
-  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/" || return 1
+  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
+  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
 
   for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" || return 1
+    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
   done
 
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" || return 1
+  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
 }

Modified: add_spi+cacert_ca_certs.patch
===================================================================
--- add_spi+cacert_ca_certs.patch	2010-08-18 07:22:34 UTC (rev 87753)
+++ add_spi+cacert_ca_certs.patch	2010-08-18 08:15:59 UTC (rev 87754)
@@ -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 @@
 +"\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 @@
 +  { (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 @@
 +"\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 @@
 +  { (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 @@
 +"\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 @@
  
  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
 +
 +#



More information about the arch-commits mailing list