add -trimpath

src/SPC/builder/unix/UnixBuilderBase.php

@@ -411,10 +411,17 @@ abstract class UnixBuilderBase extends BuilderBase
         $nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
         $xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
         $frankenphpSourceDir = getenv('FRANKENPHP_SOURCE_PATH') ?: SOURCE_PATH . '/frankenphp';
+        FileSystem::replaceFileStr(
+            $frankenphpSourceDir . '/caddy/php-server.go',
+            'config, _, err := caddycmd.LoadConfig',
+            'config, _, _, err := caddycmd.LoadConfig'
+        );
 
         $xcaddyModules = preg_replace('#--with github.com/dunglas/frankenphp\S*#', '', $xcaddyModules);
         $xcaddyModules = "--with github.com/dunglas/frankenphp={$frankenphpSourceDir} " .
-            "--with github.com/dunglas/frankenphp/caddy={$frankenphpSourceDir}/caddy {$xcaddyModules}";
+            "--with github.com/dunglas/frankenphp/caddy={$frankenphpSourceDir}/caddy " .
+            "--with github.com/caddyserver/caddy/v2=github.com/henderkes/caddy/v2@master " .
+            "{$xcaddyModules}";
         if ($this->getLib('brotli') === null && str_contains($xcaddyModules, '--with github.com/dunglas/caddy-cbrotli')) {
             logger()->warning('caddy-cbrotli module is enabled, but brotli library is not built. Disabling caddy-cbrotli.');
             $xcaddyModules = str_replace('--with github.com/dunglas/caddy-cbrotli', '', $xcaddyModules);
@@ -453,7 +460,7 @@ abstract class UnixBuilderBase extends BuilderBase
             'CGO_ENABLED' => '1',
             'CGO_CFLAGS' => clean_spaces($cflags),
             'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs}",
-            'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
+            'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie -trimpath ' .
                 '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
                 '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
                 "v{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .

src/SPC/store/pkg/GoXcaddy.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\store\pkg;
 
+use InvalidArgumentException;
 use SPC\builder\linux\SystemUtil;
 use SPC\store\Downloader;
 use SPC\store\FileSystem;
@@ -30,10 +31,10 @@ class GoXcaddy extends CustomPackage
     public function fetch(string $name, bool $force = false, ?array $config = null): void
     {
         $pkgroot = PKG_ROOT_PATH;
-        $go_exec = "{$pkgroot}/{$name}/bin/go";
-        $xcaddy_exec = "{$pkgroot}/{$name}/bin/xcaddy";
+        $go_exec = "{$pkgroot}/go-xcaddy/bin/go";
+        $xcaddy_exec = "{$pkgroot}/go-xcaddy/bin/xcaddy";
         if ($force) {
-            FileSystem::removeDir("{$pkgroot}/{$name}");
+            FileSystem::removeDir("{$pkgroot}/go-xcaddy");
         }
         if (file_exists($go_exec) && file_exists($xcaddy_exec)) {
             return;
@@ -41,12 +42,12 @@ class GoXcaddy extends CustomPackage
         $arch = match (explode('-', $name)[2]) {
             'x86_64' => 'amd64',
             'aarch64' => 'arm64',
-            default => throw new \InvalidArgumentException('Unsupported architecture: ' . $name),
+            default => throw new InvalidArgumentException('Unsupported architecture: ' . $name),
         };
         $os = match (explode('-', $name)[3]) {
             'linux' => 'linux',
             'macos' => 'darwin',
-            default => throw new \InvalidArgumentException('Unsupported OS: ' . $name),
+            default => throw new InvalidArgumentException('Unsupported OS: ' . $name),
         };
         [$go_version] = explode("\n", Downloader::curlExec('https://go.dev/VERSION?m=text'));
         $config = [
@@ -78,6 +79,18 @@ class GoXcaddy extends CustomPackage
         }
 
         // install xcaddy without using musl tools, xcaddy build requires dynamic linking
+        // Clone the fork and install from local clone to avoid module path conflicts
+        $xcaddyClonePath = "{$pkgroot}/go/src/github.com/henderkes/xcaddy";
+        if (!is_dir($xcaddyClonePath)) {
+            shell()
+                ->appendEnv([
+                    'PATH' => "{$pkgroot}/go-xcaddy/bin:" . $sanitizedPath,
+                ])
+                ->exec("git clone https://github.com/henderkes/xcaddy {$xcaddyClonePath}");
+        } else {
+            shell()->cd($xcaddyClonePath)->exec('git fetch && git pull');
+        }
+
         shell()
             ->appendEnv([
                 'PATH' => "{$pkgroot}/go-xcaddy/bin:" . $sanitizedPath,
@@ -85,7 +98,8 @@ class GoXcaddy extends CustomPackage
                 'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
                 'GOPATH' => "{$pkgroot}/go",
             ])
-            ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
+            ->cd($xcaddyClonePath)
+            ->exec('CC=cc go install ./cmd/xcaddy');
     }
 
     public static function getEnvironment(): array