From d35494b5c033e99aac29325f60aa0795fa7b4d2f Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 17 Jun 2022 22:04:39 +0400 Subject: [PATCH] json-c: update to 0.16, adopt --- ...1-4e9e44-Fix-read-past-end-of-buffer.patch | 24 ------------------- srcpkgs/json-c/template | 7 +++--- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch diff --git a/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch b/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch deleted file mode 100644 index bfbdce690950..000000000000 --- a/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4e9e44e5258dee7654f74948b0dd5da39c28beec Mon Sep 17 00:00:00 2001 -From: Marc <34656315+MarcT512@users.noreply.github.com> -Date: Fri, 7 Aug 2020 10:49:45 +0100 -Subject: [PATCH] Fix read past end of buffer - -Resolves https://github.com/json-c/json-c/issues/654 ---- - apps/json_parse.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/apps/json_parse.c b/apps/json_parse.c -index bba4622183..72b31a860a 100644 ---- a/apps/json_parse.c -+++ b/apps/json_parse.c -@@ -82,7 +82,8 @@ static int parseit(int fd, int (*callback)(struct json_object *)) - int parse_end = json_tokener_get_parse_end(tok); - if (obj == NULL && jerr != json_tokener_continue) - { -- char *aterr = &buf[start_pos + parse_end]; -+ char *aterr = (start_pos + parse_end < sizeof(buf)) ? -+ &buf[start_pos + parse_end] : ""; - fflush(stdout); - int fail_offset = total_read - ret + start_pos + parse_end; - fprintf(stderr, "Failed at offset %d: %s %c\n", fail_offset, diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template index daafc44f97ac..dbbd2565a2a9 100644 --- a/srcpkgs/json-c/template +++ b/srcpkgs/json-c/template @@ -1,17 +1,18 @@ # Template file for 'json-c' pkgname=json-c -version=0.15 +version=0.16 revision=1 build_style=cmake configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON -DENABLE_RDRAND=$(vopt_if rdrand ON OFF)" hostmakedepends="doxygen" short_desc="JSON implementation in C" -maintainer="Orphaned " +maintainer="skmpz " license="MIT" homepage="https://json-c.github.io/json-c" +changelog="https://raw.githubusercontent.com/json-c/json-c/master/ChangeLog" distfiles="https://s3.amazonaws.com/json-c_releases/releases/${pkgname}-${version}.tar.gz" -checksum=b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6 +checksum=8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b CFLAGS="-Wno-error"