add extra libs for curl (psl, krb5, unistring, idn2) (#968)

henderkes · web-flow · commit 28ae4242a62f · 2025-11-21T15:05:40.000+01:00
diff --git a/composer.lock b/composer.lock
diff --git a/config/lib.json b/config/lib.json
@@ -104,7 +104,9 @@
             "ngtcp2",
             "zstd",
             "libcares",
-            "ldap"
+            "ldap",
+            "idn2",
+            "krb5"
         ],
         "lib-suggests-windows": [
             "brotli",
@@ -234,6 +236,24 @@
             "unicode"
         ]
     },
+    "idn2": {
+        "source": "libidn2",
+        "pkg-configs": [
+            "libidn2"
+        ],
+        "headers": [
+            "idn2.h"
+        ],
+        "lib-suggests-unix": [
+            "libiconv",
+            "gettext",
+            "libunistring"
+        ],
+        "lib-depends-macos": [
+            "libiconv",
+            "gettext"
+        ]
+    },
     "imagemagick": {
         "source": "imagemagick",
         "cpp-library": true,
@@ -281,6 +301,26 @@
             "jbig_ar.h"
         ]
     },
+    "krb5": {
+        "source": "krb5",
+        "pkg-configs": [
+            "krb5-gssapi"
+        ],
+        "headers": [
+            "krb5.h",
+            "gssapi/gssapi.h"
+        ],
+        "lib-depends": [
+            "openssl"
+        ],
+        "lib-suggests": [
+            "ldap",
+            "libedit"
+        ],
+        "frameworks": [
+            "Kerberos"
+        ]
+    },
     "ldap": {
         "source": "ldap",
         "pkg-configs": [
@@ -568,6 +608,16 @@
             "zstd"
         ]
     },
+    "libunistring": {
+        "source": "libunistring",
+        "static-libs-unix": [
+            "libunistring.a"
+        ],
+        "headers": [
+            "unistr.h",
+            "unistring/"
+        ]
+    },
     "liburing": {
         "source": "liburing",
         "pkg-configs": [
@@ -974,24 +1024,5 @@
             "zstd.h",
             "zstd_errors.h"
         ]
-    },
-    "liburing": {
-        "source": "liburing",
-        "pkg-configs": [
-            "liburing",
-            "liburing-ffi"
-        ],
-        "static-libs-linux": [
-            "liburing.a",
-            "liburing-ffi.a"
-        ],
-        "headers-linux": [
-            "liburing/",
-            "liburing.h"
-        ]
-    },
-    "frankenphp": {
-        "source": "frankenphp",
-        "type": "target"
     }
 }
diff --git a/config/source.json b/config/source.json
@@ -305,7 +305,6 @@
         "type": "ghtar",
         "repo": "php/frankenphp",
         "prefer-stable": true,
-        "provide-pre-built": false,
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -373,16 +372,6 @@
             "path": "LICENSE"
         }
     },
-    "frankenphp": {
-        "type": "ghtar",
-        "repo": "php/frankenphp",
-        "prefer-stable":  true,
-        "provide-pre-build": false,
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "icu-static-win": {
         "type": "url",
         "url": "https://dl.static-php.dev/static-php-cli/deps/icu-static-windows-x64/icu-static-windows-x64.zip",
@@ -441,6 +430,16 @@
             "path": "COPYING"
         }
     },
+    "krb5": {
+        "type": "ghtagtar",
+        "repo": "krb5/krb5",
+        "match": "krb5.+-final",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "NOTICE"
+        }
+    },
     "ldap": {
         "type": "filelist",
         "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/",
@@ -599,6 +598,15 @@
             "path": "source/COPYING"
         }
     },
+    "libidn2": {
+        "type": "filelist",
+        "url": "https://ftp.gnu.org/gnu/libidn/",
+        "regex": "/href=\"(?<file>libidn2-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "license": {
+            "type": "file",
+            "path": "COPYING.LESSERv3"
+        }
+    },
     "libjpeg": {
         "type": "ghtar",
         "repo": "libjpeg-turbo/libjpeg-turbo",
@@ -700,6 +708,16 @@
             "path": "LICENSE.md"
         }
     },
+    "libunistring": {
+        "type": "filelist",
+        "url": "https://ftp.gnu.org/gnu/libunistring/",
+        "regex": "/href=\"(?<file>libunistring-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "provide-pre-built": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING.LIB"
+        }
+    },
     "liburing": {
         "type": "ghtar",
         "repo": "axboe/liburing",
@@ -713,6 +731,7 @@
         "type": "git",
         "url": "https://github.com/static-php/libuuid.git",
         "rev": "master",
+        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "COPYING"
diff --git a/src/SPC/builder/linux/library/idn2.php b/src/SPC/builder/linux/library/idn2.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class idn2 extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\idn2;
+
+    public const NAME = 'idn2';
+}
diff --git a/src/SPC/builder/linux/library/krb5.php b/src/SPC/builder/linux/library/krb5.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class krb5 extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\krb5;
+
+    public const NAME = 'krb5';
+}
diff --git a/src/SPC/builder/linux/library/libunistring.php b/src/SPC/builder/linux/library/libunistring.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libunistring extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libunistring;
+
+    public const NAME = 'libunistring';
+}
diff --git a/src/SPC/builder/macos/library/idn2.php b/src/SPC/builder/macos/library/idn2.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class idn2 extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\idn2;
+
+    public const NAME = 'idn2';
+}
diff --git a/src/SPC/builder/macos/library/krb5.php b/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';
+}
diff --git a/src/SPC/builder/macos/library/libunistring.php b/src/SPC/builder/macos/library/libunistring.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libunistring extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libunistring;
+
+    public const NAME = 'libunistring';
+}
diff --git a/src/SPC/builder/unix/library/curl.php b/src/SPC/builder/unix/library/curl.php
@@ -23,6 +23,8 @@ protected function build(): void
             ->optionalLib('zstd', ...cmake_boolean_args('CURL_ZSTD'))
             ->optionalLib('idn2', ...cmake_boolean_args('USE_LIBIDN2'))
             ->optionalLib('psl', ...cmake_boolean_args('CURL_USE_LIBPSL'))
+            ->optionalLib('krb5', ...cmake_boolean_args('CURL_USE_GSSAPI'))
+            ->optionalLib('idn2', ...cmake_boolean_args('CURL_USE_IDN2'))
             ->optionalLib('libcares', '-DENABLE_ARES=ON')
             ->addConfigureArgs(
                 '-DBUILD_CURL_EXE=OFF',
diff --git a/src/SPC/builder/unix/library/idn2.php b/src/SPC/builder/unix/library/idn2.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixAutoconfExecutor;
+
+trait idn2
+{
+    protected function build(): void
+    {
+        UnixAutoconfExecutor::create($this)
+            ->configure(
+                '--disable-nls',
+                '--disable-doc',
+                '--enable-year2038',
+                '--disable-rpath'
+            )
+            ->optionalLib('libiconv', "--with-libiconv-prefix={$this->getBuildRootPath()}")
+            ->optionalLib('libunistring', "--with-libunistring-prefix={$this->getBuildRootPath()}")
+            ->optionalLib('gettext', "--with-libnintl-prefix={$this->getBuildRootPath()}")
+            ->make();
+        $this->patchPkgconfPrefix(['libidn2.pc']);
+        $this->patchLaDependencyPrefix();
+    }
+}
diff --git a/src/SPC/builder/unix/library/krb5.php b/src/SPC/builder/unix/library/krb5.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixAutoconfExecutor;
+use SPC\util\SPCConfigUtil;
+
+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($extraEnv)
+            ->optionalLib('ldap', '--with-ldap', '--without-ldap')
+            ->optionalLib('libedit', '--with-libedit', '--without-libedit')
+            ->configure(...$args)
+            ->make();
+        $this->patchPkgconfPrefix([
+            'krb5-gssapi.pc',
+            'krb5.pc',
+            'kadm-server.pc',
+            'kadm-client.pc',
+            'kdb.pc',
+            'mit-krb5-gssapi.pc',
+            'mit-krb5.pc',
+            'gssrpc.pc',
+        ]);
+        $this->source_dir = $origin_source_dir;
+    }
+}
diff --git a/src/SPC/builder/unix/library/libunistring.php b/src/SPC/builder/unix/library/libunistring.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixAutoconfExecutor;
+
+trait libunistring
+{
+    protected function build(): void
+    {
+        UnixAutoconfExecutor::create($this)
+            ->configure('--disable-nls')
+            ->make();
+        $this->patchLaDependencyPrefix();
+    }
+}
diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php
