From 9c19d4b483a8a065d72a2b4481f9ae0059f1b92d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 09:44:28 -0400
Subject: [PATCH] AutoBuild: yajl started at 2025-03-24-10UTC (#11594)

* Rebuild yajl

* Add built packages for linux/386 to yajl

* Add built packages for linux/amd64 to yajl

* Add built packages for linux/arm/v7 to yajl

---------

Co-authored-by: Zopolis4 <creatorsmithmdt@gmail.com>
Co-authored-by: Zopolis4 <Zopolis4@users.noreply.github.com>
---
 packages/yajl.rb | 50 +++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/packages/yajl.rb b/packages/yajl.rb
index 36b7c4d5f..bbc1eb5b6 100644
--- a/packages/yajl.rb
+++ b/packages/yajl.rb
@@ -1,43 +1,37 @@
-require 'package'
+require 'buildsystems/cmake'
 
-class Yajl < Package
+class Yajl < CMake
   description 'A fast streaming JSON parsing library in C.'
-  homepage 'http://lloyd.github.io/yajl/'
-  version '2.1.0-4'
+  homepage 'https://lloyd.github.io/yajl/'
+  version '2.1.0'
   license 'ISC'
   compatibility 'all'
-  source_url 'https://github.com/lloyd/yajl/archive/refs/tags/2.1.0.tar.gz'
-  source_sha256 '3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a'
+  source_url 'https://github.com/lloyd/yajl.git'
+  git_hashtag version
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'be4e182188a8f042b65865dae2af1dd1312d6a2c0edfd9cb8da75999927ee174',
-     armv7l: 'be4e182188a8f042b65865dae2af1dd1312d6a2c0edfd9cb8da75999927ee174',
-       i686: 'cd4f672d43eba7368b08e4d0a71baf40daa5562ae789e3150ff941293e6fb64e',
-     x86_64: 'efea10c9cbb546dd9e5877047299b3d76c78ea106a10484bdeb0e062e49222c2'
+    aarch64: '7f63880f74807f1934ed2661599e13fdc9f01766e385b58826a1e1b8f9a0402a',
+     armv7l: '7f63880f74807f1934ed2661599e13fdc9f01766e385b58826a1e1b8f9a0402a',
+       i686: 'cdadc9f56f29b9d171c9adda2286339836dcc7ef5acaec1093db93c11ade7491',
+     x86_64: '1a57f6807cbcc7a96a5b480b891628534048d62b4d1f44efd986f8b2144a573f'
   })
 
   depends_on 'glibc' # R
 
   def self.patch
-    # Fix CVE-2022-24795
-    downloader 'https://patch-diff.githubusercontent.com/raw/lloyd/yajl/pull/242.patch',
-               '28cf573e61ad5d442dc3ea23912e1d1a3a714c6f20a647304fbd5a886b457f29'
-    system 'patch -Np1 -i 242.patch'
-    #  Fixes incorrect lower bound for integers
-    downloader 'https://patch-diff.githubusercontent.com/raw/lloyd/yajl/pull/251.patch',
-               '24b6928e87f388f633b51b98025c15ca6cd40c4cd388278cbb98bd06c64be719'
-    system 'patch -Np1 -i 251.patch'
+    patches = [
+      # Fix for CVE-2017-16516
+      ['https://github.com/rtobar/yajl/commit/29776e34c226988935f4eb82991c611ba8b153b9.patch', '423847f4e448361cae1d86a2ab62e47b3cd31b76a065294ff9b2e5a689ec9cbd'],
+      # Fix for CVE-2022-24795
+      ['https://github.com/rtobar/yajl/commit/9fd851460dde6655f19f17bf551dcef125102a4c.patch', '6c22ba6f858094601b48fda15d550effc352bfe4ce20c189fc743077ce8b1ce0'],
+      # Fix for CVE-2023-33460a
+      ['https://github.com/rtobar/yajl/commit/1db6a0345c59970c4a647c0df00d0d5cbfd42fe3.patch', '93cd4b535eee6a9a8539d78c05c0283ca63eb3a07d2c9a70b42412d1a72eec1b'],
+      # Fixes incorrect lower bound for integers (#130)
+      ['https://patch-diff.githubusercontent.com/raw/lloyd/yajl/pull/251.patch', '24b6928e87f388f633b51b98025c15ca6cd40c4cd388278cbb98bd06c64be719']
+    ]
+    ConvenienceFunctions.patch(patches)
   end
 
-  def self.build
-    system "cmake -B builddir -G Ninja \
-      #{CREW_CMAKE_LIBSUFFIX_OPTIONS} \
-      -Wno-dev"
-    system "#{CREW_NINJA} -C builddir"
-  end
-
-  def self.install
-    system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install"
-  end
+  cmake_options "-DLIB_SUFFIX=#{CREW_LIB_SUFFIX}"
 end