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

cpio: 2.13 -> 2.14 #229377

Merged
merged 1 commit into from
May 6, 2023
Merged

cpio: 2.13 -> 2.14 #229377

merged 1 commit into from
May 6, 2023

Conversation

eliasnaur
Copy link
Contributor

Description of changes

Changelog: https://git.savannah.gnu.org/cgit/cpio.git/tree/NEWS

Personally, I'm interested in the hard link fix to --reproducible.

Question for reviewers: is the cygwin patch,

  preConfigure = lib.optionalString stdenv.isCygwin ''
    sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
  '';

still necessary? I don't see a gnu/fpending.h file in the tarball.

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
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 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.

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.

Question for reviewers: is the cygwin patch,

  preConfigure = lib.optionalString stdenv.isCygwin ''
    sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
  '';

still necessary? I don't see a gnu/fpending.h file in the tarball.

Are you sure? I'm seeing the file and patched content is present in the file in the tarball.

pkgs/tools/archivers/cpio/default.nix Show resolved Hide resolved
Changelog: https://git.savannah.gnu.org/cgit/cpio.git/tree/NEWS#n7

Includes fix for CVE-2021-38185,
https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dd96882877721703e19272fe25034560b794061b

For me, I'm interested in the `--reproducible` fix for hard link counts
being dependent on the underlying filesystem.
@eliasnaur
Copy link
Contributor Author

Question for reviewers: is the cygwin patch,

  preConfigure = lib.optionalString stdenv.isCygwin ''
    sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
  '';

still necessary? I don't see a gnu/fpending.h file in the tarball.

Are you sure? I'm seeing the file and patched content is present in the file in the tarball.

You're right, I was looking in the source tarball, not the release tarball.

Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

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

Built rpm on nixos x86_64, git.tests.withInstallCheck on macos 10.15 & nixos x86_64. Built pkgsStatic variant, pkgsMusl variant, pkgsCross.aarch64-multiplatform variant. Builds on aarch64-linux.

@risicle risicle merged commit 5303a4d into NixOS:staging May 6, 2023
@eliasnaur eliasnaur deleted the cpio-2.14 branch May 6, 2023 13:26
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.

3 participants