From 0035e7be16150a58c8d9c885ce9a7b06a0e9d57f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 10 Mar 2016 09:41:11 +0000
Subject: [PATCH] main/nspr: upgrade to 4.12
---
main/nspr/APKBUILD | 14 +++++++-------
main/nspr/fix-getproto.patch | 5 ++---
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index e29f10556823..72a2581627c4 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=nspr
-pkgver=4.11
+pkgver=4.12
pkgrel=0
pkgdesc="Netscape Portable Runtime"
url="http://www.mozilla.org/projects/nspr/"
@@ -68,9 +68,9 @@ package() {
"$pkgdir"/usr/include/nspr/md
}
-md5sums="4f24b2fb88ca03b5d6d6931d6a67ef9a nspr-4.11.tar.gz
-c417cf87161ee2d12c5c1c772c94cc38 fix-getproto.patch"
-sha256sums="cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2 nspr-4.11.tar.gz
-46bf377b7e19f8450b81366905237630a85691a55fccddb355b2f55d60e8b4a6 fix-getproto.patch"
-sha512sums="26c47ba618f5a7748cacc5152348b6fd37bdcc82806bbff485ed4d485aecad13d202270a837c735670030e96380ec3177f3bc8a47e0dca359cfb097a84242c02 nspr-4.11.tar.gz
-197f0e644bf402ee9cf1c621a0daf3426659ca05610aa7b6d8bed3d81f1d1c77c0a81ef35a92fa42b271c7f814d718ec1d1b61f5f4b554b3735142903b70e32b fix-getproto.patch"
+md5sums="0de760c1e00a92e180e611cf06ce9589 nspr-4.12.tar.gz
+6911c977d89df5203b16c275311f2afe fix-getproto.patch"
+sha256sums="e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de nspr-4.12.tar.gz
+d9e9e80b31559ffd2a28857e455076e2b874b81c1557bc3a80f1984bcc0bc719 fix-getproto.patch"
+sha512sums="138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460 nspr-4.12.tar.gz
+ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch"
diff --git a/main/nspr/fix-getproto.patch b/main/nspr/fix-getproto.patch
index 7fa98da26f07..a96d14730825 100644
--- a/main/nspr/fix-getproto.patch
+++ b/main/nspr/fix-getproto.patch
@@ -1,13 +1,12 @@
--- ./nspr/pr/src/misc/prnetdb.c.orig
+++ ./nspr/pr/src/misc/prnetdb.c
-@@ -61,10 +61,7 @@
+@@ -61,9 +61,7 @@
#define _PR_HAVE_GETPROTO_R_POINTER
#endif
-#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
- || (defined(LINUX) && defined(_REENTRANT) \
-- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
-- && !defined(ANDROID))
+- && defined(__GLIBC__) && __GLIBC__ < 2)
+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT))
#define _PR_HAVE_GETPROTO_R
#define _PR_HAVE_GETPROTO_R_POINTER
--
GitLab