From f889f65c78fc14efb4b0a6ca873c51ecfb4161ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Jan 2025 10:18:31 +0100 Subject: [PATCH 1/9] update to 0.6.0 always use composer-generators (cherry picked from commit cf92af6f4df42eb43f0497c1c612f4a56f8f608a) --- .gitignore | 1 + pie.spec | 71 +++++------------------------------------------------- sources | 2 +- 3 files changed, 8 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 73a3e4e..4fe0e76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pie-0.3.0-dc299c3.tgz /pie-0.4.0-883447d.tgz /pie-0.5.0-b6e014b.tgz +/pie-0.6.0-e7fcd16.tgz diff --git a/pie.spec b/pie.spec index 230d027..0aaa2b4 100644 --- a/pie.spec +++ b/pie.spec @@ -7,16 +7,14 @@ # Please, preserve the changelog entries # -%bcond_with generators - -%global gh_commit b6e014bdbe790a6cbb83ea0582ac9b6eb8ab31c1 +%global gh_commit e7fcd163cf77e3ae878f6bee9a590e1fd00b2a26 %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 0.5.0 +%global upstream_version 0.6.0 #global upstream_prever dev #global upstream_lower DEV @@ -52,9 +50,7 @@ BuildRequires: php-cli BuildRequires: php-json BuildRequires: php-zip BuildRequires: pkgconfig(bash-completion) -%if %{with generators} BuildRequires: composer-generators -%endif # From composer.json, "require": { # "php": "8.1.*||8.2.*||8.3.*||8.4.*", @@ -75,44 +71,6 @@ Requires: php-mbstring Requires: php-posix Requires: php-phar -%if %{without generators} -# Bundled libraries -# License MIT -Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.5 -Provides: bundled(php-composer(composer/class-map-generator)) = 1.5.0 -Provides: bundled(php-composer(composer/composer)) = 2.8.4 -Provides: bundled(php-composer(composer/metadata-minifier)) = 1.0.0 -Provides: bundled(php-composer(composer/pcre)) = 3.3.2 -Provides: bundled(php-composer(composer/semver)) = 3.4.3 -Provides: bundled(php-composer(composer/spdx-licenses)) = 1.5.8 -Provides: bundled(php-composer(composer/xdebug-handler)) = 3.0.5 -Provides: bundled(php-composer(fidry/cpu-core-counter)) = 1.2.0 -Provides: bundled(php-composer(illuminate/container)) = 10.48.25 -Provides: bundled(php-composer(illuminate/contracts)) = 10.48.25 -Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.3.0 -Provides: bundled(php-composer(psr/container)) = 2.0.2 -Provides: bundled(php-composer(psr/log)) = 3.0.2 -Provides: bundled(php-composer(psr/simple-cache)) = 3.0.0 -Provides: bundled(php-composer(react/promise)) = 3.2.0 -Provides: bundled(php-composer(seld/jsonlint)) = 1.11.0 -Provides: bundled(php-composer(seld/phar-utils)) = 1.2.1 -Provides: bundled(php-composer(seld/signal-handler)) = 2.0.2 -Provides: bundled(php-composer(symfony/console)) = 6.4.17 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = 3.5.1 -Provides: bundled(php-composer(symfony/filesystem)) = 6.4.13 -Provides: bundled(php-composer(symfony/finder)) = 6.4.17 -Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0 -Provides: bundled(php-composer(symfony/process)) = 6.4.15 -Provides: bundled(php-composer(symfony/service-contracts)) = 3.5.1 -Provides: bundled(php-composer(symfony/string)) = 6.4.15 -Provides: bundled(php-composer(webmozart/assert)) = 1.11.0 - -# Composer library -Provides: php-composer(php/pie) = %{version} -%endif %description PIE (PHP Installer for Extensions). @@ -138,27 +96,6 @@ rm vendor/composer/ca-bundle/res/cacert.pem : Set version sed -e 's/@pie_version@/%{upstream_version}%{?upstream_prever}/' -i bin/pie -%if %{without generators} -: List bundled libraries and Licenses -php -r ' - $pkgs = file_get_contents("vendor/composer/installed.json"); - $pkgs = json_decode($pkgs, true); - if (!is_array($pkgs) || !isset($pkgs["packages"])) { - echo "cant decode json file\n"; - exit(3); - } - $res = []; - foreach($pkgs["packages"] as $pkg) { - $lic = implode(" and ", $pkg["license"]); - if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], ltrim($pkg["version"], "v")); - } - foreach($res as $lic => $lib) { - sort($lib); - printf("# License %s\n%s\n", $lic, implode("\n", $lib)); - }' -%endif - %build # Nothing @@ -198,6 +135,10 @@ done %changelog +* Wed Jan 29 2025 Remi Collet - 0.6.0-1 +- update to 0.6.0 +- always use composer-generators + * Thu Jan 9 2025 Remi Collet - 0.5.0-1 - update to 0.5.0 diff --git a/sources b/sources index bbbc230..be9e295 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.5.0-b6e014b.tgz) = e7f28f1d3bb53340711555e30bf118a6e563a45a3fe06da2a67ebcb65046aa24505ddebfecd73b0a898a8d02a2d6de55545777bcd17d9ff15a30256ffe487b0f +SHA512 (pie-0.6.0-e7fcd16.tgz) = 5131ab2a69f53ca73e8e65c8ef6b85e6bd9d7b8c9a4b50649c32aa1de57d5e775f3b3f36c9584c60760caa4f3c3f417e4b5bc7ef6c5762b881d53b83e656abe5 From 659806b92522bd5d34ea803d93193539c64eeb5a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Mar 2025 10:52:34 +0100 Subject: [PATCH 2/9] v0.7.0 (cherry picked from commit 5bf2ebedd50c69feb39193b79bc7eb1daddaa667) --- .gitignore | 1 + pie.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4fe0e76..22e2605 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pie-0.4.0-883447d.tgz /pie-0.5.0-b6e014b.tgz /pie-0.6.0-e7fcd16.tgz +/pie-0.7.0-8304dd2.tgz diff --git a/pie.spec b/pie.spec index 0aaa2b4..4ed2777 100644 --- a/pie.spec +++ b/pie.spec @@ -1,20 +1,20 @@ # remirepo/fedora spec file for pie # -# SPDX-FileCopyrightText: Copyright 2024 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 e7fcd163cf77e3ae878f6bee9a590e1fd00b2a26 +%global gh_commit 8304dd20d96c81be1d9e4ad7976e63cfa6670b29 %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 0.6.0 +%global upstream_version 0.7.0 #global upstream_prever dev #global upstream_lower DEV @@ -135,6 +135,9 @@ done %changelog +* Mon Mar 3 2025 Remi Collet - 0.7.0-1 +- update to 0.7.0 + * Wed Jan 29 2025 Remi Collet - 0.6.0-1 - update to 0.6.0 - always use composer-generators diff --git a/sources b/sources index be9e295..121bdad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.6.0-e7fcd16.tgz) = 5131ab2a69f53ca73e8e65c8ef6b85e6bd9d7b8c9a4b50649c32aa1de57d5e775f3b3f36c9584c60760caa4f3c3f417e4b5bc7ef6c5762b881d53b83e656abe5 +SHA512 (pie-0.7.0-8304dd2.tgz) = 080fd188872a7330816ce4f8df67f41beec8d34b840b038e8c3618c8f52c3524ac946878b8bfbd8f32655c0d58233e313a0be144601344fe594d88dbe98ca018 From a0325db874b73a3c705059fac7cf86496a661f45 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Mar 2025 11:36:51 +0100 Subject: [PATCH 3/9] v0.8.0 (cherry picked from commit efa34ea12c9183dcd69b2ce132cf27ccf9885c8b) --- .gitignore | 1 + pie.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 22e2605..cf6c0b2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pie-0.5.0-b6e014b.tgz /pie-0.6.0-e7fcd16.tgz /pie-0.7.0-8304dd2.tgz +/pie-0.8.0-108707d.tgz diff --git a/pie.spec b/pie.spec index 4ed2777..31565a6 100644 --- a/pie.spec +++ b/pie.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 8304dd20d96c81be1d9e4ad7976e63cfa6670b29 +%global gh_commit 108707df748ad2bbc96db8a1edd625b4332c364e %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 0.7.0 +%global upstream_version 0.8.0 #global upstream_prever dev #global upstream_lower DEV @@ -135,6 +135,9 @@ done %changelog +* Thu Mar 13 2025 Remi Collet - 0.8.0-1 +- update to 0.8.0 + * Mon Mar 3 2025 Remi Collet - 0.7.0-1 - update to 0.7.0 diff --git a/sources b/sources index 121bdad..34100cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.7.0-8304dd2.tgz) = 080fd188872a7330816ce4f8df67f41beec8d34b840b038e8c3618c8f52c3524ac946878b8bfbd8f32655c0d58233e313a0be144601344fe594d88dbe98ca018 +SHA512 (pie-0.8.0-108707d.tgz) = ad1b78ee6d405765e1f50f1fc54997f4cb947a75e3396d73fda17e1f21c645c8ec569ba05899cb5732f065e41a29f72782a8f13b7e8dc500a4a2de821c560ba1 From b9d5492a54a342eb52185e81d1b482e298ebbf83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Apr 2025 09:19:11 +0200 Subject: [PATCH 4/9] 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 4851f135420f47912b9642b8c5bc518dfe2b85af) --- .gitignore | 1 + pie-rpm.patch | 11 +++++++++++ pie.spec | 12 +++++++++--- sources | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cf6c0b2..4dbaf78 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pie-0.6.0-e7fcd16.tgz /pie-0.7.0-8304dd2.tgz /pie-0.8.0-108707d.tgz +/pie-0.9.0-2c73701.tgz diff --git a/pie-rpm.patch b/pie-rpm.patch index e73d0ab..bce68f7 100644 --- a/pie-rpm.patch +++ b/pie-rpm.patch @@ -10,3 +10,14 @@ diff -up ./bin/pie.rpm ./bin/pie $container = Container::factory(); +diff -up ./src/Command/SelfUpdateCommand.php.old ./src/Command/SelfUpdateCommand.php +--- ./src/Command/SelfUpdateCommand.php.old 2025-04-15 08:39:08.283938705 +0200 ++++ ./src/Command/SelfUpdateCommand.php 2025-04-15 08:40:47.169189092 +0200 +@@ -66,6 +66,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).'); + + return 1; + } diff --git a/pie.spec b/pie.spec index 31565a6..a6d189f 100644 --- a/pie.spec +++ b/pie.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 108707df748ad2bbc96db8a1edd625b4332c364e +%global gh_commit 2c73701769a0edffd1f5f051b658f1ac31c78c64 %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 0.8.0 +%global upstream_version 0.9.0 #global upstream_prever dev #global upstream_lower DEV @@ -24,7 +24,7 @@ Name: pie Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP Installer for Extensions # SPDX: pie is BSD-3-Clause, all dependencies are MIT @@ -37,6 +37,7 @@ Source1: %{name}-bash-completion Source9: makesrc.sh # Fix autoloader path +# add message about dnf in self-update command Patch0: %{name}-rpm.patch # Don't use XDG directories Patch1: %{name}-noxdg.patch @@ -135,6 +136,11 @@ done %changelog +* Tue Apr 15 2025 Remi Collet - 0.9.0-2 +- update to 0.9.0 +- add notice about dnf in self-update output +- open https://github.com/php/pie/issues/217 broken bash completion + * Thu Mar 13 2025 Remi Collet - 0.8.0-1 - update to 0.8.0 diff --git a/sources b/sources index 34100cc..f0d04ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.8.0-108707d.tgz) = ad1b78ee6d405765e1f50f1fc54997f4cb947a75e3396d73fda17e1f21c645c8ec569ba05899cb5732f065e41a29f72782a8f13b7e8dc500a4a2de821c560ba1 +SHA512 (pie-0.9.0-2c73701.tgz) = b1b524d8000176fdc34970c468f2dfe3da080f44fdbf2be57056b58f6b187c833a31ef1894e7ae9dc768b33c4801d201697994a5d52a32954513a2a4349d5ec7 From a9351556d604b954fb2be877a318f8e2de25b133 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 May 2025 07:56:29 +0200 Subject: [PATCH 5/9] v0.10.0 (cherry picked from commit f9694efeee19bd2082fe45f2edab3be2ac206050) --- .gitignore | 1 + pie-rpm.patch | 29 ++++++++++++++++++++--------- pie.spec | 9 ++++++--- sources | 2 +- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 4dbaf78..82529fd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /pie-0.7.0-8304dd2.tgz /pie-0.8.0-108707d.tgz /pie-0.9.0-2c73701.tgz +/pie-0.10.0-453a462.tgz diff --git a/pie-rpm.patch b/pie-rpm.patch index bce68f7..319bf15 100644 --- a/pie-rpm.patch +++ b/pie-rpm.patch @@ -1,8 +1,8 @@ diff -up ./bin/pie.rpm ./bin/pie ---- ./bin/pie.rpm 2024-10-04 11:40:48.733248660 +0200 -+++ ./bin/pie 2024-10-04 11:42:00.473990273 +0200 -@@ -17,7 +17,7 @@ use Symfony\Component\Console\Input\Inpu - use Symfony\Component\Console\Output\OutputInterface; +--- ./bin/pie.rpm 2025-05-04 07:07:22.613769884 +0200 ++++ ./bin/pie 2025-05-04 07:08:14.674780350 +0200 +@@ -25,7 +25,7 @@ use Symfony\Component\Console\Output\Out + use Symfony\Component\EventDispatcher\EventDispatcher; /** @psalm-suppress UnresolvableInclude */ -include $_composer_autoload_path ?? __DIR__ . '/../vendor/autoload.php'; @@ -10,14 +10,25 @@ diff -up ./bin/pie.rpm ./bin/pie $container = Container::factory(); -diff -up ./src/Command/SelfUpdateCommand.php.old ./src/Command/SelfUpdateCommand.php ---- ./src/Command/SelfUpdateCommand.php.old 2025-04-15 08:39:08.283938705 +0200 -+++ ./src/Command/SelfUpdateCommand.php 2025-04-15 08:40:47.169189092 +0200 -@@ -66,6 +66,7 @@ final class SelfUpdateCommand extends Co +diff -up ./src/Command/SelfUpdateCommand.php.rpm ./src/Command/SelfUpdateCommand.php +--- ./src/Command/SelfUpdateCommand.php.rpm 2025-05-04 07:07:22.613884103 +0200 ++++ ./src/Command/SelfUpdateCommand.php 2025-05-04 07:08:42.762882203 +0200 +@@ -63,6 +63,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).'); - return 1; + return Command::FAILURE; + } +diff -up ./src/Command/SelfVerifyCommand.php.rpm ./src/Command/SelfVerifyCommand.php +--- ./src/Command/SelfVerifyCommand.php.rpm 2025-05-04 07:12:21.285478859 +0200 ++++ ./src/Command/SelfVerifyCommand.php 2025-05-04 07:14:06.624616100 +0200 +@@ -49,6 +49,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).'); + + return Command::FAILURE; } diff --git a/pie.spec b/pie.spec index a6d189f..7d8d46e 100644 --- a/pie.spec +++ b/pie.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 2c73701769a0edffd1f5f051b658f1ac31c78c64 +%global gh_commit 453a46225915d29c714480d4897b7905d91c3236 %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 0.9.0 +%global upstream_version 0.10.0 #global upstream_prever dev #global upstream_lower DEV @@ -24,7 +24,7 @@ Name: pie Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: PHP Installer for Extensions # SPDX: pie is BSD-3-Clause, all dependencies are MIT @@ -136,6 +136,9 @@ done %changelog +* Sun May 4 2025 Remi Collet - 0.10.0-1 +- update to 0.10.0 + * Tue Apr 15 2025 Remi Collet - 0.9.0-2 - update to 0.9.0 - add notice about dnf in self-update output diff --git a/sources b/sources index f0d04ef..242a192 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.9.0-2c73701.tgz) = b1b524d8000176fdc34970c468f2dfe3da080f44fdbf2be57056b58f6b187c833a31ef1894e7ae9dc768b33c4801d201697994a5d52a32954513a2a4349d5ec7 +SHA512 (pie-0.10.0-453a462.tgz) = c96dfa7804c8e16f6aea45c97c667d3ba588a88f73fd03418c7b77b42e04eed7eb758aa412e3e74cc6db7d3d1e4831c48089fc0fb49ed7901173ad1283738c01 From b40d6f11dc42a0fff14c81c3b98fad8961fc2675 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Jun 2025 10:37:23 +0200 Subject: [PATCH 6/9] v1.0.0 (cherry picked from commit 9661e373f786d6c1d29b8c572a00a3813d19b6a5) (cherry picked from commit b631897760b728865a8e2d86025fb6ed37752322) --- .gitignore | 2 ++ pie.spec | 7 +++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 82529fd..1135a6a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /pie-0.8.0-108707d.tgz /pie-0.9.0-2c73701.tgz /pie-0.10.0-453a462.tgz +/pie-0.12.0-6f6ce74.tgz +/pie-1.0.0-6b7bbdd.tgz diff --git a/pie.spec b/pie.spec index 7d8d46e..6b6ba25 100644 --- a/pie.spec +++ b/pie.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 453a46225915d29c714480d4897b7905d91c3236 +%global gh_commit 6b7bbdd405cbc31d81dd94ef4140343ae2062f1e %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 0.10.0 +%global upstream_version 1.0.0 #global upstream_prever dev #global upstream_lower DEV @@ -136,6 +136,9 @@ done %changelog +* Wed Jun 18 2025 Remi Collet - 1.0.0-1 +- update to 1.0.0 + * Sun May 4 2025 Remi Collet - 0.10.0-1 - update to 0.10.0 diff --git a/sources b/sources index 242a192..3788dc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.10.0-453a462.tgz) = c96dfa7804c8e16f6aea45c97c667d3ba588a88f73fd03418c7b77b42e04eed7eb758aa412e3e74cc6db7d3d1e4831c48089fc0fb49ed7901173ad1283738c01 +SHA512 (pie-1.0.0-6b7bbdd.tgz) = 706e82fe9c581e52f06f56085cbd1ac4469f5fcb367d5eac050421ce09daa5c50b03dd6612eec4e7d23d9fca8bde213a9ecfad235d35b4d3003e6c873c4113d2 From 8b5ae8627bb6679aa6ac24a753bd2822d9ecae0f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 09:17:28 +0200 Subject: [PATCH 7/9] v1.1.0 (cherry picked from commit da51af944b27d491245724edb826a08bf4d04af6) (cherry picked from commit fc6cc2e72b3b701e8d8edae2aa7f69ac59c20d26) --- .gitignore | 1 + pie-nocacert.patch | 2 +- pie.spec | 14 ++++++++------ sources | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 1135a6a..946ce8f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /pie-0.10.0-453a462.tgz /pie-0.12.0-6f6ce74.tgz /pie-1.0.0-6b7bbdd.tgz +/pie-1.1.0-28b3e0d.tgz diff --git a/pie-nocacert.patch b/pie-nocacert.patch index c0b6a45..a93d2a4 100644 --- a/pie-nocacert.patch +++ b/pie-nocacert.patch @@ -6,7 +6,7 @@ diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-b public static function getBundledCaBundlePath() { - $caBundleFile = __DIR__.'/../res/cacert.pem'; -+ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always ++ $caBundleFile = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'; // System CA, always // cURL does not understand 'phar://' paths // see https://github.com/composer/ca-bundle/issues/10 diff --git a/pie.spec b/pie.spec index 6b6ba25..82d928f 100644 --- a/pie.spec +++ b/pie.spec @@ -7,23 +7,22 @@ # Please, preserve the changelog entries # -%global gh_commit 6b7bbdd405cbc31d81dd94ef4140343ae2062f1e +%global gh_commit 28b3e0d324f29034e6c80eed3f63773ca78038dc %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.0.0 -#global upstream_prever dev -#global upstream_lower DEV +%global upstream_version 1.1.0 +#global upstream_prever RC1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) Name: pie -Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: PHP Installer for Extensions @@ -60,7 +59,7 @@ Requires: php(language) >= 8.1 Requires: php-cli Requires: php-zip # System certificates -Requires: ca-certificates +Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # From phpcompatinfo # Ignored: core, date, filter, hash, pcre, random, reflection, spl, standard Requires: php-ctype @@ -136,6 +135,9 @@ done %changelog +* Fri Aug 8 2025 Remi Collet - 1.1.0-1 +- update to 1.1.0 + * Wed Jun 18 2025 Remi Collet - 1.0.0-1 - update to 1.0.0 diff --git a/sources b/sources index 3788dc7..928115f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-1.0.0-6b7bbdd.tgz) = 706e82fe9c581e52f06f56085cbd1ac4469f5fcb367d5eac050421ce09daa5c50b03dd6612eec4e7d23d9fca8bde213a9ecfad235d35b4d3003e6c873c4113d2 +SHA512 (pie-1.1.0-28b3e0d.tgz) = a1b500d8664944b71369fffde91717b3d14a4742c96d7fa89fd79931e935eb4d01e0cb76d0854443cdce5f116e78fbf91863c10129cc55c9edb9fa9009d08602 From cae23716fc3964c4a43e4950ac1d77c6c4988639 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Sep 2025 06:31:13 +0200 Subject: [PATCH 8/9] v1.2.0 (cherry picked from commit 4f7d2fb9da2ee57662807a58e232ed8a7f0ffd47) --- .gitignore | 1 + pie-nocacert.patch | 2 +- pie-noxdg.patch | 34 +++++++++++++++++----------------- pie-rpm.patch | 20 ++++++++++---------- pie.spec | 7 +++++-- sources | 2 +- 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 946ce8f..2856ab0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /pie-0.12.0-6f6ce74.tgz /pie-1.0.0-6b7bbdd.tgz /pie-1.1.0-28b3e0d.tgz +/pie-1.2.0-4b20e77.tgz diff --git a/pie-nocacert.patch b/pie-nocacert.patch index a93d2a4..1d744be 100644 --- a/pie-nocacert.patch +++ b/pie-nocacert.patch @@ -1,7 +1,7 @@ diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-bundle/src/CaBundle.php --- ./vendor/composer/ca-bundle/src/CaBundle.php.rpm 2024-09-25 09:49:53.000000000 +0200 +++ ./vendor/composer/ca-bundle/src/CaBundle.php 2024-10-03 07:11:10.752092401 +0200 -@@ -121,7 +121,7 @@ class CaBundle +@@ -122,7 +122,7 @@ class CaBundle */ public static function getBundledCaBundlePath() { diff --git a/pie-noxdg.patch b/pie-noxdg.patch index 896ab51..e0a2703 100644 --- a/pie-noxdg.patch +++ b/pie-noxdg.patch @@ -1,7 +1,21 @@ +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 + + private static function useXdg(): bool + { ++ // As XDG is very partially implemented ++ // resulting in command/code in ~/.config ++ return false; ++ + foreach (array_keys($_SERVER) as $key) { + /** @psalm-suppress RedundantCastGivenDocblockType */ + if (strpos((string) $key, 'XDG_') === 0) { 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 2024-04-20 12:34:54.442117723 +0200 -+++ ./vendor/composer/composer/src/Composer/Factory.php 2024-04-20 12:35:39.497640757 +0200 -@@ -702,6 +702,10 @@ class Factory +--- ./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 { @@ -12,17 +26,3 @@ diff -up ./vendor/composer/composer/src/Composer/Factory.php.noxdg ./vendor/comp foreach (array_keys($_SERVER) as $key) { if (strpos((string) $key, 'XDG_') === 0) { return true; -diff -up ./src/Platform.php.old ./src/Platform.php ---- ./src/Platform.php.old 2024-12-24 10:01:31.088992537 +0100 -+++ ./src/Platform.php 2024-12-24 10:01:36.394197932 +0100 -@@ -23,6 +23,10 @@ class Platform - { - private static function useXdg(): bool - { -+ // As XDG is very partially implemented -+ // resulting in command/code in ~/.config -+ return false; -+ - foreach (array_keys($_SERVER) as $key) { - /** @psalm-suppress RedundantCastGivenDocblockType */ - if (strpos((string) $key, 'XDG_') === 0) { diff --git a/pie-rpm.patch b/pie-rpm.patch index 319bf15..8203644 100644 --- a/pie-rpm.patch +++ b/pie-rpm.patch @@ -1,8 +1,8 @@ diff -up ./bin/pie.rpm ./bin/pie ---- ./bin/pie.rpm 2025-05-04 07:07:22.613769884 +0200 -+++ ./bin/pie 2025-05-04 07:08:14.674780350 +0200 -@@ -25,7 +25,7 @@ use Symfony\Component\Console\Output\Out - use Symfony\Component\EventDispatcher\EventDispatcher; +--- ./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); /** @psalm-suppress UnresolvableInclude */ -include $_composer_autoload_path ?? __DIR__ . '/../vendor/autoload.php'; @@ -11,9 +11,9 @@ diff -up ./bin/pie.rpm ./bin/pie $container = Container::factory(); diff -up ./src/Command/SelfUpdateCommand.php.rpm ./src/Command/SelfUpdateCommand.php ---- ./src/Command/SelfUpdateCommand.php.rpm 2025-05-04 07:07:22.613884103 +0200 -+++ ./src/Command/SelfUpdateCommand.php 2025-05-04 07:08:42.762882203 +0200 -@@ -63,6 +63,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()) { $output->writeln('Aborting! You are not running a PHAR, cannot self-update.'); @@ -22,9 +22,9 @@ diff -up ./src/Command/SelfUpdateCommand.php.rpm ./src/Command/SelfUpdateCommand return Command::FAILURE; } diff -up ./src/Command/SelfVerifyCommand.php.rpm ./src/Command/SelfVerifyCommand.php ---- ./src/Command/SelfVerifyCommand.php.rpm 2025-05-04 07:12:21.285478859 +0200 -+++ ./src/Command/SelfVerifyCommand.php 2025-05-04 07:14:06.624616100 +0200 -@@ -49,6 +49,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()) { $output->writeln('Aborting! You are not running a PHAR, cannot self-verify.'); diff --git a/pie.spec b/pie.spec index 82d928f..0be930f 100644 --- a/pie.spec +++ b/pie.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 28b3e0d324f29034e6c80eed3f63773ca78038dc +%global gh_commit 4b20e778e116a3e77ece8ad26d4a44dd64bbeaf6 %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.1.0 +%global upstream_version 1.2.0 #global upstream_prever RC1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) @@ -135,6 +135,9 @@ done %changelog +* Wed Sep 3 2025 Remi Collet - 1.2.0-1 +- update to 1.2.0 + * Fri Aug 8 2025 Remi Collet - 1.1.0-1 - update to 1.1.0 diff --git a/sources b/sources index 928115f..3101704 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-1.1.0-28b3e0d.tgz) = a1b500d8664944b71369fffde91717b3d14a4742c96d7fa89fd79931e935eb4d01e0cb76d0854443cdce5f116e78fbf91863c10129cc55c9edb9fa9009d08602 +SHA512 (pie-1.2.0-4b20e77.tgz) = b7be6ecf24b53bebce9d3d35c03b86775d54db5902c8bb8fe97a7aff66d16ad7b66fc36bf0701b2e2dd2b7ac3058d64f48e2b241b242d1a74b1c30f734d2a82c From 51d517d7ea8e1e39c06a929fa121ba7bb9e7f911 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Sep 2025 13:55:58 +0200 Subject: [PATCH 9/9] update to 1.2.1 supplements php-pear (cherry picked from commit dbc3f36cfa500005c8c96653efe906713ad384ec) --- .gitignore | 1 + pie.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2856ab0..907e518 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /pie-1.0.0-6b7bbdd.tgz /pie-1.1.0-28b3e0d.tgz /pie-1.2.0-4b20e77.tgz +/pie-1.2.1-8288fd6.tgz diff --git a/pie.spec b/pie.spec index 0be930f..7dc20e0 100644 --- a/pie.spec +++ b/pie.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 4b20e778e116a3e77ece8ad26d4a44dd64bbeaf6 +%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.2.0 +%global upstream_version 1.2.1 #global upstream_prever RC1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) @@ -70,6 +70,9 @@ Requires: php-json Requires: php-mbstring Requires: php-posix Requires: php-phar +# PECL is now deprecated +# PIE is designed to replace it +Supplements: php-pear %description @@ -135,6 +138,10 @@ done %changelog +* Wed Sep 10 2025 Remi Collet - 1.2.1-1 +- update to 1.2.1 +- supplements php-pear + * Wed Sep 3 2025 Remi Collet - 1.2.0-1 - update to 1.2.0 diff --git a/sources b/sources index 3101704..6687b84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-1.2.0-4b20e77.tgz) = b7be6ecf24b53bebce9d3d35c03b86775d54db5902c8bb8fe97a7aff66d16ad7b66fc36bf0701b2e2dd2b7ac3058d64f48e2b241b242d1a74b1c30f734d2a82c +SHA512 (pie-1.2.1-8288fd6.tgz) = e97e72ac583a00dd9047f95938554d24150c980cf5f34502876916db6ecef79f79abcdcbbdf8304274841f677309fbfb5ef67585c80fd79ca9eb775450dd5929