From: skmpz <skmpz@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] cJSON: update to 1.7.18.
Date: Thu, 06 Jun 2024 22:03:16 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50722@inbox.vuxu.org> (raw)
[-- 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
next reply other threads:[~2024-06-06 20:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 20:03 skmpz [this message]
2024-06-08 2:59 ` [PR PATCH] [Merged]: " cinerea0
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50722@inbox.vuxu.org \
--to=skmpz@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).