Add extension maxminddb support for macOS and Linux (#975)

config/ext.json

@@ -358,6 +358,18 @@
             "liblz4"
         ]
     },
+    "maxminddb": {
+        "support": {
+            "BSD": "wip",
+            "Windows": "wip"
+        },
+        "type": "external",
+        "source": "ext-maxminddb",
+        "arg-type": "with",
+        "lib-depends": [
+            "libmaxminddb"
+        ]
+    },
     "mbregex": {
         "type": "builtin",
         "arg-type": "custom",

config/lib.json

@@ -96,20 +96,7 @@
             "libssh2",
             "nghttp2"
         ],
-        "lib-suggests-linux": [
-            "libssh2",
-            "brotli",
-            "nghttp2",
-            "nghttp3",
-            "ngtcp2",
-            "zstd",
-            "libcares",
-            "ldap",
-            "krb5",
-            "idn2",
-            "psl"
-        ],
-        "lib-suggests-macos": [
+        "lib-suggests-unix": [
             "libssh2",
             "brotli",
             "nghttp2",
@@ -119,7 +106,7 @@
             "libcares",
             "ldap",
             "idn2",
-            "psl"
+            "krb5"
         ],
         "lib-suggests-windows": [
             "brotli",
@@ -259,8 +246,8 @@
         ],
         "lib-suggests-unix": [
             "libiconv",
-            "libunistring",
-            "gettext"
+            "gettext",
+            "libunistring"
         ],
         "lib-depends-macos": [
             "libiconv",
@@ -329,6 +316,9 @@
         "lib-suggests": [
             "ldap",
             "libedit"
+        ],
+        "frameworks": [
+            "Kerberos"
         ]
     },
     "ldap": {
@@ -516,6 +506,16 @@
             "liblz4.a"
         ]
     },
+    "libmaxminddb": {
+        "source": "libmaxminddb",
+        "static-libs-unix": [
+            "libmaxminddb.a"
+        ],
+        "headers": [
+            "maxminddb.h",
+            "maxminddb_config.h"
+        ]
+    },
     "libmemcached": {
         "source": "libmemcached",
         "cpp-library": true,
@@ -624,7 +624,7 @@
             "libunistring.a"
         ],
         "headers": [
-            "unistring.h",
+            "unistr.h",
             "unistring/"
         ]
     },
@@ -892,18 +892,6 @@
             "libpgcommon.lib"
         ]
     },
-    "psl": {
-        "source": "libpsl",
-        "pkg-configs": [
-            "libpsl"
-        ],
-        "headers": [
-            "libpsl.h"
-        ],
-        "lib-depends": [
-            "idn2"
-        ]
-    },
     "pthreads4w": {
         "source": "pthreads4w",
         "static-libs-windows": [

config/source.json

@@ -184,6 +184,15 @@
             ]
         }
     },
+    "ext-maxminddb": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/maxminddb",
+        "filename": "ext-maxminddb.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "ext-memcache": {
         "type": "url",
         "url": "https://pecl.php.net/get/memcache",
@@ -641,6 +650,16 @@
             "path": "LICENSE"
         }
     },
+    "libmaxminddb": {
+        "type": "ghrel",
+        "repo": "maxmind/libmaxminddb",
+        "match": "libmaxminddb-.+\\.tar\\.gz",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "libmemcached": {
         "type": "ghtagtar",
         "repo": "awesomized/libmemcached",
@@ -660,16 +679,6 @@
             "path": "LICENSE"
         }
     },
-    "libpsl": {
-        "type": "ghrel",
-        "repo": "rockdaboot/libpsl",
-        "match": "libpsl.+\\.tar\\.gz",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
     "librabbitmq": {
         "type": "git",
         "url": "https://github.com/alanxz/rabbitmq-c.git",

src/SPC/ConsoleApplication.php

@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
  */
 final class ConsoleApplication extends Application
 {
-    public const string VERSION = '2.7.7';
+    public const string VERSION = '2.7.8';
 
     public function __construct()
     {

src/SPC/builder/extension/maxminddb.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('maxminddb')]
+class maxminddb extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        if (!is_link(SOURCE_PATH . '/php-src/ext/maxminddb')) {
+            $original = $this->source_dir;
+            if (PHP_OS_FAMILY === 'Windows') {
+                f_passthru('cd ' . SOURCE_PATH . '/php-src/ext && mklink /D maxminddb ' . $original . '\ext');
+            } else {
+                f_passthru('cd ' . SOURCE_PATH . '/php-src/ext && ln -s ' . $original . '/ext maxminddb');
+            }
+            return true;
+        }
+        return false;
+    }
+}

src/SPC/builder/extension/trader.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('trader')]
+class trader extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/trader/config.m4', 'PHP_TA', 'PHP_TRADER');
+        return true;
+    }
+}

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

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

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

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

src/SPC/builder/macos/library/krb5.php

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

src/SPC/builder/macos/library/libmaxminddb.php

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

src/SPC/builder/macos/library/psl.php

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

src/SPC/builder/unix/library/krb5.php

@@ -11,22 +11,36 @@ trait krb5
 {
     protected function build(): void
     {
+        $origin_source_dir = $this->source_dir;
         $this->source_dir .= '/src';
         shell()->cd($this->source_dir)->exec('autoreconf -if');
         $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies(true));
         $spc = new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]);
         $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
+        $extraEnv = [
+            'CFLAGS' => '-fcommon',
+            'LIBS' => $config['libs'],
+        ];
+        if (getenv('SPC_LD_LIBRARY_PATH') && getenv('SPC_LIBRARY_PATH')) {
+            $extraEnv = [...$extraEnv, ...[
+                'LD_LIBRARY_PATH' => getenv('SPC_LD_LIBRARY_PATH'),
+                'LIBRARY_PATH' => getenv('SPC_LIBRARY_PATH'),
+            ]];
+        }
+        $args = [
+            '--disable-nls',
+            '--disable-rpath',
+            '--without-system-verto',
+        ];
+        if (PHP_OS_FAMILY === 'Darwin') {
+            $extraEnv['LDFLAGS'] = '-framework Kerberos';
+            $args[] = 'ac_cv_func_secure_getenv=no';
+        }
         UnixAutoconfExecutor::create($this)
-            ->appendEnv([
-                'LIBS' => $config['libs'],
-                'LDFLAGS' => '-Wl,--allow-multiple-definition',
-            ])
+            ->appendEnv($extraEnv)
             ->optionalLib('ldap', '--with-ldap', '--without-ldap')
             ->optionalLib('libedit', '--with-libedit', '--without-libedit')
-            ->configure(
-                '--disable-nls',
-                '--disable-rpath',
-            )
+            ->configure(...$args)
             ->make();
         $this->patchPkgconfPrefix([
             'krb5-gssapi.pc',
@@ -38,5 +52,6 @@ trait krb5
             'mit-krb5.pc',
             'gssrpc.pc',
         ]);
+        $this->source_dir = $origin_source_dir;
     }
 }

src/SPC/builder/unix/library/libmaxminddb.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixCMakeExecutor;
+
+trait libmaxminddb
+{
+    protected function build(): void
+    {
+        UnixCMakeExecutor::create($this)
+            ->addConfigureArgs(
+                '-DBUILD_TESTING=OFF',
+                '-DMAXMINDDB_BUILD_BINARIES=OFF',
+            )
+            ->build();
+    }
+}

src/SPC/builder/unix/library/psl.php

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\util\executor\UnixAutoconfExecutor;
-
-trait psl
-{
-    protected function build(): void
-    {
-        UnixAutoconfExecutor::create($this)
-            ->optionalLib('idn2', ...ac_with_args('libidn2', true))
-            ->configure('--disable-nls')
-            ->make();
-        $this->patchPkgconfPrefix(['libpsl.pc']);
-        $this->patchLaDependencyPrefix();
-    }
-}

src/SPC/doctor/item/LinuxMuslCheck.php

@@ -22,7 +22,7 @@ class LinuxMuslCheck
     public static function optionalCheck(): bool
     {
         return getenv('SPC_TOOLCHAIN') === MuslToolchain::class ||
-            (getenv('SPC_TOOLCHAIN') === ZigToolchain::class && !SystemUtil::isMuslDist());
+            (getenv('SPC_TOOLCHAIN') === ZigToolchain::class && !SystemUtil::isMuslDist() && !str_contains((string) getenv('SPC_TARGET'), 'gnu'));
     }
 
     /** @noinspection PhpUnused */

src/SPC/store/source/PhpSource.php

@@ -15,9 +15,7 @@ class PhpSource extends CustomSourceBase
     public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void
     {
         $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
-        if ($major === '8.5') {
-            Downloader::downloadSource('php-src', ['type' => 'url', 'url' => 'https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz'], $force);
-        } elseif ($major === 'git') {
+        if ($major === 'git') {
             Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
         } else {
             Downloader::downloadSource('php-src', $this->getLatestPHPInfo($major), $force);

src/globals/test-extensions.php

@@ -13,11 +13,11 @@ declare(strict_types=1);
 
 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
-    // '8.1',
-    // '8.2',
-    // '8.3',
+    '8.1',
+    '8.2',
+    '8.3',
     '8.4',
-    // '8.5',
+    '8.5',
     // 'git',
 ];
 
@@ -35,7 +35,7 @@ $test_os = [
 ];
 
 // whether enable thread safe
-$zts = true;
+$zts = false;
 
 $no_strip = false;
 
@@ -50,7 +50,7 @@ $prefer_pre_built = false;
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'curl',
+    'Linux', 'Darwin' => 'maxminddb',
     'Windows' => 'bcmath',
 };
 
@@ -62,7 +62,7 @@ $shared_extensions = match (PHP_OS_FAMILY) {
 };
 
 // If you want to test lib-suggests for all extensions and libraries, set it to true.
-$with_suggested_libs = true;
+$with_suggested_libs = false;
 
 // If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
 $with_libs = match (PHP_OS_FAMILY) {
@@ -74,7 +74,7 @@ $with_libs = match (PHP_OS_FAMILY) {
 // You can use `common`, `bulk`, `minimal` or `none`.
 // note: combination is only available for *nix platform. Windows must use `none` combination
 $base_combination = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'none',
+    'Linux', 'Darwin' => 'minimal',
     'Windows' => 'none',
 };