Skip to content

[autobackport: sssd-2-9] Use macro rather than shell expansion for string processing in spec file#8520

Merged
alexey-tikhonov merged 2 commits into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8511-to-sssd-2-9
Mar 20, 2026
Merged

[autobackport: sssd-2-9] Use macro rather than shell expansion for string processing in spec file#8520
alexey-tikhonov merged 2 commits into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8511-to-sssd-2-9

Conversation

@sssd-bot

Copy link
Copy Markdown
Contributor

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

git remote add sssd-bot [email protected]:sssd-bot/sssd.git
git fetch sssd-bot refs/heads/SSSD-sssd-backport-pr8511-to-sssd-2-9
git checkout SSSD-sssd-backport-pr8511-to-sssd-2-9
git push sssd-bot SSSD-sssd-backport-pr8511-to-sssd-2-9 --force

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

  • 29098c2 - CONFLICT! Use macro rather than shell expansion for string processing in spec file
  • f21cec3 - Add a default for %samba_package_version

Conflicting Files Information (check for deleted and re-added files)

  • CONFLICT! Use macro rather than shell expansion for string processing in spec file
On branch SSSD-sssd-backport-pr8511-to-sssd-2-9
You are currently cherry-picking commit f9697d4ff.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   contrib/sssd.spec.in

no changes added to commit (use "git add" and/or "git commit -a")

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.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment thread contrib/sssd.spec.in Outdated
@thalman
thalman force-pushed the SSSD-sssd-backport-pr8511-to-sssd-2-9 branch 2 times, most recently from df2b025 to 6b297f6 Compare March 16, 2026 14:46
@alexey-tikhonov

Copy link
Copy Markdown
Member

I would suggest to squash 8e67d7e and ebfa0f1

@thalman
thalman force-pushed the SSSD-sssd-backport-pr8511-to-sssd-2-9 branch from ebfa0f1 to cad04a1 Compare March 20, 2026 08:31

@ikerexxe ikerexxe left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@alexey-tikhonov

alexey-tikhonov commented Mar 20, 2026

Copy link
Copy Markdown
Member

Looks good, thanks.

Would it make things easier to add 'backport-to-sssd-2-9-4' label here and to close #8522?

@alexey-tikhonov

Copy link
Copy Markdown
Member

It also needs to be moved out of Draft.

@thalman
thalman marked this pull request as ready for review March 20, 2026 09:22
@alexey-tikhonov alexey-tikhonov added the no-backport This should go to target branch only. label Mar 20, 2026
nforro added 2 commits March 20, 2026 10:21
Based on commit f9697d4. But %gsub macro
is not present in older (el9) version therefore we use %{lua:} to do
the same thing.

Reviewed-by: Iker Pedrosa <[email protected]>
Signed-off-by: Nikola Forró <[email protected]>
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit caa0ec2)
Reviewed-by: Iker Pedrosa <[email protected]>
@sssd-bot

Copy link
Copy Markdown
Contributor Author

The pull request was accepted by @alexey-tikhonov with the following PR CI status:


🟢 CodeQL (success)
🟢 rpm-build:centos-stream-9-x86_64:upstream (success)
🟢 Build / make-distcheck (success)
🟢 ci / prepare (success)
🟡 ci / system (centos-9) (in_progress)
🟢 Static code analysis / codeql (success)
🟢 Static code analysis / pre-commit (success)
🟢 Static code analysis / python-system-tests (success)


There are unsuccessful or unfinished checks. Make sure that the failures are not related to this pull request before merging.

@sssd-bot
sssd-bot force-pushed the SSSD-sssd-backport-pr8511-to-sssd-2-9 branch from cad04a1 to 7dcf233 Compare March 20, 2026 10:21
@alexey-tikhonov
alexey-tikhonov merged commit 16794c2 into SSSD:sssd-2-9 Mar 20, 2026
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Accepted no-backport This should go to target branch only.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants