diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..85ddd1b6df69d0e342203033b0e9ba139643bfc9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.tgz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..6d557846ed7f744fb8a3cabf138da6364655eb6c --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/pie diff --git a/pie-1.2.1-8288fd6.tgz b/pie-1.2.1-8288fd6.tgz deleted file mode 100644 index 4075ac77d4cd08694b2f1f3649924608a52d7608..0000000000000000000000000000000000000000 Binary files a/pie-1.2.1-8288fd6.tgz and /dev/null differ diff --git a/pie-1.3.1-2ebd9dc.tgz b/pie-1.3.1-2ebd9dc.tgz new file mode 100644 index 0000000000000000000000000000000000000000..1cc91f24d1d33c4846796d07e54050429ab19c4a --- /dev/null +++ b/pie-1.3.1-2ebd9dc.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ece55a9939857d139495909772d0109893285c1a1f827d1dbbf2bbed0fb6b7e +size 3895862 diff --git a/pie-bash-completion b/pie-bash-completion index f189bdc3884121d26be4312598b2c67f452efa0f..837f5183d4a35350772dfdc23f5dcbc225f5bcb2 100644 --- a/pie-bash-completion +++ b/pie-bash-completion @@ -37,7 +37,7 @@ _sf_pie() { local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-a1") for w in ${words[@]}; do - w=$(printf -- '%b' "$w") + w="${w//\\\\/\\}" # remove quotes from typed values quote="${w:0:1}" if [ "$quote" == \' ]; then diff --git a/pie-noxdg.patch b/pie-noxdg.patch index e0a2703e8f38c037db924819f5e6ac798a7e30cc..1ee3f16aa45e276dbf896415b7043b09fbd050d2 100644 --- a/pie-noxdg.patch +++ b/pie-noxdg.patch @@ -1,7 +1,7 @@ diff -up ./src/Platform.php.noxdg ./src/Platform.php ---- ./src/Platform.php.noxdg 2025-08-29 11:49:32.251927241 +0200 -+++ ./src/Platform.php 2025-08-29 11:50:18.737674445 +0200 -@@ -37,6 +37,10 @@ class Platform +--- ./src/Platform.php.noxdg 2025-11-04 07:41:36.891311937 +0100 ++++ ./src/Platform.php 2025-11-04 07:42:29.282702463 +0100 +@@ -35,6 +35,10 @@ class Platform private static function useXdg(): bool { @@ -10,11 +10,11 @@ diff -up ./src/Platform.php.noxdg ./src/Platform.php + return false; + foreach (array_keys($_SERVER) as $key) { - /** @psalm-suppress RedundantCastGivenDocblockType */ if (strpos((string) $key, 'XDG_') === 0) { + return true; diff -up ./vendor/composer/composer/src/Composer/Factory.php.noxdg ./vendor/composer/composer/src/Composer/Factory.php ---- ./vendor/composer/composer/src/Composer/Factory.php.noxdg 2025-08-21 11:29:39.000000000 +0200 -+++ ./vendor/composer/composer/src/Composer/Factory.php 2025-08-29 11:49:32.251858889 +0200 +--- ./vendor/composer/composer/src/Composer/Factory.php.noxdg 2025-09-19 13:41:59.000000000 +0200 ++++ ./vendor/composer/composer/src/Composer/Factory.php 2025-11-04 07:41:36.891444253 +0100 @@ -707,6 +707,10 @@ class Factory private static function useXdg(): bool diff --git a/pie-rpm.patch b/pie-rpm.patch index 8203644e52c26c8b7de3e4509ac362970118843c..9d4a8d02c92ccbfd8c3946ac1f60ab512ed694b4 100644 --- a/pie-rpm.patch +++ b/pie-rpm.patch @@ -1,34 +1,42 @@ diff -up ./bin/pie.rpm ./bin/pie ---- ./bin/pie.rpm 2025-08-29 11:47:51.021892397 +0200 -+++ ./bin/pie 2025-08-29 11:48:46.211987817 +0200 -@@ -27,7 +27,7 @@ use Symfony\Component\EventDispatcher\Ev - error_reporting(error_reporting() & ~E_DEPRECATED); +--- ./bin/pie.rpm 2025-11-04 07:31:47.045861211 +0100 ++++ ./bin/pie 2025-11-04 07:34:03.568067299 +0100 +@@ -28,13 +28,14 @@ use function error_reporting; - /** @psalm-suppress UnresolvableInclude */ + use const E_DEPRECATED; + +-require_once __DIR__ . '/../src/Util/PieVersion.php'; ++require_once '/usr/share/pie/src/Util/PieVersion.php'; ++ + if (PieVersion::isPharBuild()) { + error_reporting(error_reporting() & ~E_DEPRECATED); + } + + // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps -include $_composer_autoload_path ?? __DIR__ . '/../vendor/autoload.php'; +include $_composer_autoload_path ?? '/usr/share/pie/vendor/autoload.php'; $container = Container::factory(); diff -up ./src/Command/SelfUpdateCommand.php.rpm ./src/Command/SelfUpdateCommand.php ---- ./src/Command/SelfUpdateCommand.php.rpm 2025-08-29 11:47:45.000000000 +0200 -+++ ./src/Command/SelfUpdateCommand.php 2025-08-29 11:47:51.022050330 +0200 -@@ -65,6 +65,7 @@ final class SelfUpdateCommand extends Co +--- ./src/Command/SelfUpdateCommand.php.rpm 2025-11-04 07:31:47.045962420 +0100 ++++ ./src/Command/SelfUpdateCommand.php 2025-11-04 07:34:56.202111078 +0100 +@@ -85,6 +85,7 @@ final class SelfUpdateCommand extends Co { if (! PieVersion::isPharBuild()) { - $output->writeln('Aborting! You are not running a PHAR, cannot self-update.'); -+ $output->writeln('Update the pie RPM using the package manager (dnf).'); + $this->io->writeError('Aborting! You are not running a PHAR, cannot self-update.'); ++ $this->io->writeError('Update the pie RPM using the package manager (dnf).'); return Command::FAILURE; } diff -up ./src/Command/SelfVerifyCommand.php.rpm ./src/Command/SelfVerifyCommand.php ---- ./src/Command/SelfVerifyCommand.php.rpm 2025-08-29 11:47:45.000000000 +0200 -+++ ./src/Command/SelfVerifyCommand.php 2025-08-29 11:47:51.022201509 +0200 -@@ -51,6 +51,7 @@ final class SelfVerifyCommand extends Co +--- ./src/Command/SelfVerifyCommand.php.rpm 2025-11-04 07:31:47.046045232 +0100 ++++ ./src/Command/SelfVerifyCommand.php 2025-11-04 07:35:34.439595840 +0100 +@@ -43,6 +43,7 @@ final class SelfVerifyCommand extends Co { if (! PieVersion::isPharBuild()) { - $output->writeln('Aborting! You are not running a PHAR, cannot self-verify.'); -+ $output->writeln('Verify the pie RPM using the package manager (rpm).'); + $this->io->writeError('Aborting! You are not running a PHAR, cannot self-verify.'); ++ $this->io->writeError('Verify the pie RPM using the package manager (rpm).'); return Command::FAILURE; } diff --git a/pie.spec b/pie.spec index e8348a8f14fb2564e3046e2dbdd586ca12ed5273..af5ef0e84f8b46450cc5e91509ab58008132aae3 100644 --- a/pie.spec +++ b/pie.spec @@ -1,13 +1,13 @@ %undefine __brp_mangle_shebangs -%global gh_commit 8288fd6ed643c9fa8422a7a9b49cecd60bf444be +%global gh_commit 2ebd9dcb458a1e401a5341caa218a07c4971e6cd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20241003 %global gh_branch main %global gh_owner php %global gh_project pie -%global upstream_version 1.2.1 +%global upstream_version 1.3.1 #global upstream_prever RC1 Name: pie @@ -15,7 +15,9 @@ Version: %{upstream_version} Release: 1 Summary: PHP Installer for Extensions -# SPDX: pie is BSD-3-Clause, all dependencies are MIT +# SPDX: pie is BSD-3-Clause +# thephpf/attestation is BSD-3-Clause +# others dependencies are MIT License: BSD-3-Clause AND MIT URL: https://github.com/php/pie # tarball generated by makesrc.sh @@ -73,9 +75,6 @@ find . \( -name \*.rpm -o -name \*noxdg -o -name \*nocacert \) -delete -print rm vendor/composer/ca-bundle/res/cacert.pem -: Set version -sed -e 's/@pie_version@/%{upstream_version}%{?upstream_prever}/' -i bin/pie - %build # Nothing @@ -114,5 +113,8 @@ done %{bash_completions_dir}/* %changelog +* Sun Nov 30 2025 Funda Wang - 1.3.1-1 +- update to 1.3.1 + * Wed Sep 24 2025 Funda Wang - 1.2.1-1 - init package