Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cJSON: update to 1.7.18.
@ 2024-06-06 20:03 skmpz
  2024-06-08  2:59 ` [PR PATCH] [Merged]: " cinerea0
  0 siblings, 1 reply; 2+ messages in thread
From: skmpz @ 2024-06-06 20:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/skmpz/void-packages cJSON-1.7.18
https://github.com/void-linux/void-packages/pull/50722

cJSON: update to 1.7.18.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/50722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cJSON-1.7.18-50722.patch --]
[-- Type: text/x-diff, Size: 2141 bytes --]

From 243d8c5ceb656dd0321df7509609da3d2236fa4a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 6 Jun 2024 23:02:51 +0300
Subject: [PATCH] cJSON: update to 1.7.18.

---
 srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 ---------------------
 srcpkgs/cJSON/template                      |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch

diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
deleted file mode 100644
index 01556a6eb8e00e..00000000000000
--- a/srcpkgs/cJSON/patches/fix-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
-From: Alan Wang <948467222@qq.com>
-Date: Thu, 26 Aug 2021 14:13:42 +0800
-Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
-
----
- cJSON_Utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cJSON_Utils.c b/cJSON_Utils.c
-index c7c64391..63651dfb 100644
---- a/cJSON_Utils.c
-+++ b/cJSON_Utils.c
-@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
-             replacement = merge_patch(replace_me, patch_child, case_sensitive);
-             if (replacement == NULL)
-             {
-+                cJSON_Delete(target);
-                 return NULL;
-             }
- 
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index 63235062a77cb6..18fe5e62ed976c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,14 @@
 # Template file for 'cJSON'
 pkgname=cJSON
-version=1.7.15
-revision=2
+version=1.7.18
+revision=1
 build_style=cmake
 short_desc="Ultralightweight JSON parser in ANSI C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/DaveGamble/cJSON"
 distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
+checksum=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5
 
 post_install() {
 	vlicense LICENSE

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

* Re: [PR PATCH] [Merged]: cJSON: update to 1.7.18.
  2024-06-06 20:03 [PR PATCH] cJSON: update to 1.7.18 skmpz
@ 2024-06-08  2:59 ` cinerea0
  0 siblings, 0 replies; 2+ messages in thread
From: cinerea0 @ 2024-06-08  2:59 UTC (permalink / raw)
  To: ml

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

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

cJSON: update to 1.7.18.
https://github.com/void-linux/void-packages/pull/50722

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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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] 2+ messages in thread

end of thread, other threads:[~2024-06-08  2:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-06 20:03 [PR PATCH] cJSON: update to 1.7.18 skmpz
2024-06-08  2:59 ` [PR PATCH] [Merged]: " cinerea0

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).