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

openssh: 7.7p1 -> 7.9p1 #48784

Merged
merged 1 commit into from Oct 25, 2018
Merged

openssh: 7.7p1 -> 7.9p1 #48784

merged 1 commit into from Oct 25, 2018

Conversation

zimbatm
Copy link
Member

@zimbatm zimbatm commented Oct 21, 2018

added openssh_gssapi to make it easier to test the patched version

the HPN edition isn't available on top of 7.9p1 yet

fix-host-key-algorithms-plus.patch didn't apply anymore, assuming it's
fixed.

release notes: https://www.openssh.com/txt/release-7.9

/cc @aneeshusa

Motivation for this change

Package upgrade. Looks like we missed the 7.8p1 one, maybe because of all of the patches that make it annoying to upgrade?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@zimbatm
openssh: 7.7p1 -> 7.9p1
9d8950e 
added openssh_gssapi to make it easier to test the patched version

the HPN edition isn't available on top of 7.9p1 yet

fix-host-key-algorithms-plus.patch didn't apply anymore, assuming it's
fixed.

release notes: https://www.openssh.com/txt/release-7.9
@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: openssh

Partial log (click to expand)

building '/nix/store/0782dybi3wk39b41j447mpc2cdfxh9ni-curl-7.61.1.drv'...
/nix/store/ic9jk332yd71lwvgdwsi8jh4jjmw5j63-cctools-binutils-darwin-wrapper/nix-support/setup-hook: fork: retry: Resource temporarily unavailable
/nix/store/ic9jk332yd71lwvgdwsi8jh4jjmw5j63-cctools-binutils-darwin-wrapper/nix-support/setup-hook: fork: retry: Resource temporarily unavailable
/nix/store/ic9jk332yd71lwvgdwsi8jh4jjmw5j63-cctools-binutils-darwin-wrapper/nix-support/setup-hook: fork: retry: Resource temporarily unavailable
/nix/store/ic9jk332yd71lwvgdwsi8jh4jjmw5j63-cctools-binutils-darwin-wrapper/nix-support/setup-hook: fork: retry: Resource temporarily unavailable
/nix/store/ic9jk332yd71lwvgdwsi8jh4jjmw5j63-cctools-binutils-darwin-wrapper/nix-support/setup-hook: fork: Resource temporarily unavailable
builder for '/nix/store/0782dybi3wk39b41j447mpc2cdfxh9ni-curl-7.61.1.drv' failed with exit code 254
cannot build derivation '/nix/store/5yhqvcs98jw8v1gi18w1wankybcvisn4-openssh-7.9p1.tar.gz.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/rcinfnz94wwy0a52mq8z23xkjvdqywc0-openssh-7.9p1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/rcinfnz94wwy0a52mq8z23xkjvdqywc0-openssh-7.9p1.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: openssh

Partial log (click to expand)

shrinking /nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1/bin/ssh-add
shrinking /nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1/bin/scp
shrinking /nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1/bin/ssh
gzipping man pages under /nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1/libexec  /nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1/bin
patching script interpreter paths in /nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1
/nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1/bin/ssh-copy-id: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1...
/nix/store/yva1x98c92gacij62050xwwri3hs7s12-openssh-7.9p1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: openssh

Partial log (click to expand)

shrinking /nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1/bin/ssh
shrinking /nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1/bin/sshd
shrinking /nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1/bin/scp
gzipping man pages under /nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1/libexec  /nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1/bin
patching script interpreter paths in /nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1
/nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1/bin/ssh-copy-id: interpreter directive changed from "/bin/sh" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1...
/nix/store/x6zhfr43k3mndmy66rm84lyfk8y934zz-openssh-7.9p1

@zimbatm
Copy link
Member Author

zimbatm commented Oct 22, 2018

@GrahamcOfBorg build openssh_hpn openssh_gssapi

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: openssh_hpn, openssh_gssapi

Partial log (click to expand)

/nix/store/ic9jk332yd71lwvgdwsi8jh4jjmw5j63-cctools-binutils-darwin-wrapper/nix-support/setup-hook: fork: retry: Resource temporarily unavailable
/nix/store/ic9jk332yd71lwvgdwsi8jh4jjmw5j63-cctools-binutils-darwin-wrapper/nix-support/setup-hook: fork: retry: Resource temporarily unavailable
/nix/store/ic9jk332yd71lwvgdwsi8jh4jjmw5j63-cctools-binutils-darwin-wrapper/nix-support/setup-hook: fork: Resource temporarily unavailable
builder for '/nix/store/0782dybi3wk39b41j447mpc2cdfxh9ni-curl-7.61.1.drv' failed with exit code 254
cannot build derivation '/nix/store/mbr1lzg0m0vfrvmmg4bcaml5gzgqgixi-hpn-KitchenSink-7_8_P1.tar.gz.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/5yhqvcs98jw8v1gi18w1wankybcvisn4-openssh-7.9p1.tar.gz.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/jni36d02bp2hk2g0jniwqkchz2kfrj0d-openssh-gssapi.patch.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/iw8w1115x8szm8cvp2qsm7w3jbs6986b-openssh-7.8p1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/x41rlcvgh4j9gxkg5c50am4m5a4znsxh-openssh-7.9p1.drv': 2 dependencies couldn't be built
error: build of '/nix/store/iw8w1115x8szm8cvp2qsm7w3jbs6986b-openssh-7.8p1.drv', '/nix/store/x41rlcvgh4j9gxkg5c50am4m5a4znsxh-openssh-7.9p1.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: openssh_hpn, openssh_gssapi

Partial log (click to expand)

shrinking /nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1/bin/scp
shrinking /nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1/bin/ssh
gzipping man pages under /nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1/libexec  /nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1/bin
patching script interpreter paths in /nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1
/nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1/bin/ssh-copy-id: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1...
/nix/store/98334qwvhachv21kf89gw777ad076x69-openssh-7.8p1
/nix/store/ccyys0mvdj9fqfv2p56ik4bvnhc4ydx6-openssh-7.9p1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: openssh_hpn, openssh_gssapi

Partial log (click to expand)

shrinking /nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1/bin/sftp
shrinking /nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1/bin/ssh-keygen
gzipping man pages under /nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1/libexec  /nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1/bin
patching script interpreter paths in /nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1
/nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1/bin/ssh-copy-id: interpreter directive changed from "/bin/sh" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1...
/nix/store/0573949flahx2r2p60r8r58k721gdp01-openssh-7.8p1
/nix/store/pmligmf1sj3gadagh7m2srj80irxhdac-openssh-7.9p1

@zimbatm zimbatm requested a review from vcunat October 22, 2018 13:47
@xeji
Copy link
Contributor

xeji commented Oct 23, 2018

5k rebuilds - this should probably go to staging.

@JohnAZoidberg JohnAZoidberg mentioned this pull request Oct 25, 2018
Closed
11 tasks
@zimbatm zimbatm merged commit 2337c75 into NixOS:master Oct 25, 2018
@zimbatm
Copy link
Member Author

zimbatm commented Oct 25, 2018

oops, saw your comment too late

@zimbatm zimbatm deleted the openssh-7.9p1 branch October 25, 2018 23:18
coreyoconnor pushed a commit to coreyoconnor/nixpkgs that referenced this pull request Oct 26, 2018
@zimbatm @coreyoconnor
openssh: 7.7p1 -> 7.9p1 (NixOS#48784)
1836288 
added openssh_gssapi to make it easier to test the patched version

the HPN edition isn't available on top of 7.9p1 yet

fix-host-key-algorithms-plus.patch didn't apply anymore, assuming it's
fixed.

release notes: https://www.openssh.com/txt/release-7.9
@vcunat vcunat mentioned this pull request Dec 9, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat Awaiting requested review from vcunat

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zimbatm @GrahamcOfBorg @xeji