aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-07-12 16:45:19 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-07-12 16:45:26 +0000
commit53e69c3cdf5a032b6c9f106295a6de389e554e4f (patch)
tree987b3ccbb96dd4841e7f7580999d7101e241bde9
parentb6c2a7909a7eb15646a151e01c2174f2fbc08208 (diff)
downloadaports-53e69c3cdf5a032b6c9f106295a6de389e554e4f.tar.bz2
aports-53e69c3cdf5a032b6c9f106295a6de389e554e4f.tar.xz
main/json-c: upgrade to 0.12.1
-rw-r--r--main/json-c/APKBUILD14
-rw-r--r--main/json-c/size-set-but-not-used.patch19
2 files changed, 5 insertions, 28 deletions
diff --git a/main/json-c/APKBUILD b/main/json-c/APKBUILD
index 191afbad87..9484baf6de 100644
--- a/main/json-c/APKBUILD
+++ b/main/json-c/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=json-c
-pkgver=0.12
-pkgrel=1
+pkgver=0.12.1
+pkgrel=0
pkgdesc="A JSON implementation in C"
url="https://github.com/json-c/json-c/wiki"
arch="all"
@@ -12,7 +12,6 @@ makedepends="$depends_dev autoconf automake libtool"
install=""
subpackages="$pkgname-dev"
source="https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz
- size-set-but-not-used.patch
"
_builddir="$srcdir"/json-c-$pkgver
@@ -46,9 +45,6 @@ package() {
make -j1 DESTDIR="$pkgdir" install || return 1
}
-md5sums="3ca4bbb881dfc4017e8021b5e0a8c491 json-c-0.12.tar.gz
-ff9d703a13744d4a67c074dfa25d3eea size-set-but-not-used.patch"
-sha256sums="000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f json-c-0.12.tar.gz
-71cd883f54d46f023eaf2e530344c301dbbe9bd5090d64a1abe4dd8394afb2b4 size-set-but-not-used.patch"
-sha512sums="c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35 json-c-0.12.tar.gz
-881faff046ae3608c82456276788b4a72e0abd75f8c2d57e192a8a40c887cd78e535f3a009ca69180c29dfcf07f3d823b4cd84b944103a4c7d5b1a7a5eb98103 size-set-but-not-used.patch"
+md5sums="55f7853f7d8cf664554ce3fa71bf1c7d json-c-0.12.1.tar.gz"
+sha256sums="2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123 json-c-0.12.1.tar.gz"
+sha512sums="038676a0ce815e5174161fbd4339524feadc294d517f732fb408ad6aa7c4906423451c13386107569d9f24746a1a101564ca511e92e8276c5bf5b8c022ca42ed json-c-0.12.1.tar.gz"
diff --git a/main/json-c/size-set-but-not-used.patch b/main/json-c/size-set-but-not-used.patch
deleted file mode 100644
index 1cb1ab1d24..0000000000
--- a/main/json-c/size-set-but-not-used.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/json-c/json-c/issues/134
-
-diff --git a/json_tokener.c b/json_tokener.c
-index 19de8ef..9a76293 100644
---- a/json_tokener.c
-+++ b/json_tokener.c
-@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
-
- case json_tokener_state_inf: /* aka starts with 'i' */
- {
-- int size;
- int size_inf;
- int is_negative = 0;
-
- printbuf_memappend_fast(tok->pb, &c, 1);
-- size = json_min(tok->st_pos+1, json_null_str_len);
- size_inf = json_min(tok->st_pos+1, json_inf_str_len);
- char *infbuf = tok->pb->buf;
- if (*infbuf == '-')