Date: Wednesday, December 28, 2011 @ 05:04:38 Author: jgc Revision: 145699
upgpkg: nss 3.13.1-2 Fix FS#27637 (upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=702090) Added: nss/trunk/bug702090.patch Modified: nss/trunk/PKGBUILD -----------------+ PKGBUILD | 5 ++++- bug702090.patch | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-12-28 08:07:08 UTC (rev 145698) +++ PKGBUILD 2011-12-28 10:04:38 UTC (rev 145699) @@ -3,7 +3,7 @@ pkgname=nss pkgver=3.13.1 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/"; @@ -14,12 +14,14 @@ 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 nss-no-rpath.patch nss.pc.in nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6' + '057dd510ba567d344e705062436a786beb5592b6' 'c8fcdb153af9d39689243119adb475905a657284' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' @@ -28,6 +30,7 @@ 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 Added: bug702090.patch =================================================================== --- bug702090.patch (rev 0) +++ bug702090.patch 2011-12-28 10:04:38 UTC (rev 145699) @@ -0,0 +1,20 @@ +--- ./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));
