Skip to content

Conversation

@aaruag
Copy link
Contributor

@aaruag aaruag commented Oct 1, 2025

This is an auto-generated pull request to cherry-pick commit 8ce78fb to 3.0-dev. Original PR: #14485

@aaruag aaruag added the Auto Fast-track Cherry-pick Automatic cherry-pick from fast-track branch label Oct 1, 2025
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Oct 1, 2025
@CBL-Mariner-Bot
Copy link
Collaborator

✅ PR Check Passed

No critical issues detected in spec file changes.

🤖 AI Analysis Summary:

Brief Analysis:
The changes introduce conflicting merge markers in both patch files and the spec file, resulting in inconsistent release version and patch content. While all referenced CVE patch files appear present, the merge conflicts must be resolved.

Critical Issues Found:
• ERROR: Unresolved merge conflict markers (<<<<<, =======, >>>>>) in both the patch file and the spec file.

Recommended Actions:
• Remove all merge conflict markers and finalize the intended patch content and spec metadata (e.g., consistent Release value).
• Verify that each CVE patch (CVE-2025-1550, CVE-2025-8747, CVE-2025-9905, and the nopatch for CVE-2025-9906) is applied correctly via %autosetup.
• Update the changelog entries to match the resolved patch set and ensure proper upstream attributions.


📋 For detailed analysis and recommendations, check the Azure DevOps pipeline logs.

@PawelWMS PawelWMS closed this Oct 2, 2025
@PawelWMS PawelWMS deleted the cblmargh/cherry-pick-pr-14485-to-3.0-dev branch October 2, 2025 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Auto Fast-track Cherry-pick Automatic cherry-pick from fast-track branch Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants