Add ext-imap

config/pkg/ext/ext-imap.yml

@@ -0,0 +1,15 @@
+ext-imap:
+  type: php-extension
+  artifact:
+    source:
+      type: pecl
+      name: imap
+    metadata:
+      license-files: [LICENSE]
+      license: PHP-3.01
+  depends:
+    - imap
+  suggests:
+    - ext-openssl
+  php-extension:
+    arg-type: custom

src/Package/Extension/imap.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Extension;
+
+use Package\Target\php;
+use StaticPHP\Attribute\Package\BeforeStage;
+use StaticPHP\Attribute\Package\CustomPhpConfigureArg;
+use StaticPHP\Attribute\Package\Extension;
+use StaticPHP\Attribute\Package\Validate;
+use StaticPHP\Exception\WrongUsageException;
+use StaticPHP\Package\PackageBuilder;
+use StaticPHP\Package\PackageInstaller;
+use StaticPHP\Package\PhpExtensionPackage;
+use StaticPHP\Util\FileSystem;
+
+#[Extension('imap')]
+class imap extends PhpExtensionPackage
+{
+    #[Validate]
+    public function validate(PackageBuilder $builder): void
+    {
+        if ($builder->getOption('enable-zts')) {
+            throw new WrongUsageException('ext-imap is not thread safe, do not build it with ZTS builds');
+        }
+    }
+
+    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-imap')]
+    public function patchBeforeBuildconf(PackageInstaller $installer): void
+    {
+        if ($installer->getLibraryPackage('openssl')) {
+            // sometimes imap with openssl does not contain zlib (required by openssl)
+            // we need to add it manually
+            FileSystem::replaceFileStr("{$this->getSourceDir()}/config.m4", 'TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD"', 'TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD -lz"');
+        }
+        // c-client is built with PASSWDTYPE=nul so libcrypt is not referenced.
+        FileSystem::replaceFileStr(
+            "{$this->getSourceDir()}/config.m4",
+            "    PHP_CHECK_LIBRARY(crypt, crypt,\n    [\n      PHP_ADD_LIBRARY(crypt,, IMAP_SHARED_LIBADD)\n      AC_DEFINE(HAVE_LIBCRYPT,1,[ ])\n    ])",
+            '    dnl Skipped: crypt check not needed (c-client built with PASSWDTYPE=nul)'
+        );
+    }
+
+    #[CustomPhpConfigureArg('Darwin')]
+    #[CustomPhpConfigureArg('Linux')]
+    public function getUnixConfigureArg(PackageInstaller $installer, PackageBuilder $builder): string
+    {
+        $arg = "--with-imap={$builder->getBuildRootPath()}";
+        if (($ssl = $installer->getLibraryPackage('openssl')) !== null) {
+            $arg .= " --with-imap-ssl={$ssl->getBuildRootPath()}";
+        }
+        return $arg;
+    }
+}

src/Package/Library/imap.php

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace Package\Library;
 
-use Package\Target\php;
-use StaticPHP\Attribute\Package\AfterStage;
 use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Attribute\Package\PatchBeforeBuild;
@@ -19,15 +17,6 @@ use StaticPHP\Util\SourcePatcher;
 #[Library('imap')]
 class imap
 {
-    #[AfterStage('php', [php::class, 'patchUnixEmbedScripts'], 'imap')]
-    #[PatchDescription('Fix missing -lcrypt in php-config libs on glibc systems')]
-    public function afterPatchScripts(): void
-    {
-        if (SystemTarget::getLibc() === 'glibc') {
-            FileSystem::replaceFileRegex(BUILD_BIN_PATH . '/php-config', '/^libs="(.*)"$/m', 'libs="$1 -lcrypt"');
-        }
-    }
-
     #[PatchBeforeBuild]
     #[PatchDescription('Patch imap build system for Linux and macOS compatibility')]
     public function patchBeforeBuild(LibraryPackage $lib): void
@@ -66,14 +55,24 @@ class imap
         }
         $libcVer = SystemTarget::getLibcVersion();
         $extraLibs = $libcVer && version_compare($libcVer, '2.17', '<=') ? 'EXTRALDFLAGS="-ldl -lrt -lpthread"' : '';
-        shell()->cd($lib->getSourceDir())
+        try {
-            ->exec('make clean')
+            shell()->cd($lib->getSourceDir())
-            ->exec('touch ip6')
+                ->exec('make clean')
-            ->exec('chmod +x tools/an')
+                ->exec('touch ip6')
-            ->exec('chmod +x tools/ua')
+                ->exec('chmod +x tools/an')
-            ->exec('chmod +x src/osdep/unix/drivers')
+                ->exec('chmod +x tools/ua')
-            ->exec('chmod +x src/osdep/unix/mkauths')
+                ->exec('chmod +x src/osdep/unix/drivers')
-            ->exec("yes | make slx {$ssl_options} EXTRACFLAGS='-fPIC -Wno-implicit-function-declaration -Wno-incompatible-function-pointer-types' {$extraLibs}");
+                ->exec('chmod +x src/osdep/unix/mkauths')
+                // PASSWDTYPE=nul avoids any crypt() symbol reference in c-client.a;
+                // zig-cc 0.15+ uses paths_first strategy and cannot find libcrypt outside of buildroot.
+                ->exec("yes | make slx {$ssl_options} PASSWDTYPE=nul EXTRACFLAGS='-fPIC -Wno-implicit-function-declaration -Wno-incompatible-function-pointer-types' {$extraLibs}");
+        } catch (\Throwable $e) {
+            // slx target also builds bundled tools (mtest, etc.) which may fail to link -lcrypt dynamically
+            // (e.g. with zig-cc). We only need c-client.a, so tolerate the failure if it was built.
+            if (!file_exists("{$lib->getSourceDir()}/c-client/c-client.a")) {
+                throw $e;
+            }
+        }
         try {
             shell()
                 ->exec("cp -rf {$lib->getSourceDir()}/c-client/c-client.a {$lib->getLibDir()}/libc-client.a")
@@ -94,16 +93,24 @@ class imap
             $ssl_options = 'SSLTYPE=none';
         }
         $out = shell()->execWithResult('echo "-include $(xcrun --show-sdk-path)/usr/include/poll.h -include $(xcrun --show-sdk-path)/usr/include/time.h -include $(xcrun --show-sdk-path)/usr/include/utime.h"')[1][0];
-        shell()->cd($lib->getSourceDir())
+        try {
-            ->exec('make clean')
+            shell()->cd($lib->getSourceDir())
-            ->exec('touch ip6')
+                ->exec('make clean')
-            ->exec('chmod +x tools/an')
+                ->exec('touch ip6')
-            ->exec('chmod +x tools/ua')
+                ->exec('chmod +x tools/an')
-            ->exec('chmod +x src/osdep/unix/drivers')
+                ->exec('chmod +x tools/ua')
-            ->exec('chmod +x src/osdep/unix/mkauths')
+                ->exec('chmod +x src/osdep/unix/drivers')
-            ->exec(
+                ->exec('chmod +x src/osdep/unix/mkauths')
-                "echo y | make osx {$ssl_options} EXTRACFLAGS='-Wno-implicit-function-declaration -Wno-incompatible-function-pointer-types {$out}'"
+                ->exec(
-            );
+                    "echo y | make osx {$ssl_options} EXTRACFLAGS='-Wno-implicit-function-declaration -Wno-incompatible-function-pointer-types {$out}'"
+                );
+        } catch (\Throwable $e) {
+            // osx target also builds bundled tools (mtest, etc.) which may fail to link.
+            // We only need c-client.a, so tolerate the failure if it was built.
+            if (!file_exists("{$lib->getSourceDir()}/c-client/c-client.a")) {
+                throw $e;
+            }
+        }
         try {
             shell()
                 ->exec("cp -rf {$lib->getSourceDir()}/c-client/c-client.a {$lib->getLibDir()}/libc-client.a")

src/StaticPHP/Util/SPCConfigUtil.php

@@ -389,7 +389,9 @@ class SPCConfigUtil
         }
 
         if (in_array('imap', $packages) && SystemTarget::getTargetOS() === 'Linux' && SystemTarget::getLibc() === 'glibc') {
-            $lib_names[] = '-lcrypt';
+            if (file_exists(BUILD_LIB_PATH . '/libcrypt.a')) {
+                $lib_names[] = '-lcrypt';
+            }
         }
         if (!$use_short_libs) {
             $lib_names = array_map(fn ($l) => $this->getFullLibName($l), $lib_names);