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

cadaver: Fix building with current openssl #115329

Merged
merged 1 commit into from Mar 7, 2021
Merged

Conversation

clkamp
Copy link
Contributor

@clkamp clkamp commented Mar 7, 2021

...by using the already-packaged (newer) version of neon as it is also done for
openSUSE[1].

[1] https://build.opensuse.org/package/show/openSUSE:Factory/cadaver

Motivation for this change

This package was broken before, because it used an old version of openssl which has known vulnerabilities.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@wavewave

@r-rmcgibbo
Copy link

r-rmcgibbo commented Mar 7, 2021

Result of nixpkgs-review pr 115329 at fefb459e run on aarch64-linux 1

1 package built:
4 suggestions:
  • warning: build-tools-in-build-inputs

    pkg-config is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

    Near pkgs/tools/networking/cadaver/default.nix:22:3:

       |
    22 |   buildInputs = [ neon pkg-config readline zlib];
       |   ^
    
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/networking/cadaver/default.nix:12:5:

       |
    12 |     (fetchpatch {
       |     ^
    
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/networking/cadaver/default.nix:17:5:

       |
    17 |     ./configure.patch
       |     ^
    
  • warning: unclear-gpl

    gpl2 is a deprecated license, check if project uses gpl2Plus or gpl2Only and change meta.license accordingly.

    Near pkgs/tools/networking/cadaver/default.nix:28:5:

       |
    28 |     license     = licenses.gpl2;
       |     ^
    

Result of nixpkgs-review pr 115329 at fefb459e run on x86_64-linux 1

1 package built:
4 suggestions:
  • warning: build-tools-in-build-inputs

    pkg-config is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

    Near pkgs/tools/networking/cadaver/default.nix:22:3:

       |
    22 |   buildInputs = [ neon pkg-config readline zlib];
       |   ^
    
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/networking/cadaver/default.nix:12:5:

       |
    12 |     (fetchpatch {
       |     ^
    
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/networking/cadaver/default.nix:17:5:

       |
    17 |     ./configure.patch
       |     ^
    
  • warning: unclear-gpl

    gpl2 is a deprecated license, check if project uses gpl2Plus or gpl2Only and change meta.license accordingly.

    Near pkgs/tools/networking/cadaver/default.nix:28:5:

       |
    28 |     license     = licenses.gpl2;
       |     ^
    

...by using the already-packaged (newer) version of neon as it is also done for
openSUSE[1].

[1] https://build.opensuse.org/package/show/openSUSE:Factory/cadaver
@@ -14,11 +14,15 @@ stdenv.mkDerivation rec {
name = "disable-sslv2.patch";
sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr";
})
# Cadaver also works with newer versions of neon than stated
# in the configure script
./configure.patch
Copy link
Member

Choose a reason for hiding this comment

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

Is there a way to let upstream know about this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Upstream seems to be rather dead last release was in 2009. Thanks for merging.

@Mic92 Mic92 merged commit bdfd32b into NixOS:master Mar 7, 2021
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

3 participants