alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

openssh: 7.5p1 -> 7.6p1

Browse source 
Release notes are available at https://www.openssh.com/txt/release-7.6.
Mostly a bugfix release, no major backwards-incompatible changes.
This commit is contained in:
Aneesh Agrawal 2017-10-05 15:45:38 -04:00
parent 1ff1c6ac4a
commit d473ef2ed2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/networking/openssh/default.nix
View file

@ -13,11 +13,11 @@ assert withGssapiPatches -> withKerberos;
let let
# **please** update this patch when you update to a new openssh release. # **please** update this patch when you update to a new openssh release.
gssapiSrc = fetchpatch { gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch"; name = "openssh-gssapi.patch";
url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian"
+ "/patches/gssapi.patch?id=db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92"; + "/patches/gssapi.patch?id=1e0d55f9163793742d20eaadd4784db16fd3459d";
sha256 = "1rw10pmvjw55521ys59x1kabvbvmla506znakwwjijggdsakvsjm"; sha256 = "130phj87q87p9crigd6852nnaqsqkfg09h45a32lk4524h9kkxgb";
}; };
in in
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# Please ensure that openssh_with_kerberos still builds when # Please ensure that openssh_with_kerberos still builds when
# bumping the version here! # bumping the version here!
name = "openssh-${version}"; name = "openssh-${version}";
version = "7.5p1"; version = if hpnSupport then "7.5p1" else "7.6p1";
src = if hpnSupport then src = if hpnSupport then
fetchurl { fetchurl {
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
else else
fetchurl { fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; sha256 = "08qpsb8mrzcx8wgvz9insiyvq7sbg26yj5nvl2m5n57yvppcl8x3";
}; };
patches = patches =
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966 # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./dont_create_privsep_path.patch ./dont_create_privsep_path.patch
] ]
++ optional withGssapiPatches gssapiSrc; ++ optional withGssapiPatches gssapiPatch;
postPatch = postPatch =
# On Hydra this makes installation fail (sometimes?), # On Hydra this makes installation fail (sometimes?),