summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-12-24 10:09:36 +0100
committerRemi Collet <remi@php.net>2024-12-24 10:09:36 +0100
commit70b07798c690934e37a5912e9976f32d98fb4178 (patch)
tree36bbe7ea7f761244cc1b56262d80e49722cb7787
parente9fd349f99a697a6d8dac01d556ca99ca2c6e560 (diff)
fix patch to not use XDG directories
so use ~/.pie instead of ~/.config/pie
-rw-r--r--pie-nocacert.patch2
-rw-r--r--pie-noxdg.patch14
-rw-r--r--pie.spec6
3 files changed, 20 insertions, 2 deletions
diff --git a/pie-nocacert.patch b/pie-nocacert.patch
index 35536a2..c0b6a45 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
-@@ -125,7 +125,7 @@ class CaBundle
+@@ -121,7 +121,7 @@ class CaBundle
*/
public static function getBundledCaBundlePath()
{
diff --git a/pie-noxdg.patch b/pie-noxdg.patch
index d1ac324..896ab51 100644
--- a/pie-noxdg.patch
+++ b/pie-noxdg.patch
@@ -12,3 +12,17 @@ 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.spec b/pie.spec
index d3b9399..43d31e0 100644
--- a/pie.spec
+++ b/pie.spec
@@ -30,7 +30,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
@@ -202,6 +202,10 @@ done
%changelog
+* Tue Dec 24 2024 Remi Collet <remi@remirepo.net> - 0.3.0-2
+- fix patch to not use XDG directories
+ so use ~/.pie instead of ~/.config/pie
+
* Tue Dec 24 2024 Remi Collet <remi@remirepo.net> - 0.3.0-1
- update to 0.3.0