Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] json-c: update to 0.16, adopt
@ 2022-06-17 18:05 skmpz
  2022-06-28 18:26 ` [PR REVIEW] " classabbyamp
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: skmpz @ 2022-06-17 18:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is a new pull request by skmpz against master on the void-packages repository

https://github.com/skmpz/void-packages json-c-0.16
https://github.com/void-linux/void-packages/pull/37603

json-c: update to 0.16, adopt
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37603.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-json-c-0.16-37603.patch --]
[-- Type: text/x-diff, Size: 2661 bytes --]

From 526d25a4f14f577c388aefea6f14139eafe660ff Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
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                       |  6 ++---
 2 files changed, 3 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..588710417640 100644
--- a/srcpkgs/json-c/template
+++ b/srcpkgs/json-c/template
@@ -1,17 +1,17 @@
 # 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 <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://json-c.github.io/json-c"
 distfiles="https://s3.amazonaws.com/json-c_releases/releases/${pkgname}-${version}.tar.gz"
-checksum=b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6
+checksum=8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b
 
 CFLAGS="-Wno-error"
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR REVIEW] json-c: update to 0.16, adopt
  2022-06-17 18:05 [PR PATCH] json-c: update to 0.16, adopt skmpz
@ 2022-06-28 18:26 ` classabbyamp
  2022-06-28 18:49 ` [PR PATCH] [Updated] " skmpz
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2022-06-28 18:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37603#discussion_r908811376

Comment:
```suggestion
homepage="https://json-c.github.io/json-c"
changelog="https://raw.githubusercontent.com/json-c/json-c/master/ChangeLog"
```

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] json-c: update to 0.16, adopt
  2022-06-17 18:05 [PR PATCH] json-c: update to 0.16, adopt skmpz
  2022-06-28 18:26 ` [PR REVIEW] " classabbyamp
@ 2022-06-28 18:49 ` skmpz
  2022-06-28 18:52 ` skmpz
  2022-06-30 15:11 ` [PR PATCH] [Merged]: " Duncaen
  3 siblings, 0 replies; 5+ messages in thread
From: skmpz @ 2022-06-28 18:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

There is an updated pull request by skmpz against master on the void-packages repository

https://github.com/skmpz/void-packages json-c-0.16
https://github.com/void-linux/void-packages/pull/37603

json-c: update to 0.16, adopt
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37603.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-json-c-0.16-37603.patch --]
[-- Type: text/x-diff, Size: 2740 bytes --]

From a83c456846bd07e8152c10f8212cbc9b906ebaef Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
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 <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] json-c: update to 0.16, adopt
  2022-06-17 18:05 [PR PATCH] json-c: update to 0.16, adopt skmpz
  2022-06-28 18:26 ` [PR REVIEW] " classabbyamp
  2022-06-28 18:49 ` [PR PATCH] [Updated] " skmpz
@ 2022-06-28 18:52 ` skmpz
  2022-06-30 15:11 ` [PR PATCH] [Merged]: " Duncaen
  3 siblings, 0 replies; 5+ messages in thread
From: skmpz @ 2022-06-28 18:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

There is an updated pull request by skmpz against master on the void-packages repository

https://github.com/skmpz/void-packages json-c-0.16
https://github.com/void-linux/void-packages/pull/37603

json-c: update to 0.16, adopt
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37603.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-json-c-0.16-37603.patch --]
[-- Type: text/x-diff, Size: 2740 bytes --]

From d35494b5c033e99aac29325f60aa0795fa7b4d2f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
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 <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: json-c: update to 0.16, adopt
  2022-06-17 18:05 [PR PATCH] json-c: update to 0.16, adopt skmpz
                   ` (2 preceding siblings ...)
  2022-06-28 18:52 ` skmpz
@ 2022-06-30 15:11 ` Duncaen
  3 siblings, 0 replies; 5+ messages in thread
From: Duncaen @ 2022-06-30 15:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]

There's a merged pull request on the void-packages repository

json-c: update to 0.16, adopt
https://github.com/void-linux/void-packages/pull/37603

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-06-30 15:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-17 18:05 [PR PATCH] json-c: update to 0.16, adopt skmpz
2022-06-28 18:26 ` [PR REVIEW] " classabbyamp
2022-06-28 18:49 ` [PR PATCH] [Updated] " skmpz
2022-06-28 18:52 ` skmpz
2022-06-30 15:11 ` [PR PATCH] [Merged]: " Duncaen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).