nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch

   1 From 9b7334b61cf3277e5eb48b716f6719b4636e2572 Mon Sep 17 00:00:00 2001
   2 From: Rich Megginson <rmeggins@redhat.com>
   3 Date: Mon, 12 Jul 2010 17:21:01 -0600
   4 Subject: [PATCH] Do not define SEC_SkipTemplate
   5
   6 Building NSS with PEM support gives an error in pbobject due to multiple
   7 definitions of SEC_SkipTemplate.  This is already defined in libnssutil
   8 ---
   9  pobject.c |    3 +++
  10  1 files changed, 3 insertions(+), 0 deletions(-)
  11
  12 diff --git a/pobject.c b/pobject.c
  13 index 81b9028..48f5e78 100644
  14 --- a/mozilla/security/nss/lib/ckfw/pem/pobject.c
  15 +++ b/mozilla/security/nss/lib/ckfw/pem/pobject.c
  16 @@ -172,6 +172,8 @@ static const NSSItem pem_trusted = {
  17      (void *) &ckt_netscape_trusted, (PRUint32) sizeof(CK_TRUST)
  18  };
  19
  20 +/* SEC_SkipTemplate is already defined and exported by libnssutil */
  21 +#ifdef SEC_SKIP_TEMPLATE
  22  /*
  23   * Template for skipping a subitem.
  24   *
  25 @@ -182,6 +184,7 @@ static const NSSItem pem_trusted = {
  26  const SEC_ASN1Template SEC_SkipTemplate[] = {
  27      {SEC_ASN1_SKIP}
  28  };
  29 +#endif
  30
  31  /*
  32   * Find the subjectName in a DER encoded certificate
  33 --
  34 1.5.5.6
  35