diff options
| -rw-r--r-- | main/nss/APKBUILD | 10 | ||||
| -rw-r--r-- | main/nss/bmo702090.patch | 20 |
2 files changed, 4 insertions, 26 deletions
diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD index 16fbb59bf4..246e7571d3 100644 --- a/main/nss/APKBUILD +++ b/main/nss/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nss -pkgver=3.13.1 +pkgver=3.13.3 _ver=${pkgver//./_} -pkgrel=1 +pkgrel=0 pkgdesc="Mozilla Network Security Services" url="http://www.mozilla.org/projects/security/pki/nss/" arch="all" @@ -16,7 +16,6 @@ source="ftp://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch - bmo702090.patch " depends_dev="nspr-dev" @@ -141,10 +140,9 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="c500f96d33ba1390c8a35c667e05e542 nss-3.13.1.tar.gz +md5sums="006cb82fa900e9e664b4b14a9b7810ca nss-3.13.3.tar.gz e5c97db0c884d5f4cfda21e562dc9bba nss-no-rpath.patch c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in 46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in 7f39c19b1dfd62d7db7d8bf19f156fed add_spi+cacert_ca_certs.patch -d83c7b61abb7e9f8f7bcd157183d1ade ssl-renegotiate-transitional.patch -af8c6c19a3ef6df87141a67c6c600c13 bmo702090.patch" +d83c7b61abb7e9f8f7bcd157183d1ade ssl-renegotiate-transitional.patch" diff --git a/main/nss/bmo702090.patch b/main/nss/bmo702090.patch deleted file mode 100644 index e251485546..0000000000 --- a/main/nss/bmo702090.patch +++ /dev/null @@ -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)); |