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.

Sign up for GitHub

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

Jump to bottom

[Backport release-24.05] opensc: 0.25.1 -> 0.26.0 #355910

Merged
merged 1 commit into from
Nov 28, 2024
Merged

[Backport release-24.05] opensc: 0.25.1 -> 0.26.0 #355910

merged 1 commit into from
Nov 28, 2024

Conversation

michaeladler
Copy link
Member

Backport of #345666

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@michaeladler michaeladler added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Nov 14, 2024
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Nov 15, 2024
@numinit
Copy link
Contributor

numinit commented Nov 17, 2024

Rename this to [Backport release-24.05] opensc: 0.25.1 -> 0.26.0

@numinit
Copy link
Contributor

numinit commented Nov 17, 2024

Do you mind doing the same cherry picks against 24.11?

Anyway, LGTM:

Result of nixpkgs-review pr 355910 run on x86_64-linux 1

15 packages built:
  • chrome-token-signing
  • hw-probe
  • libdigidocpp
  • libdigidocpp.bin
  • libdigidocpp.dev
  • libdigidocpp.lib
  • opensc
  • pkcs11-provider
  • qdigidoc
  • rng-tools
  • step-kms-plugin
  • tpm2-pkcs11
  • tpm2-pkcs11.bin
  • tpm2-pkcs11.dev
  • vmware-horizon-client

@numinit numinit self-requested a review November 17, 2024 06:36
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 17, 2024
@michaeladler michaeladler changed the title Backport 345666 to release 24.05 [Backport release-24.05] opensc: 0.25.1 -> 0.26.0 Nov 17, 2024
@michaeladler
Copy link
Member Author

Do you mind doing the same cherry picks against 24.11?

@numinit If you mean release-24.11 then I think there's nothing to do because the branch already contains the relevant commits

@numinit
Copy link
Contributor

numinit commented Nov 17, 2024

Ah, I must have misread. Thanks for checking.

@michaeladler michaeladler force-pushed the backport-345666-to-release-24.05 branch from 956248e to 9a08ea1 Compare November 22, 2024 07:21
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 22, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 23, 2024
LeSuisse
LeSuisse reviewed Nov 26, 2024
View reviewed changes
Copy link
Contributor

@LeSuisse LeSuisse left a comment

Choose a reason for hiding this comment

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

Looks good, looks like one driver was disabled which might not be suitable for a backport to stable. Could we maybe revert OpenSC/OpenSC#3152?

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355910

x86_64-linux

✅ 15 packages built:
  • chrome-token-signing
  • hw-probe
  • libdigidocpp
  • libdigidocpp.bin
  • libdigidocpp.dev
  • libdigidocpp.lib
  • opensc
  • pkcs11-provider
  • qdigidoc
  • rng-tools
  • step-kms-plugin
  • tpm2-pkcs11
  • tpm2-pkcs11.bin
  • tpm2-pkcs11.dev
  • vmware-horizon-client

@michaeladler
opensc: 0.25.1 -> 0.26.0
f675efc 
Note: This also contains a patch to keep support for MICARDO cards.

(cherry picked from commit 2c2e671)
@michaeladler michaeladler force-pushed the backport-345666-to-release-24.05 branch from 9a08ea1 to f675efc Compare November 27, 2024 08:29
@michaeladler
Copy link
Member Author

Good catch. I guess the patch is simple enough to maintain it. Note that support for these MICARDO cards is still around if you add old to card_drivers in the configuration file. So technically it's not necessary but the user experience is nicer for sure if you don't have to change your configuration file.

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 27, 2024
LeSuisse
LeSuisse approved these changes Nov 28, 2024
View reviewed changes
Copy link
Contributor

@LeSuisse LeSuisse left a comment

Choose a reason for hiding this comment

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

Changes look good.

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355910

x86_64-linux

✅ 15 packages built:
  • chrome-token-signing
  • hw-probe
  • libdigidocpp
  • libdigidocpp.bin
  • libdigidocpp.dev
  • libdigidocpp.lib
  • opensc
  • pkcs11-provider
  • qdigidoc
  • rng-tools
  • step-kms-plugin
  • tpm2-pkcs11
  • tpm2-pkcs11.bin
  • tpm2-pkcs11.dev
  • vmware-horizon-client

@LeSuisse LeSuisse merged commit 08fa863 into NixOS:release-24.05 Nov 28, 2024
25 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LeSuisse LeSuisse LeSuisse approved these changes

@numinit numinit numinit approved these changes

Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@michaeladler @numinit @LeSuisse @wegank