Skip to content

Require the php2shell fix on arm64 and publish the patch version tags again - #425

Draft
mistraloz wants to merge 3 commits into
thecodingmachine:v5from
mistraloz:fix/patch-version-tags
Draft

mistraloz wants to merge 3 commits into
thecodingmachine:v5from
mistraloz:fix/patch-version-tags

Conversation

@mistraloz

@mistraloz mistraloz commented Oct 23, 2026 •

Copy link
Copy Markdown
Collaborator

Follow-up of #424, to merge once packages.sury.org has the php2shell fix for arm64 (deb.sury.org#145).

This PR fixes/implements :

  • Bug
  • Feature
  • Breaking changes

Changes:

  • arm64: the php2shell test fails again on arm64 instead of warning. The README and the php2shell page get an update note: the arm64 images are fixed too and must be pulled again.
  • Patch version tags: 8.5.12-v5-cli & co. have not been published since 2025-12-10. Since 54426bf, the publish step builds the patch tag without IS_RELEASE=1, so the bake file drops it and the X.Y tag is copied twice. Fixed in workflow.yml and legacy-v5.yml.
  • 7.4, 8.0 and 8.1: the backport keeps the version number, so the fixed images are tagged X.Y.Z-php2shell-v5-* and the existing 7.4.33-v5-* / 8.0.30-v5-* tags stay untouched. One-off, for this fix only.

Older patch tags (e.g. 8.5.0-v5-cli) stay as they are: they are immutable.

Test plan (required)

  • Tag computation checked with docker buildx bake --print for slim, fat and node targets: X.Y.Z-v5-* for 8.2+, X.Y.Z-php2shell-v5-* for 7.4 to 8.1, X.Y-v5-* unchanged.
  • After the merge and the legacy-v5.yml run: 8.5.12-v5-cli and 7.4.33-php2shell-v5-cli exist on amd64 and arm64, 7.4.33-v5-cli is unchanged.

Checklist

  • I followed the guidelines in CONTRIBUTING guide

  • I have squashed any insignificant commits

  • This change has comments for package types, values, functions, and non-obvious lines of code

  • Fixed PHP packages available on packages.sury.org for Ubuntu noble:

    PHP Fixed package amd64 arm64
    7.4 7.4.33-31 ✅ ✅
    8.0 8.0.30-25 ✅ ✅
    8.1 8.1.34-9 ✅ ✅
    8.2 8.2.35-1 ✅ ⏳
    8.3 8.3.36-1 ✅ ⏳
    8.4 8.4.27-1 ✅ ⏳
    8.5 8.5.12-1 ✅ ⏳

Since the multi-arch build was split (54426bf), the tag of the PHP patch
version was computed without IS_RELEASE: the bake file then drops it and
the first tag is the X.Y one. The X.Y tag was copied twice and no
X.Y.Z-v5-* tag was published since 2025-12-10.

Compute it with IS_RELEASE=1 and take the second tag, which is the patch
version one.
packages.sury.org now publishes the fixed PHP packages for arm64: a
vulnerable arm64 image fails the php2shell test again instead of only
emitting a warning, and the docs no longer say that the arm64 images
are not fixed.

The php2shell backport keeps the version number of PHP 7.4, 8.0 and
8.1: tag their fixed images X.Y.Z-php2shell-v5-* in the legacy workflow,
so that the existing X.Y.Z-v5-* tags stay unchanged.
@mistraloz mistraloz changed the title Publish the tags of the PHP patch versions again Require the php2shell fix on arm64 and publish the patch version tags again Oct 23, 2026
Readers of the first php2shell note were told that the arm64 images
were not fixed: tell them that they are now, and to pull them again.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant