Merge branch 'refs/heads/main' into ext/rdkafka

# Conflicts:
#	config/source.json

src/SPC/builder/linux/library/gettext.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class gettext extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\gettext;
+
+    public const NAME = 'gettext';
+}

src/SPC/builder/linux/library/gmssl.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class gmssl extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\gmssl;
+
+    public const NAME = 'gmssl';
+}

src/SPC/builder/linux/library/icu.php

@@ -4,14 +4,18 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
+use SPC\store\FileSystem;
+
 class icu extends LinuxLibraryBase
 {
+    use \SPC\builder\unix\library\icu;
+
     public const NAME = 'icu';
 
     protected function build(): void
     {
-        $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1  -DU_STATIC_IMPLEMENTATION=1"';
-        $cxxflags = 'CXXFLAGS="-std=c++11"';
+        $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1"';
+        $cxxflags = 'CXXFLAGS="-std=c++17"';
         $ldflags = 'LDFLAGS="-static"';
         shell()->cd($this->source_dir . '/source')
             ->exec(
@@ -21,7 +25,7 @@ class icu extends LinuxLibraryBase
                 '--disable-shared ' .
                 '--with-data-packaging=static ' .
                 '--enable-release=yes ' .
-                '--enable-extras=yes ' .
+                '--enable-extras=no ' .
                 '--enable-icuio=yes ' .
                 '--enable-dyload=no ' .
                 '--enable-tools=yes ' .
@@ -32,5 +36,8 @@ class icu extends LinuxLibraryBase
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install');
+
+        $this->patchPkgconfPrefix(['icu-i18n.pc', 'icu-io.pc', 'icu-uc.pc'], PKGCONF_PATCH_PREFIX);
+        FileSystem::removeDir(BUILD_LIB_PATH . '/icu');
     }
 }

src/SPC/builder/linux/library/imap.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+class imap extends LinuxLibraryBase
+{
+    public const NAME = 'imap';
+
+    /**
+     * @throws FileSystemException
+     */
+    public function patchBeforeBuild(): bool
+    {
+        $cc = getenv('CC') ?: 'gcc';
+        // FileSystem::replaceFileStr($this->source_dir . '/Makefile', '-DMAC_OSX_KLUDGE=1', '');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', 'CC=cc', "CC={$cc}");
+        /* FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto -lz', '-lcrypto');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto', '-lcrypto -lz');
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/src/osdep/unix/ssl_unix.c',
+            "#include <x509v3.h>\n#include <ssl.h>",
+            "#include <ssl.h>\n#include <x509v3.h>"
+        );
+        // SourcePatcher::patchFile('1006_openssl1.1_autoverify.patch', $this->source_dir);
+        SourcePatcher::patchFile('2014_openssl1.1.1_sni.patch', $this->source_dir); */
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLINCLUDE=/usr/include/openssl', 'SSLINCLUDE=' . BUILD_INCLUDE_PATH);
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLLIB=/usr/lib', 'SSLLIB=' . BUILD_LIB_PATH);
+        return true;
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        if ($this->builder->getLib('openssl')) {
+            $ssl_options = 'SPECIALAUTHENTICATORS=ssl SSLTYPE=unix.nopwd SSLINCLUDE=' . BUILD_INCLUDE_PATH . ' SSLLIB=' . BUILD_LIB_PATH;
+        } else {
+            $ssl_options = 'SSLTYPE=none';
+        }
+        shell()->cd($this->source_dir)
+            ->exec('make clean')
+            ->exec('touch ip6')
+            ->exec('chmod +x tools/an')
+            ->exec('chmod +x tools/ua')
+            ->exec('chmod +x src/osdep/unix/drivers')
+            ->exec('chmod +x src/osdep/unix/mkauths')
+            ->exec(
+                "yes | make slx {$ssl_options} EXTRACFLAGS='-fPIC -fpermissive'"
+            );
+        try {
+            shell()
+                ->exec("cp -rf {$this->source_dir}/c-client/c-client.a " . BUILD_LIB_PATH . '/libc-client.a')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.c " . BUILD_LIB_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.h " . BUILD_INCLUDE_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/src/osdep/unix/*.h " . BUILD_INCLUDE_PATH . '/');
+        } catch (\Throwable) {
+            // last command throws an exception, no idea why since it works
+        }
+    }
+}

src/SPC/builder/linux/library/libargon2.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+use SPC\store\FileSystem;
+
+class libargon2 extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libargon2;
+
+    public const NAME = 'libargon2';
+
+    public function patchBeforeBuild(): bool
+    {
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'LIBRARY_REL ?= lib/x86_64-linux-gnu', 'LIBRARY_REL ?= lib');
+        return true;
+    }
+}

src/SPC/builder/linux/library/libcares.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libcares extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libcares;
+
+    public const NAME = 'libcares';
+}

src/SPC/builder/linux/library/liblz4.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class liblz4 extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\liblz4;
+
+    public const NAME = 'liblz4';
+}

src/SPC/builder/linux/library/librabbitmq.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class librabbitmq extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\librabbitmq;
+
+    public const NAME = 'librabbitmq';
+}

src/SPC/builder/linux/library/libtiff.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libtiff extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libtiff;
+
+    public const NAME = 'libtiff';
+}

src/SPC/builder/linux/library/libuuid.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libuuid extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libuuid;
+
+    public const NAME = 'libuuid';
+}

src/SPC/builder/linux/library/libuv.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libuv extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libuv;
+
+    public const NAME = 'libuv';
+}

src/SPC/builder/linux/library/libxml2.php

@@ -18,7 +18,7 @@ class libxml2 extends LinuxLibraryBase
      */
     public function build(): void
     {
-        $enable_zlib = $this->builder->getLib('zlib') ? 'ON' : 'OFF';
+        $enable_zlib = $this->builder->getLib('zlib') ? ('ON -DZLIB_LIBRARY=' . BUILD_LIB_PATH . '/libz.a -DZLIB_INCLUDE_DIR=' . BUILD_INCLUDE_PATH) : 'OFF';
         $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
         $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';
 
@@ -26,7 +26,10 @@ class libxml2 extends LinuxLibraryBase
         shell()->cd($this->source_dir . '/build')
             ->exec(
                 'cmake ' .
-                "{$this->builder->makeCmakeArgs()} " .
+                '-DCMAKE_BUILD_TYPE=Release ' .
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
+                '-DCMAKE_INSTALL_LIBDIR=' . BUILD_LIB_PATH . ' ' .
+                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DIconv_IS_BUILT_IN=OFF ' .
                 '-DLIBXML2_WITH_ICONV=ON ' .
@@ -39,7 +42,7 @@ class libxml2 extends LinuxLibraryBase
                 '..'
             )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
-            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+            ->exec('make install');
 
         FileSystem::replaceFileStr(
             BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',

src/SPC/builder/linux/library/nghttp2.php

@@ -1,72 +1,12 @@
 <?php
-/**
- * Copyright (c) 2022 Yun Dou <dixyes@gmail.com>
- *
- * lwmbs is licensed under Mulan PSL v2. You can use this
- * software according to the terms and conditions of the
- * Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at:
- *
- * http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- *
- * See the Mulan PSL v2 for more details.
- */
 
 declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
-
 class nghttp2 extends LinuxLibraryBase
 {
+    use \SPC\builder\unix\library\nghttp2;
+
     public const NAME = 'nghttp2';
-
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
-    public function build(): void
-    {
-        $args = $this->builder->makeAutoconfArgs(static::NAME, [
-            'zlib' => null,
-            'openssl' => null,
-            'libxml2' => null,
-            'libev' => null,
-            'libcares' => null,
-            'libngtcp2' => null,
-            'libnghttp3' => null,
-            'libbpf' => null,
-            'libevent-openssl' => null,
-            'jansson' => null,
-            'jemalloc' => null,
-            'systemd' => null,
-            'cunit' => null,
-        ]);
-
-        [,,$destdir] = SEPARATED_PATH;
-
-        shell()->cd($this->source_dir)
-            ->exec(
-                './configure ' .
-                '--enable-static ' .
-                '--disable-shared ' .
-                "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .
-                '--enable-lib-only ' .
-                '--with-boost=no ' .
-                $args . ' ' .
-                '--prefix='
-            )
-            ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency}")
-            ->exec("make install DESTDIR={$destdir}");
-        $this->patchPkgconfPrefix(['libnghttp2.pc']);
-    }
 }

src/SPC/builder/linux/library/openssl.php

@@ -24,6 +24,7 @@ use SPC\builder\linux\SystemUtil;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 
 class openssl extends LinuxLibraryBase
 {
@@ -41,8 +42,7 @@ class openssl extends LinuxLibraryBase
         $extra = '';
         $ex_lib = '-ldl -pthread';
 
-        $env = "CFLAGS='{$this->builder->arch_c_flags}'";
-        $env .= " CC='" . getenv('CC') . ' -static -idirafter ' . BUILD_INCLUDE_PATH .
+        $env = "CC='" . getenv('CC') . ' -static -idirafter ' . BUILD_INCLUDE_PATH .
             ' -idirafter /usr/include/ ' .
             ' -idirafter /usr/include/' . $this->builder->getOption('arch') . '-linux-gnu/ ' .
             "' ";
@@ -63,7 +63,8 @@ class openssl extends LinuxLibraryBase
         $clang_postfix = SystemUtil::getCCType(getenv('CC')) === 'clang' ? '-clang' : '';
 
         shell()->cd($this->source_dir)
-            ->exec(
+            ->setEnv(['CFLAGS' => $this->getLibExtraCFlags() ?: $this->builder->arch_c_flags, 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()])
+            ->execWithEnv(
                 "{$env} ./Configure no-shared {$extra} " .
                 '--prefix=/ ' .
                 '--libdir=lib ' .
@@ -73,8 +74,20 @@ class openssl extends LinuxLibraryBase
                 "linux-{$this->builder->getOption('arch')}{$clang_postfix}"
             )
             ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
+            ->execWithEnv("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
             ->exec("make install_sw DESTDIR={$destdir}");
         $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']);
+        // patch for openssl 3.3.0+
+        if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc'), 'prefix=')) {
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+        }
+        if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc'), 'prefix=')) {
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+        }
+        if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) {
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+        }
+        FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
+        FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');
     }
 }

src/SPC/builder/linux/library/qdbm.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class qdbm extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\qdbm;
+
+    public const NAME = 'qdbm';
+}

src/SPC/builder/linux/library/tidy.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class tidy extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\tidy;
+
+    public const NAME = 'tidy';
+}

src/SPC/builder/linux/library/unixodbc.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class unixodbc extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\unixodbc;
+
+    public const NAME = 'unixodbc';
+}