Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport 1.0.2 #1246

Merged
merged 5 commits into from
Feb 14, 2025
Merged

Backport 1.0.2 #1246

merged 5 commits into from
Feb 14, 2025

Conversation

legoktm
Copy link
Member

@legoktm legoktm commented Feb 13, 2025

Status

Ready for review

Description of Changes

Cherry-pick fixes from the 1.0.2 release.

Testing

  • Visual review
  • CI passes

(cherry picked from commit d9a984a)
@rocodes rocodes self-assigned this Feb 13, 2025
@rocodes rocodes self-requested a review February 13, 2025 20:15
rocodes
rocodes previously approved these changes Feb 13, 2025
Copy link
Contributor

@rocodes rocodes left a comment

Choose a reason for hiding this comment

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

Approved based on visual review, pending CI.

rocodes and others added 3 commits February 13, 2025 15:32
…se sd-install-epoch feature to determine whether VM requires rebuild.

Fail hard if sd-log cannot be correctly configured. Declare and document sd-log requisites.

Co-authored by: @deeplow

(cherry picked from commit adb3b01)
Based on the keyring tests in securedrop-client, add a test for the PGP
key embedded in apt_freedom_press.sources and the key for dom0.

It verifies only one key is present, it has the fingerprint we expect,
it has a 2027 expiry, and the expiry is more than 6 months from now.

(cherry picked from commit 8ac30ec)
@legoktm
Copy link
Member Author

legoktm commented Feb 13, 2025

I made a mistake when cherry-picking the sd-log patch, there was a new features.set stanza later on in the file which overwrote the one we added to set the epoch. Should be fixed now!

(cherry picked from commit dae9bb2)
@rocodes
Copy link
Contributor

rocodes commented Feb 14, 2025

Merging and tracking CI issue separately in #1247

@rocodes rocodes added this pull request to the merge queue Feb 14, 2025
Merged via the queue into main with commit d7da1cc Feb 14, 2025
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants