Fix build with rpm >= 4.19 #1601
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These APIs have been obsolete for years and now removed in rpm 4.19. Luckily the usage here is entirely redundant, rpmKeyringAddKey() checks for duplicates and that case is even handled in this code.
…le() These APIs have been obsolete for years and now removed in rpm 4.19. This was always a rather strange way to go at verifying a package, but now also wholly redundant because the signature are already verified by rpmcliVerifySignatures().
|
Hmm, actually the rpmReadPackageFile() call is also totally redundant here, because it's now only used for checking digests. Which could be just as well left for rpmcliVerifySignatures() (but currently isn't because this is supposed to be about checking signatures only). |
|
The last two commits can be merged if you prefer that, but left them separate for now as that may make it easier to see what's going on. |
|
Just FWIW, we're building the rpm 4.19 alpha in Fedora initially with these APIs brought back, so take your time reviewing this. I get that this is a somewhat touchy area. |
jan-kolarik
reviewed
May 15, 2023
libdnf/dnf-keyring.cpp
Outdated
| @@ -271,7 +270,7 @@ dnf_keyring_check_untrusted_file(rpmKeyring keyring, | |||
| g_set_error_literal(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR, "failed to set keyring"); | |||
| goto out; | |||
| } | |||
| rpmtsSetVfyLevel(ts, RPMSIG_SIGNATURE_TYPE); | |||
| rpmtsSetVfyLevel(ts, RPMSIG_SIGNATURE_TYPE|RPMSIG_DIGEST_TYPE); | |||
|
I've dropped the last commit related to the discussed change for now and we could deliver it as a separate PR then. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove uses of long obsoleted APIs which have been removed in rpm 4.19. Besides obsolete, this is just redundant fluff as well because the surrounding code already takes care of it all.