update to 1.2.1

supplements php-pear (cherry picked from commit dbc3f36cfa)
v1.2.0
2025-09-10 14:43:21 +02:00 · 2025-09-03 06:31:13 +02:00 · 2025-08-28 09:24:51 +02:00 · 2025-06-18 10:47:24 +02:00 · 2025-05-05 07:58:41 +02:00 · 2025-04-15 09:32:30 +02:00
6 changed files with 31 additions and 63 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,7 +11,3 @@
 /pie-1.1.0-28b3e0d.tgz
 /pie-1.2.0-4b20e77.tgz
 /pie-1.2.1-8288fd6.tgz
-/pie-1.3.0-3a28242.tgz
-/pie-1.3.1-2ebd9dc.tgz
-/pie-1.3.4-d41c81a.tgz
-/pie-1.3.5-90d6d18.tgz
--- a/2
+++ b/2
@ -37,7 +37,7 @@ _sf_pie() {

    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-a1")
    for w in ${words[@]}; do
-        w="${w//\\\\/\\}"
+        w=$(printf -- '%b' "$w")
        # remove quotes from typed values
        quote="${w:0:1}"
        if [ "$quote" == \' ]; then
--- 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-11-04 07:41:36.891311937 +0100
-+++ ./src/Platform.php	2025-11-04 07:42:29.282702463 +0100
-@@ -35,6 +35,10 @@ class Platform
+--- ./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
 
     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-09-19 13:41:59.000000000 +0200
-+++ ./vendor/composer/composer/src/Composer/Factory.php	2025-11-04 07:41:36.891444253 +0100
+--- ./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
@@ -707,6 +707,10 @@ class Factory
 
     private static function useXdg(): bool
--- a/pie-rpm.patch
+++ b/pie-rpm.patch
@ -1,42 +1,34 @@
 diff -up ./bin/pie.rpm ./bin/pie
--- ./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;
+--- ./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);
 
- 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
+ /** @psalm-suppress UnresolvableInclude */
 -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-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
+--- ./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
     {
         if (! PieVersion::isPharBuild()) {
-             $this->io->writeError('<comment>Aborting! You are not running a PHAR, cannot self-update.</comment>');
-+            $this->io->writeError('<comment>Update the pie RPM using the package manager (dnf).</comment>');
+             $output->writeln('<comment>Aborting! You are not running a PHAR, cannot self-update.</comment>');
+            $output->writeln('<comment>Update the pie RPM using the package manager (dnf).</comment>');
 
             return Command::FAILURE;
         }
 diff -up ./src/Command/SelfVerifyCommand.php.rpm ./src/Command/SelfVerifyCommand.php
--- ./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
+--- ./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
     {
         if (! PieVersion::isPharBuild()) {
-             $this->io->writeError('<comment>Aborting! You are not running a PHAR, cannot self-verify.</comment>');
-+            $this->io->writeError('<comment>Verify the pie RPM using the package manager (rpm).</comment>');
+             $output->writeln('<comment>Aborting! You are not running a PHAR, cannot self-verify.</comment>');
+            $output->writeln('<comment>Verify the pie RPM using the package manager (rpm).</comment>');
 
             return Command::FAILURE;
         }
--- a/pie.spec
+++ b/pie.spec
@ -1,21 +1,21 @@
 # remirepo/fedora spec file for pie
 #
-# SPDX-FileCopyrightText:  Copyright 2024-2026 Remi Collet
+# SPDX-FileCopyrightText:  Copyright 2024-2025 Remi Collet
 # SPDX-License-Identifier: CECILL-2.1
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #

-%global gh_commit        90d6d1850b254540328a8397a9e689ad1bca873e
+%global gh_commit        8288fd6ed643c9fa8422a7a9b49cecd60bf444be
 %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.3.5
-#global upstream_prever  rc3
+%global upstream_version 1.2.1
+#global upstream_prever  RC1

 %global bashcompdir      %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
 %global bashcomproot     %(dirname %{bashcompdir} 2>/dev/null)
@ -26,9 +26,7 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}
 Summary:        PHP Installer for Extensions

-# SPDX: pie is BSD-3-Clause
-# thephpf/attestation is BSD-3-Clause
-# others dependencies are MIT
+# SPDX: pie is BSD-3-Clause, all dependencies are MIT
 License:        BSD-3-Clause AND MIT
 URL:            https://github.com/php/pie
 # tarball generated by makesrc.sh
@ -98,6 +96,9 @@ 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
@ -137,18 +138,6 @@ done


 %changelog
-* Wed Jan  7 2026 Remi Collet <remi@remirepo.net> - 1.3.5-1
- update to 1.3.5
-
-* Sat Jan  3 2026 Remi Collet <remi@remirepo.net> - 1.3.4-1
- update to 1.3.4
-
-* Fri Nov 28 2025 Remi Collet <remi@remirepo.net> - 1.3.1-1
- update to 1.3.1
-
-* Wed Nov 26 2025 Remi Collet <remi@remirepo.net> - 1.3.0-1
- update to 1.3.0
-
 * Wed Sep 10 2025 Remi Collet <remi@remirepo.net> - 1.2.1-1
 - update to 1.2.1
 - supplements php-pear
@ -159,15 +148,9 @@ done
 * Fri Aug  8 2025 Remi Collet <remi@remirepo.net> - 1.1.0-1
 - update to 1.1.0

-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
 * Wed Jun 18 2025 Remi Collet <remi@remirepo.net> - 1.0.0-1
 - update to 1.0.0

-* Fri May  9 2025 Remi Collet <remi@remirepo.net> - 0.12.0-1
- update to 0.12.0
-
 * Sun May  4 2025 Remi Collet <remi@remirepo.net> - 0.10.0-1
 - update to 0.10.0

@ -186,9 +169,6 @@ done
 - update to 0.6.0
 - always use composer-generators

-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
 * Thu Jan  9 2025 Remi Collet <remi@remirepo.net> - 0.5.0-1
 - update to 0.5.0

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (pie-1.3.5-90d6d18.tgz) = 26b76820bfb5faa045cc70c832ef85a3f8dba9f2f8b131a67f813ee99614300889111c9f4a61157266c4e8543cdbe757a89daf535733071c56a05ac254f5b706
+SHA512 (pie-1.2.1-8288fd6.tgz) = e97e72ac583a00dd9047f95938554d24150c980cf5f34502876916db6ecef79f79abcdcbbdf8304274841f677309fbfb5ef67585c80fd79ca9eb775450dd5929
Author	SHA1	Message	Date
Remi Collet	f693238a56	update to 1.2.1 supplements php-pear (cherry picked from commit `dbc3f36cfa`)	2025-09-10 14:43:21 +02:00
Remi Collet	4f7d2fb9da	v1.2.0	2025-09-03 06:31:13 +02:00
Remi Collet	102f101e6f	v1.1.0 (cherry picked from commit `da51af944b`) (cherry picked from commit `fc6cc2e72b`)	2025-08-28 09:24:51 +02:00
Remi Collet	f024952d89	v1.0.0 (cherry picked from commit `9661e373f7`) (cherry picked from commit `b631897760`)	2025-06-18 10:47:24 +02:00
Remi Collet	f1709c34da	v0.10.0 (cherry picked from commit `f9694efeee`)	2025-05-05 07:58:41 +02:00
Remi Collet	965381943b	update to 0.9.0 add notice about dnf in self-update output open https://github.com/php/pie/issues/217 broken bash completion (cherry picked from commit `4851f13542`)	2025-04-15 09:32:30 +02:00
Remi Collet	55e4561119	v0.8.0 (cherry picked from commit `efa34ea12c`)	2025-03-13 11:55:50 +01:00
Remi Collet	36b84afdf3	v0.7.0 (cherry picked from commit `5bf2ebedd5`)	2025-03-03 11:02:53 +01:00
Remi Collet	78080db393	update to 0.6.0 always use composer-generators (cherry picked from commit `cf92af6f4d`) (cherry picked from commit `f889f65c78`)	2025-01-29 10:26:21 +01:00