From 5fff8c5069f6245a8d40c9915631f9330901817c Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 20 Nov 2024 10:21:43 -0500 Subject: [PATCH] Drop virtual provides from php module packages Some of the php modules had virtual provides. The intent of such a thing would be so that a process could 'apk add php-amqp' and get a sane result. The implementation had a problem where by doing so would choose whichever php-8.X-amqp version had the newest package version. That is almost certainly _not_ what the process wanted (one day to get php-8.2-ampq and the next to get php-8.1-ampq). https://github.com/wolfi-dev/os/issues/32874 describes the problem and a solution. https://github.com/wolfi-dev/os/pull/34680 implemented that solution. In the PR we realized that the provides were so inconsistent that it would be had to use the. So then, given the option of making them consistent or dropping them, we chose to drop them. --- php-8.1-amqp.yaml | 5 +---- php-8.1-igbinary.yaml | 10 ++-------- php-8.1-redis.yaml | 10 ++-------- php-8.2-amqp.yaml | 5 +---- php-8.3-amqp.yaml | 7 +------ php-8.3-apcu.yaml | 7 +------ php-8.3-excimer.yaml | 9 ++------- php-8.3-grpc.yaml | 7 +------ php-8.3-igbinary.yaml | 12 ++---------- php-8.3-imagick.yaml | 9 ++------- php-8.3-memcached.yaml | 14 +++----------- php-8.3-msgpack.yaml | 12 ++---------- php-8.3-opentelemetry.yaml | 7 +------ php-8.3-redis.yaml | 12 ++---------- php-8.3-swoole.yaml | 7 +------ 15 files changed, 24 insertions(+), 109 deletions(-) diff --git a/php-8.1-amqp.yaml b/php-8.1-amqp.yaml index 828c75b0071..06217334cc0 100644 --- a/php-8.1-amqp.yaml +++ b/php-8.1-amqp.yaml @@ -1,7 +1,7 @@ package: name: php-8.1-amqp version: 2.1.2 - epoch: 2 + epoch: 3 description: "PHP extension to communicate with any AMQP compliant server" copyright: - license: PHP-3.01 @@ -51,9 +51,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-amqp-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" diff --git a/php-8.1-igbinary.yaml b/php-8.1-igbinary.yaml index e49a430353e..baff0e2380e 100644 --- a/php-8.1-igbinary.yaml +++ b/php-8.1-igbinary.yaml @@ -1,7 +1,7 @@ package: name: php-8.1-igbinary version: 3.2.16 - epoch: 2 + epoch: 3 description: "Igbinary is a drop in replacement for the standard php serializer." copyright: - license: BSD-3-Clause @@ -49,19 +49,13 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-igbinary-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" echo "extension=igbinary.so" > "${{targets.subpkgdir}}/etc/php/conf.d/igbinary.ini" - name: ${{package.name}}-dev - description: PHP ${{vars.phpMM}} igbinary development headers - dependencies: - provides: - - php-igbinary-dev=${{package.full-version}} + description: "PHP ${{vars.phpMM}} igbinary development headers" pipeline: - uses: split/dev diff --git a/php-8.1-redis.yaml b/php-8.1-redis.yaml index 21766ce9031..23e55568b2c 100644 --- a/php-8.1-redis.yaml +++ b/php-8.1-redis.yaml @@ -1,7 +1,7 @@ package: name: php-8.1-redis version: 6.1.0 - epoch: 2 + epoch: 3 description: "A PHP extension for Redis" copyright: - license: PHP-3.01 @@ -49,19 +49,13 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-redis-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" echo "extension=redis.so" > "${{targets.subpkgdir}}/etc/php/conf.d/redis.ini" - name: ${{package.name}}-dev - description: PHP ${{vars.phpMM}} redis development headers - dependencies: - provides: - - php-redis-dev=${{package.full-version}} + description: "PHP ${{vars.phpMM}} redis development headers" pipeline: - uses: split/dev diff --git a/php-8.2-amqp.yaml b/php-8.2-amqp.yaml index 695e3023f44..26a34abad4d 100644 --- a/php-8.2-amqp.yaml +++ b/php-8.2-amqp.yaml @@ -1,7 +1,7 @@ package: name: php-8.2-amqp version: 2.1.2 - epoch: 2 + epoch: 3 description: "PHP extension to communicate with any AMQP compliant server" copyright: - license: PHP-3.01 @@ -51,9 +51,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-amqp-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" diff --git a/php-8.3-amqp.yaml b/php-8.3-amqp.yaml index d4af202e987..e7ead815249 100644 --- a/php-8.3-amqp.yaml +++ b/php-8.3-amqp.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-amqp version: 2.1.2 - epoch: 2 + epoch: 3 description: "PHP extension to communicate with any AMQP compliant server" copyright: - license: PHP-3.01 @@ -10,8 +10,6 @@ package: - ${{package.name}}-config - php-${{vars.phpMM}} - rabbitmq-c - provides: - - php-amqp=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -53,9 +51,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-amqp-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" diff --git a/php-8.3-apcu.yaml b/php-8.3-apcu.yaml index eb8f584c389..ae08169c271 100644 --- a/php-8.3-apcu.yaml +++ b/php-8.3-apcu.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-apcu version: 5.1.24 - epoch: 1 + epoch: 2 description: "PHP extension for User Cache" copyright: - license: PHP-3.01 @@ -9,8 +9,6 @@ package: runtime: - ${{package.name}}-config - php-${{vars.phpMM}} - provides: - - php-apcu=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -48,9 +46,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-apcu-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" diff --git a/php-8.3-excimer.yaml b/php-8.3-excimer.yaml index a76196dc1a1..9f763a54c4f 100644 --- a/php-8.3-excimer.yaml +++ b/php-8.3-excimer.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-excimer version: 1.2.3 - epoch: 0 + epoch: 1 description: "Excimer is a PHP extension that provides an interrupting timer and a low-overhead sampling profiler." copyright: - license: Apache-2.0 @@ -9,8 +9,6 @@ package: runtime: - ${{package.name}}-config - php-${{vars.phpMM}} - provides: - - php-excimer=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -31,7 +29,7 @@ pipeline: - uses: git-checkout with: repository: https://github.com/wikimedia/mediawiki-php-excimer - tag: "${{package.version}}" + tag: ${{package.version}} expected-commit: c52285d4e29be23dfbf54591ed23ad822ec02de0 - name: Prepare build @@ -51,9 +49,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-excimer-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" diff --git a/php-8.3-grpc.yaml b/php-8.3-grpc.yaml index 2a2c60ff291..6a8af115606 100644 --- a/php-8.3-grpc.yaml +++ b/php-8.3-grpc.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-grpc version: 1.68.0 - epoch: 0 + epoch: 1 description: "A PHP extension for gRPC" copyright: - license: Apache-2.0 @@ -10,8 +10,6 @@ package: - ${{package.name}}-config - grpc - php-${{vars.phpMM}} - provides: - - php-grpc=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -49,9 +47,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-grpc-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" diff --git a/php-8.3-igbinary.yaml b/php-8.3-igbinary.yaml index f44f292aaca..61ff21a873f 100644 --- a/php-8.3-igbinary.yaml +++ b/php-8.3-igbinary.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-igbinary version: 3.2.16 - epoch: 2 + epoch: 3 description: "Igbinary is a drop in replacement for the standard php serializer." copyright: - license: BSD-3-Clause @@ -9,8 +9,6 @@ package: runtime: - ${{package.name}}-config - php-${{vars.phpMM}} - provides: - - php-igbinary=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -51,19 +49,13 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-igbinary-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" echo "extension=igbinary.so" > "${{targets.subpkgdir}}/etc/php/conf.d/igbinary.ini" - name: ${{package.name}}-dev - description: PHP ${{vars.phpMM}} igbinary development headers - dependencies: - provides: - - php-igbinary-dev=${{package.full-version}} + description: "PHP ${{vars.phpMM}} igbinary development headers" pipeline: - uses: split/dev diff --git a/php-8.3-imagick.yaml b/php-8.3-imagick.yaml index 128aa72f0fe..28548fd0da1 100644 --- a/php-8.3-imagick.yaml +++ b/php-8.3-imagick.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-imagick version: 3.7.0 - epoch: 3 + epoch: 4 description: "PHP extension for ImageMagick" copyright: - license: PHP-3.01 @@ -10,8 +10,6 @@ package: - ${{package.name}}-config - imagemagick - php-${{vars.phpMM}} - provides: - - php-imagick=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -33,7 +31,7 @@ pipeline: - uses: git-checkout with: repository: https://github.com/Imagick/imagick - tag: "${{package.version}}" + tag: ${{package.version}} expected-commit: 52ec37ff633de0e5cca159a6437b8c340afe7831 - name: Prepare build @@ -50,9 +48,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-imagick-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" diff --git a/php-8.3-memcached.yaml b/php-8.3-memcached.yaml index 477c8a5343c..0506da2365f 100644 --- a/php-8.3-memcached.yaml +++ b/php-8.3-memcached.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-memcached version: 3.3.0 - epoch: 2 + epoch: 3 description: "A PHP extension for Memcached" copyright: - license: PHP-3.01 @@ -9,8 +9,6 @@ package: runtime: - ${{package.name}}-config - php-${{vars.phpMM}} - provides: - - php-memcached=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -34,7 +32,7 @@ pipeline: - uses: git-checkout with: repository: https://github.com/php-memcached-dev/php-memcached - tag: v${{package.version}} + tag: "v${{package.version}}" expected-commit: b0b82692d789a2a5fd95b3910e87f73615c0f918 - name: Prepare build @@ -51,19 +49,13 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-memcached-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" echo "extension=memcached.so" > "${{targets.subpkgdir}}/etc/php/conf.d/memcached.ini" - name: ${{package.name}}-dev - description: PHP ${{vars.phpMM}} memcached development headers - dependencies: - provides: - - php-memcached-dev=${{package.full-version}} + description: "PHP ${{vars.phpMM}} memcached development headers" pipeline: - uses: split/dev diff --git a/php-8.3-msgpack.yaml b/php-8.3-msgpack.yaml index 7c1cbacc348..84d3a0075b8 100644 --- a/php-8.3-msgpack.yaml +++ b/php-8.3-msgpack.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-msgpack version: 3.0.0 - epoch: 2 + epoch: 3 description: "A PHP extension for msgpack" copyright: - license: BSD-3-Clause @@ -9,8 +9,6 @@ package: runtime: - ${{package.name}}-config - php-${{vars.phpMM}} - provides: - - php-msgpack=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -49,19 +47,13 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-msgpack-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" echo "extension=msgpack.so" > "${{targets.subpkgdir}}/etc/php/conf.d/msgpack.ini" - name: ${{package.name}}-dev - description: PHP ${{vars.phpMM}} msgpack development headers - dependencies: - provides: - - php-msgpack-dev=${{package.full-version}} + description: "PHP ${{vars.phpMM}} msgpack development headers" pipeline: - uses: split/dev diff --git a/php-8.3-opentelemetry.yaml b/php-8.3-opentelemetry.yaml index 8eba90c7b27..f261af98899 100644 --- a/php-8.3-opentelemetry.yaml +++ b/php-8.3-opentelemetry.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-opentelemetry version: 1.1.0 - epoch: 1 + epoch: 2 description: "OpenTelemetry PHP auto-instrumentation extension" copyright: - license: Apache-2.0 @@ -9,8 +9,6 @@ package: runtime: - ${{package.name}}-config - php-${{vars.phpMM}} - provides: - - php-opentelemetry=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -51,9 +49,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-opentelemetry-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" diff --git a/php-8.3-redis.yaml b/php-8.3-redis.yaml index 215e017bf3d..172a55f8f33 100644 --- a/php-8.3-redis.yaml +++ b/php-8.3-redis.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-redis version: 6.1.0 - epoch: 2 + epoch: 3 description: "A PHP extension for Redis" copyright: - license: PHP-3.01 @@ -10,8 +10,6 @@ package: - ${{package.name}}-config - php-${{vars.phpMM}} - php-${{vars.phpMM}}-igbinary - provides: - - php-redis=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -50,19 +48,13 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-redis-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d" echo "extension=redis.so" > "${{targets.subpkgdir}}/etc/php/conf.d/redis.ini" - name: ${{package.name}}-dev - description: PHP ${{vars.phpMM}} redis development headers - dependencies: - provides: - - php-redis-dev=${{package.full-version}} + description: "PHP ${{vars.phpMM}} redis development headers" pipeline: - uses: split/dev diff --git a/php-8.3-swoole.yaml b/php-8.3-swoole.yaml index ef5fde41c07..54500daff43 100644 --- a/php-8.3-swoole.yaml +++ b/php-8.3-swoole.yaml @@ -1,7 +1,7 @@ package: name: php-8.3-swoole version: 5.1.5 - epoch: 1 + epoch: 2 description: "Coroutine-based concurrency library for PHP" copyright: - license: Apache-2.0 @@ -10,8 +10,6 @@ package: - ${{package.name}}-config - brotli - php-${{vars.phpMM}} - provides: - - php-swoole=${{package.full-version}} var-transforms: - from: ${{package.name}} @@ -53,9 +51,6 @@ pipeline: subpackages: - name: ${{package.name}}-config - dependencies: - provides: - - php-swoole-config=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"