gentoo auto-resync : 09:07:2023 - 10:24:32

3 files changed, 62 insertions, 0 deletions

diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index eeb8ca360619..6469442c5207 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,5 +1,7 @@
+AUX yajl-2.1.0-memory-leak.patch 668 BLAKE2B dd0a4c69fa1077f67e2235155213a1b0da9c80d8ed2f54ab6feb14caadb5e413bdae0dc81d3a0d4d47c909e2682a912001190458e913f48c96bc5349a92a0b86 SHA512 7e14187d678ae6c50e33dd4469372302a566d2870329b60e91bcddc86fdd82d1c71b3a8d7592a1e5cfe84c4a0a810ec2a4c0b410a8be8185e143d9b109599f61
 AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
 EBUILD yajl-2.1.0-r3.ebuild 913 BLAKE2B 4057e6a5e9679d2ad7343e4af25d4e8446e4329265e6822969124e1160909612363ec25b83b819fd4978861b2c21ca014be4ae951b3bc31fdf68aa9c4ed84c30 SHA512 02dbbaeb1c41674408dc6976c6a436c56f6c1b2ba137dba5611fabb67c8b05f86be5c20616a96e4d456ff1ad124047b521f73da1f77e97238d826e10cd3d9d52
+EBUILD yajl-2.1.0-r4.ebuild 982 BLAKE2B d49ca038bfc486e02b5d2943d6c59e3cf8ac48bfb9855294f9b37d60cf8d91f0e58b886707a689e12e7ee73e76a5af4400eeb609d82caad8c57904fe004b905c SHA512 1acb32bf47446895b36bb3fb27b5390d3f21ff75817b94310eab2d195406fdc1b012ba41e49d14d018cce2ccd621a911adf907305625a9b559868fd3e809cdb9
 MISC metadata.xml 337 BLAKE2B 11442725a3ce669685b6c6d2c5ea5c2b4299171f457c7e897e66199de5e46a3434e4b57ed7dba37e3fdf36f2957eb6a67ec0e4805f03f030a05552e688d039bb SHA512 8f91fa500eba8067bd756f42cce81a5473d2c85f5d46a8593bd391c8c39b6b4d548dcce5a4b1e5f92adf1b3b9ba728bc590bff9ba5961a524afb1c592c6c2d16
diff --git a/dev-libs/yajl/files/yajl-2.1.0-memory-leak.patch b/dev-libs/yajl/files/yajl-2.1.0-memory-leak.patch
new file mode 100644
index 000000000000..da059c405393
--- /dev/null
+++ b/dev-libs/yajl/files/yajl-2.1.0-memory-leak.patch
@@ -0,0 +1,23 @@
+From 23a122eddaa28165a6c219000adcc31ff9a8a698 Mon Sep 17 00:00:00 2001
+From: "zhang.jiujiu" <282627424@qq.com>
+Date: Tue, 7 Dec 2021 22:37:02 +0800
+Subject: [PATCH] fix memory leaks
+
+---
+ src/yajl_tree.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/yajl_tree.c b/src/yajl_tree.c
+index b9e66043..0e7bde98 100644
+--- a/src/yajl_tree.c
++++ b/src/yajl_tree.c
+@@ -456,6 +456,9 @@ yajl_val yajl_tree_parse (const char *input,
+              yajl_tree_free(v);
+         }
+         yajl_free (handle);
++	//If the requested memory is not released in time, it will cause memory leakage
++	if(ctx.root)
++	     yajl_tree_free(ctx.root);
+         return NULL;
+     }
+ 
diff --git a/dev-libs/yajl/yajl-2.1.0-r4.ebuild b/dev-libs/yajl/yajl-2.1.0-r4.ebuild
new file mode 100644
index 000000000000..fb59588a03ea
--- /dev/null
+++ b/dev-libs/yajl/yajl-2.1.0-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib multibuild
+
+DESCRIPTION="Small event-driven (SAX-style) JSON parser"
+HOMEPAGE="https://lloyd.github.io/yajl/"
+SRC_URI="https://github.com/lloyd/yajl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/lloyd-yajl-66cb08c"
+
+LICENSE="ISC"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-uclibc.patch # git master 5d4bf525
+	"${FILESDIR}"/${P}-pkg-config.patch # downstream
+	"${FILESDIR}"/${P}-memory-leak.patch # Bug 908036
+)
+
+src_prepare() {
+	cmake_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_test() {
+	cd "${S}"/test/parsing || die
+	./run_tests.sh "${BUILD_DIR}"/test/parsing/yajl_test || die
+}
+
+src_install() {
+	cmake-multilib_src_install
+	find "${D}" -name libyajl_s.a -delete || die
+}