Skip to content

Conversation

Ratiranjan5
Copy link

@Ratiranjan5 Ratiranjan5 commented Oct 7, 2025

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary
Change Log
  • new file: SPECS/ruby/CVE-2025-58767.patch
  • modified: SPECS/ruby/ruby.spec
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Pipeline build id: xxxx
image

@Ratiranjan5 Ratiranjan5 requested a review from a team as a code owner October 7, 2025 10:26
@Ratiranjan5 Ratiranjan5 marked this pull request as draft October 7, 2025 10:26
@Kanishk-Bansal
Copy link
Contributor

Buddy Build

@Kanishk-Bansal Kanishk-Bansal marked this pull request as ready for review October 7, 2025 11:27
@Ratiranjan5
Copy link
Author

Buddy Build

Buddy Build passed.

@bhagyapathak
Copy link
Contributor

  • Patch Modified: NO
  • Some hunk was failed, so applied them manually.

@Ratiranjan5 Could you please explain the reason for the original patch application failure and mention the modifications you made to the patch?

@Ratiranjan5
Copy link
Author

  • Patch Modified: NO
  • Some hunk was failed, so applied them manually.

@Ratiranjan5 Could you please explain the reason for the original patch application failure and mention the modifications you made to the patch?

The original patch failed to apply cleanly due to a mismatch in method usage within our codebase.

In the upstream patch, the condition was written as:
match?(/\s*/um, true)
Whereas in our local codebase, the equivalent line was:
match(/\s*/um, true)

Although both expressions check for whitespace, they differ in return type:

match? returns a boolean (true/false), while
match returns a MatchData object or nil.

This difference caused the hunk to not match during patch application, resulting in a conflict.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main Packaging security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants