[autobackport: sssd-2-9] Use macro rather than shell expansion for string processing in spec file#8520
Conversation
There was a problem hiding this comment.
Code Review
This pull request contains an unresolved merge conflict in contrib/sssd.spec.in. The conflict markers have been committed directly into the file, which makes it invalid and will break the build. This is a critical issue that must be resolved before merging.
contrib/sssd.spec.in
Outdated
| <<<<<<< HEAD | ||
| Version: %{downstream_version} | ||
| ======= | ||
| Version: %{gsub @PACKAGE_VERSION@ - ~} | ||
| >>>>>>> f9697d4ff (Use macro rather than shell expansion for string processing in spec file) |
There was a problem hiding this comment.
This block contains unresolved merge conflict markers (<<<<<<<, =======, >>>>>>>). This makes the spec file invalid and must be resolved. The intention of the original change was to replace a shell expansion with an RPM macro. The correct resolution is to use the gsub macro. Also, the syntax for gsub in the conflict seems incorrect. The correct line should be Version: %{gsub:@PACKAGE_VERSION@:-:~}. As part of this change, the %global downstream_version definition on line 8 should also be removed.
Version: %{gsub:@PACKAGE_VERSION@:-:~}
f21cec3 to
df2b025
Compare
df2b025 to
6b297f6
Compare
This is an automatic backport of PR#8511 Use macro rather than shell expansion for string processing in spec file to branch sssd-2-9, created by @nforro.
Caution
@nforro The patches did not apply cleanly. It is necessary to resolve conflicts before merging this pull request. Commits that introduced conflict are marked with
CONFLICT!.You can push changes to this pull request
Original commits
f9697d4 - Use macro rather than shell expansion for string processing in spec file
caa0ec2 - Add a default for %samba_package_version
Backported commits
Conflicting Files Information (check for deleted and re-added files)
Original Pull Request Body
We've hardened security in Packit Service and shell expansions in spec files are now rejected as they can be used to execute arbitrary code. There is no need to use shell expansion for string processing, there is an existing macro for this very purpose.