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

stunnel: 5.64 -> 5.65 #183617

Merged
merged 2 commits into from
Jul 30, 2022
Merged

stunnel: 5.64 -> 5.65 #183617

merged 2 commits into from
Jul 30, 2022

Conversation

chkno
Copy link
Member

@chkno chkno commented Jul 29, 2022

Description of changes

From the NEWS file:

Version 5.65, 2022.07.17, urgency: HIGH
  • Security bugfixes
    • OpenSSL DLLs updated to version 3.0.5.
  • Bugfixes
    • Fixed handling globally enabled FIPS.
    • Fixed openssl.cnf processing in WIN32 GUI.
    • Fixed a number of compiler warnings.
    • Fixed tests on older versions of OpenSSL.

The "urgency: HIGH" security fix in this release only affects Microsoft Windows builds, but upstream has pulled down the tarball for 5.64 that contains the (windows-affecting) security problem, which means that this package cannot be fetched & built until this version bump is merged (though most users will still be able to fetch from tarballs.nixos.org)

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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
    I'm not sure I have enough RAM for this.
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

FYI Maintainer: @thoughtpolice

sha256 = "sha256-7r5T7RFrpDsueGdisMK5FRHnt0hXrUdlgk5xmeb6+IM=";
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
sha256 = "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc";
# please use the contents of "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz.sha256",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# please use the contents of "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz.sha256",
# please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256",

sha256 = "sha256-7r5T7RFrpDsueGdisMK5FRHnt0hXrUdlgk5xmeb6+IM=";
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
sha256 = "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc";
# please use the contents of "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
Copy link
Member

Choose a reason for hiding this comment

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

FYI well, yeah but no. If nix-prefetch-url shows a different hash that will not work

Copy link
Member Author

Choose a reason for hiding this comment

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

I think that was the point of this advice? If the server's .sha256 file and nix-prefetch-url produce different results, something has gone wrong and one shouldn't just charge ahead with whatever nix-prefetch-url says, but stop to figure out what the trouble is.

My thought in updating this advice was to follow the name -> pname+version change (46420bb) so that the suggested action was easier to perform by copy/pasting the pname and version lines into a shell to set the variables so then one could copy/paste the advice's URL and have it expand correctly.

I've reverted the change to the advice comment to keep this PR narrowly focused on the version bump that's required to fix the build for non-tarball-cache-users.

@SuperSandro2000 SuperSandro2000 merged commit f6d7bf0 into NixOS:master Jul 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants