diff options
| -rw-r--r-- | installed.json | 92 | ||||
| -rwxr-xr-x | makesrc.sh | 2 | ||||
| -rw-r--r-- | pie-nocacert.patch | 12 | ||||
| -rw-r--r-- | pie-noxdg.patch | 14 | ||||
| -rw-r--r-- | pie.spec | 100 |
5 files changed, 129 insertions, 91 deletions
diff --git a/installed.json b/installed.json index efd7c93..876ff1e 100644 --- a/installed.json +++ b/installed.json @@ -162,12 +162,12 @@ "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "a67ce984e9d833d791a8fb4657b49315bfe61158" + "reference": "5a75d3241418c47128647c9d55e599dec492d406" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/a67ce984e9d833d791a8fb4657b49315bfe61158", - "reference": "a67ce984e9d833d791a8fb4657b49315bfe61158", + "url": "https://api.github.com/repos/composer/composer/zipball/5a75d3241418c47128647c9d55e599dec492d406", + "reference": "5a75d3241418c47128647c9d55e599dec492d406", "shasum": "" }, "require": { @@ -206,7 +206,7 @@ "ext-zip": "Enabling the zip extension allows you to unzip archives", "ext-zlib": "Allow gzip compression of HTTP requests" }, - "time": "2024-10-04T14:39:31+00:00", + "time": "2024-10-29T15:12:11+00:00", "default-branch": true, "bin": [ "bin/composer" @@ -794,17 +794,17 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.3", - "version_normalized": "2.0.3.0", + "version": "2.0.4", + "version_normalized": "2.0.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "shasum": "" }, "require": { @@ -814,7 +814,7 @@ "bamarni/composer-bin-plugin": "^1.8.2", "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, - "time": "2024-07-18T10:29:17+00:00", + "time": "2024-10-17T10:06:22+00:00", "type": "library", "extra": { "bamarni-bin": { @@ -860,7 +860,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.3" + "source": "https://github.com/guzzle/promises/tree/2.0.4" }, "funding": [ { @@ -1809,17 +1809,17 @@ }, { "name": "symfony/console", - "version": "v6.4.12", - "version_normalized": "6.4.12.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765" + "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/72d080eb9edf80e36c19be61f72c98ed8273b765", - "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765", + "url": "https://api.github.com/repos/symfony/console/zipball/f793dd5a7d9ae9923e35d0503d08ba734cec1d79", + "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79", "shasum": "" }, "require": { @@ -1852,7 +1852,7 @@ "symfony/stopwatch": "^5.4|^6.0|^7.0", "symfony/var-dumper": "^5.4|^6.0|^7.0" }, - "time": "2024-09-20T08:15:52+00:00", + "time": "2024-10-09T08:40:40+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1886,7 +1886,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.12" + "source": "https://github.com/symfony/console/tree/v6.4.13" }, "funding": [ { @@ -1976,17 +1976,17 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.12", - "version_normalized": "6.4.12.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12" + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/f810e3cbdf7fdc35983968523d09f349fa9ada12", - "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3", + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3", "shasum": "" }, "require": { @@ -1997,7 +1997,7 @@ "require-dev": { "symfony/process": "^5.4|^6.4|^7.0" }, - "time": "2024-09-16T16:01:33+00:00", + "time": "2024-10-25T15:07:50+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2025,7 +2025,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.12" + "source": "https://github.com/symfony/filesystem/tree/v6.4.13" }, "funding": [ { @@ -2045,17 +2045,17 @@ }, { "name": "symfony/finder", - "version": "v6.4.11", - "version_normalized": "6.4.11.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453" + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453", + "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", "shasum": "" }, "require": { @@ -2064,7 +2064,7 @@ "require-dev": { "symfony/filesystem": "^6.0|^7.0" }, - "time": "2024-08-13T14:27:37+00:00", + "time": "2024-10-01T08:30:56+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2092,7 +2092,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.11" + "source": "https://github.com/symfony/finder/tree/v6.4.13" }, "funding": [ { @@ -2683,23 +2683,23 @@ }, { "name": "symfony/process", - "version": "v6.4.12", - "version_normalized": "6.4.12.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3" + "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/3f94e5f13ff58df371a7ead461b6e8068900fbb3", - "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3", + "url": "https://api.github.com/repos/symfony/process/zipball/1f9f59b46880201629df3bd950fc5ae8c55b960f", + "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f", "shasum": "" }, "require": { "php": ">=8.1" }, - "time": "2024-09-17T12:47:12+00:00", + "time": "2024-09-25T14:18:03+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2727,7 +2727,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.12" + "source": "https://github.com/symfony/process/tree/v6.4.13" }, "funding": [ { @@ -2833,17 +2833,17 @@ }, { "name": "symfony/string", - "version": "v6.4.12", - "version_normalized": "6.4.12.0", + "version": "v6.4.13", + "version_normalized": "6.4.13.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b" + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b", - "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b", + "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", "shasum": "" }, "require": { @@ -2863,7 +2863,7 @@ "symfony/translation-contracts": "^2.5|^3.0", "symfony/var-exporter": "^5.4|^6.0|^7.0" }, - "time": "2024-09-20T08:15:52+00:00", + "time": "2024-09-25T14:18:03+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2902,7 +2902,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.12" + "source": "https://github.com/symfony/string/tree/v6.4.13" }, "funding": [ { @@ -9,7 +9,7 @@ PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} -if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz ]; then +if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz -a "$1" != "-f" ]; then echo skip $NAME-$VERSION$PREVER-$SHORT.tgz already here else echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" diff --git a/pie-nocacert.patch b/pie-nocacert.patch new file mode 100644 index 0000000..35536a2 --- /dev/null +++ b/pie-nocacert.patch @@ -0,0 +1,12 @@ +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 + */ + public static function getBundledCaBundlePath() + { +- $caBundleFile = __DIR__.'/../res/cacert.pem'; ++ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always + + // cURL does not understand 'phar://' paths + // see https://github.com/composer/ca-bundle/issues/10 diff --git a/pie-noxdg.patch b/pie-noxdg.patch new file mode 100644 index 0000000..d1ac324 --- /dev/null +++ b/pie-noxdg.patch @@ -0,0 +1,14 @@ +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 + + 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) { + if (strpos((string) $key, 'XDG_') === 0) { + return true; @@ -30,11 +30,11 @@ 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 -License: BSD-3-Clause and MIT +License: BSD-3-Clause AND MIT URL: https://github.com/php/pie # tarball generated by makesrc.sh Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz @@ -44,6 +44,10 @@ Source9: makesrc.sh # Fix autoloader path Patch0: %{name}-rpm.patch +# Don't use XDG directories +Patch1: %{name}-noxdg.patch +# Don't use bundled cacert.pem +Patch2: %{name}-nocacert.patch BuildArch: noarch # platform set in makesrc.sh @@ -78,46 +82,46 @@ Requires: php-phar %if %{without generators} # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.5.2 -Provides: bundled(php-composer-class-map-generator) = 1.4.0 -Provides: bundled(php-composer-composer) = dev-main -Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 3.3.1 -Provides: bundled(php-composer-semver) = 3.4.3 -Provides: bundled(php-composer-spdx-licenses) = 1.5.8 -Provides: bundled(php-composer-xdebug-handler) = 3.0.5 -Provides: bundled(php-guzzlehttp-guzzle) = 7.9.2 -Provides: bundled(php-guzzlehttp-promises) = 2.0.3 -Provides: bundled(php-guzzlehttp-psr7) = 2.7.0 -Provides: bundled(php-illuminate-container) = v10.48.22 -Provides: bundled(php-illuminate-contracts) = v10.48.22 -Provides: bundled(php-justinrainbow-json-schema) = 5.3.0 -Provides: bundled(php-psr-container) = 2.0.2 -Provides: bundled(php-psr-http-client) = 1.0.3 -Provides: bundled(php-psr-http-factory) = 1.1.0 -Provides: bundled(php-psr-http-message) = 2.0 -Provides: bundled(php-psr-log) = 3.0.2 -Provides: bundled(php-psr-simple-cache) = 3.0.0 -Provides: bundled(php-ralouphie-getallheaders) = 3.0.3 -Provides: bundled(php-react-promise) = v3.2.0 -Provides: bundled(php-seld-jsonlint) = 1.11.0 -Provides: bundled(php-seld-phar-utils) = 1.2.1 -Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v6.4.12 -Provides: bundled(php-symfony-deprecation-contracts) = v3.5.0 -Provides: bundled(php-symfony-filesystem) = v6.4.12 -Provides: bundled(php-symfony-finder) = v6.4.11 -Provides: bundled(php-symfony-polyfill-ctype) = v1.31.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.31.0 -Provides: bundled(php-symfony-process) = v6.4.12 -Provides: bundled(php-symfony-service-contracts) = v3.5.0 -Provides: bundled(php-symfony-string) = v6.4.12 -Provides: bundled(php-webmozart-assert) = 1.11.0 +Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.2 +Provides: bundled(php-composer(composer/class-map-generator)) = 1.4.0 +Provides: bundled(php-composer(composer/composer)) = dev-main +Provides: bundled(php-composer(composer/metadata-minifier)) = 1.0.0 +Provides: bundled(php-composer(composer/pcre)) = 3.3.1 +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(guzzlehttp/guzzle)) = 7.9.2 +Provides: bundled(php-composer(guzzlehttp/promises)) = 2.0.4 +Provides: bundled(php-composer(guzzlehttp/psr7)) = 2.7.0 +Provides: bundled(php-composer(illuminate/container)) = v10.48.22 +Provides: bundled(php-composer(illuminate/contracts)) = v10.48.22 +Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.3.0 +Provides: bundled(php-composer(psr/container)) = 2.0.2 +Provides: bundled(php-composer(psr/http-client)) = 1.0.3 +Provides: bundled(php-composer(psr/http-factory)) = 1.1.0 +Provides: bundled(php-composer(psr/http-message)) = 2.0 +Provides: bundled(php-composer(psr/log)) = 3.0.2 +Provides: bundled(php-composer(psr/simple-cache)) = 3.0.0 +Provides: bundled(php-composer(ralouphie/getallheaders)) = 3.0.3 +Provides: bundled(php-composer(react/promise)) = v3.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)) = v6.4.13 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/filesystem)) = v6.4.13 +Provides: bundled(php-composer(symfony/finder)) = v6.4.13 +Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php73)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php81)) = v1.31.0 +Provides: bundled(php-composer(symfony/process)) = v6.4.13 +Provides: bundled(php-composer(symfony/service-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/string)) = v6.4.13 +Provides: bundled(php-composer(webmozart/assert)) = 1.11.0 # Composer library Provides: php-composer(php/pie) = %{version} @@ -138,7 +142,11 @@ Documentation: /usr/share/doc/pie/docs/usage.md %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p1 -b .rpm -find . \( -name \*.rpm -o -name \*noxdg \) -delete -print +%patch -P1 -p1 -b .noxdg +%patch -P2 -p1 -b .nocacert +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 @@ -156,7 +164,7 @@ php -r ' foreach($pkgs["packages"] as $pkg) { $lic = implode(" and ", $pkg["license"]); if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]); } foreach($res as $lic => $lib) { sort($lib); @@ -203,6 +211,10 @@ done %changelog +* Wed Oct 30 2024 Remi Collet <remi@remirepo.net> - 0.1.0-2 +- refresh dependencies +- add patches from composer to skip XDG and drop bundled cacert.rpm + * Thu Oct 10 2024 Remi Collet <remi@remirepo.net> - 0.1.0-1 - update to 0.1.0 (pre-release) |