diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-04-17 09:26:35 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-04-17 09:28:50 +0300 |
| commit | 122586e61981d0c78c2f854a815b3de3cec8f6dd (patch) | |
| tree | 2db80a902bfe0e77a911359bcb21da1712c0037f /main/nss | |
| parent | 16198c30f7c35c14f19c357886d10d1cc088a352 (diff) | |
| download | aports-122586e61981d0c78c2f854a815b3de3cec8f6dd.tar.bz2 aports-122586e61981d0c78c2f854a815b3de3cec8f6dd.tar.xz | |
main/nss: security upgrade to 3.16 (CVE-2014-1492)
remove upstreamed patch. ref #2796
Diffstat (limited to 'main/nss')
| -rw-r--r-- | main/nss/APKBUILD | 18 | ||||
| -rw-r--r-- | main/nss/fix-mpi-x86.patch | 10 |
2 files changed, 7 insertions, 21 deletions
diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD index 8eb662b2ab..96c2225445 100644 --- a/main/nss/APKBUILD +++ b/main/nss/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nss -pkgver=3.15.5 +pkgver=3.16 _ver=${pkgver//./_} pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -16,7 +16,6 @@ source="ftp://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch fix-cdefs_h.patch - fix-mpi-x86.patch " depends_dev="nspr-dev" @@ -140,24 +139,21 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="7a8cb5418ac8aa15d91d7bc549698268 nss-3.15.5.tar.gz +md5sums="0a6f8503d08c078d64d500e77678e33c nss-3.16.tar.gz c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in 46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in 981e0df9e9cb7a9426b316f68911fb17 add_spi+cacert_ca_certs.patch 2412ff2e97b3ec452cb016f2506a0e08 ssl-renegotiate-transitional.patch -1f83bc41ffe34190bcc27d146c479772 fix-cdefs_h.patch -09925cb6a92e1e4dfca6340a2236269e fix-mpi-x86.patch" -sha256sums="1442c85624b7de74c7745132a65aa0de47d280c4f01f293d111bc0b6d8271f43 nss-3.15.5.tar.gz +1f83bc41ffe34190bcc27d146c479772 fix-cdefs_h.patch" +sha256sums="2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 nss-3.16.tar.gz b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd nss.pc.in e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9 nss-config.in 592aa85184c5edb076c3355f85e50373a59dfcd06a4f4a79621f43df19404c1e add_spi+cacert_ca_certs.patch 1a49be9d7f835be737825252f50e4ee2869228eb303a087dde7fb81794b92ebd ssl-renegotiate-transitional.patch -41866089e3d085f05bc4a7e337f2f5740da4eef9021366a450a8fd111f24975c fix-cdefs_h.patch -51c02b1d98ce956463f7b8bb5751f4c0cd3f1d79a620d67db93f5977e4879525 fix-mpi-x86.patch" -sha512sums="4db27ea98f17f1a5bc6f513455497945fc35957f573b3ac7e730b166fbe0e8fd741c188187c578faf361d969db63d83ff8ccf15ac2b8ca72a367f33a018695ca nss-3.15.5.tar.gz +41866089e3d085f05bc4a7e337f2f5740da4eef9021366a450a8fd111f24975c fix-cdefs_h.patch" +sha512sums="e3dcde8213f7f131fe2f714ff2f45c6d7b9b2167e51dbf0e1a750cc4f83d9fa35e69408850de6600f55fbc9e26b29dc344548cb64849d6e3252476eadd7ee57f nss-3.16.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 2971669e128f06a9af40a5ba88218fa7c9eecfeeae8b0cf42e14f31ed12bf6fa4c5ce60289e078f50e2669a9376b56b45d7c29d726a7eac69ebe1d1e22dc710b nss-config.in 6e04556858499aec465d6670818465327ba2cb099061c2afee4b5cac8aa61938e0095906acfb38df6a1b70a6bde6dd69f08bb4c00a9d188e4cb3131b26c1bc16 add_spi+cacert_ca_certs.patch c21a82247d87d74cb27575efc517a6771476320ce412cd444e83d0782e29f82552676247da093518b07d3eb7dc67c53cd1901ee8d6f59b342d02e47784c39192 ssl-renegotiate-transitional.patch -54080ed5e66185bfb9fae6518b8f898213a00a2803900ee13a958664a7e60aee60b51f0c27176344ebf49e9c671f1f62f56280ab9e8c7f206c5df143c3a7d24c fix-cdefs_h.patch -5999ed85ea5b747de6c81f07fa29bff625e553593be012465b1d4a4cbe1a9afbb839b363c18977d1664186906b63037b57b19a98799258ffe45a5f85d3fcd4ba fix-mpi-x86.patch" +54080ed5e66185bfb9fae6518b8f898213a00a2803900ee13a958664a7e60aee60b51f0c27176344ebf49e9c671f1f62f56280ab9e8c7f206c5df143c3a7d24c fix-cdefs_h.patch" diff --git a/main/nss/fix-mpi-x86.patch b/main/nss/fix-mpi-x86.patch deleted file mode 100644 index 4a51c68b4b..0000000000 --- a/main/nss/fix-mpi-x86.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nss-3.15.1/nss/lib/freebl/Makefile -+++ nss-3.15.1.new/nss/lib/freebl/Makefile -@@ -196,6 +196,7 @@ - ASFILES = mpi_x86.s - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE - DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -+ DEFINES += -DMP_USE_UINT_DIGIT - DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN - # The floating point ECC code doesn't work on Linux x86 (bug 311432). - #ECL_USE_FP = 1 |