Vendor yyjson.

.github/workflows/ci-alpine.yml

@@ -36,12 +36,11 @@ jobs:
             perl \
             pkgconf \
             re2-dev \
-            sqlite-dev \
-            yyjson-dev
+            sqlite-dev
 
       - name: Run configure
         run: |
-          ./configure --enable-extras "argon2 geo_maxmind ldap log_json log_syslog mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
+          ./configure --enable-extras "argon2 geo_maxmind ldap log_syslog mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
           ./configure --development --disable-auto-extras --disable-ownership --socketengine ${{ matrix.socketengine }}
 
       - name: Build core

.github/workflows/ci-macos.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install dependencies
         run: |
           brew update || true
-          for PACKAGE in pkg-config argon2 gnutls libmaxminddb libpq libpsl mysql-client openssl openldap pcre2 re2 sqlite yyjson
+          for PACKAGE in pkg-config argon2 gnutls libmaxminddb libpq libpsl mysql-client openssl openldap pcre2 re2 sqlite
           do
             brew install $PACKAGE || brew upgrade $PACKAGE
 
@@ -44,7 +44,7 @@ jobs:
 
       - name: Run configure
         run: |
-          ./configure --enable-extras "argon2 geo_maxmind ldap log_json log_syslog mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
+          ./configure --enable-extras "argon2 geo_maxmind ldap log_syslog mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
           ./configure --development --disable-auto-extras --socketengine ${{ matrix.socketengine }}
 
       - name: Build core

.gitignore

@@ -20,7 +20,6 @@
 /modules/argon2.cpp
 /modules/geo_maxmind.cpp
 /modules/ldap.cpp
-/modules/log_json.cpp
 /modules/log_syslog.cpp
 /modules/mysql.cpp
 /modules/pgsql.cpp

configure

@@ -392,7 +392,6 @@ if (prompt_bool $interactive, $question, 0) {
 		'mysql'           => 'mysql_config --version',
 		'pgsql'           => 'pg_config --version',
 		'ldap'            => "pkg-config --exists lber && pkg-config --exists ldap",
-		'log_json'        => 'pkg-config --exists yyjson',
 		'log_syslog'      => undef,
 		'regex_pcre2'     => 'pkg-config --exists libpcre2-8',
 		'regex_posix'     => undef,

docs/conf/modules.example.conf

@@ -1491,16 +1491,6 @@
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # JSON logging module: Allows writing messages to a JSON file.        #
-#                                                                     #
-# This module depends on a third-party library (yyjson) and may need  #
-# to be manually enabled at build time. If you are building from      #
-# source you can do this by installing this dependency and running:   #
-#                                                                     #
-#   ./configure --enable-extras log_json                              #
-#   make install                                                      #
-#                                                                     #
-# Users of binary packages should consult the documentation for their #
-# package to find out whether this module is available.               #
 #<module name="log_json">
 #
 #<log method="json"

modules/log_json.cpp

@@ -16,19 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/// $CompilerFlags: find_compiler_flags("yyjson")
-/// $LinkerFlags: find_linker_flags("yyjson")
-
-/// $PackageInfo: require_system("alpine") pkgconf yyjson-dev
-/// $PackageInfo: require_system("arch") pkgconf yyjson
-/// $PackageInfo: require_system("darwin") pkg-config yyjson
-/// $PackageInfo: require_system("debian~") libyyjson-dev pkg-config
-
-#ifdef _WIN32
-# pragma comment(lib, "yyjson.lib")
-#endif
-
-#include <yyjson.h>
+#include <yyjson/yyjson.c>
 
 #include "inspircd.h"
 #include "timeutils.h"

vendor/README.md

@@ -61,3 +61,13 @@ This directory contains vendored dependencies that are shipped with InspIRCd to
 **Version** — v4.0.6
 
 **Website** — [https://github.com/nemtrif/utfcpp](https://github.com/nemtrif/utfcpp)
+
+## yyjson
+
+**Author** — Yaoyuan Guo
+
+**License** — MIT License
+
+**Version** — 0.10.0
+
+**Website** — [https://github.com/ibireme/yyjson](https://github.com/ibireme/yyjson)

vendor/update.toml

@@ -44,3 +44,10 @@ depth   = 2
 files   = "{LICENSE,source/utf8/{core,unchecked}.h}"
 git     = "https://github.com/nemtrif/utfcpp"
 license = "Boost Software License"
+
+[yyjson]
+author  = "Yaoyuan Guo"
+depth   = 1
+git     = "https://github.com/ibireme/yyjson"
+files   = "{LICENSE,src/yyjson.[ch]}"
+license = "MIT License"

vendor/yyjson/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 YaoYuan <ibireme@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

win/conanfile.txt

@@ -14,7 +14,6 @@ libpsl/0.21.1
 pcre2/10.44
 re2/20240702
 sqlite3/3.47.0
-yyjson/0.10.0
 
 [options]
 argon2:shared=True
@@ -26,7 +25,6 @@ openssl:shared=True
 pcre2:shared=True
 re2:shared=True
 sqlite3:shared=True
-yyjson:shared=True
 
 [imports]
 ., *.dll -> extradll @ keep_path=False

win/modules/CMakeLists.txt

@@ -43,7 +43,6 @@ if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
 
 	enable_extra("argon2" "ARGON2")
 	enable_extra("geo_maxmind" "LIBMAXMINDDB")
-	enable_extra("log_json" "YYJSON")
 	enable_extra("mysql" "LIBMYSQLCLIENT")
 	enable_extra("pgsql" "LIBPQ")
 	enable_extra("regex_pcre2" "PCRE2")