nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 11:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59806

Browse Source 
openssh: 7.9p1 -> 8.1p1
This commit is contained in:
edef 2019-10-19 12:16:08 +00:00 committed by GitHub
commit 5b1f864242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -108,6 +108,14 @@
<listitem> <listitem>
<para>SD images are now compressed by default using <literal>bzip2</literal>.</para> <para>SD images are now compressed by default using <literal>bzip2</literal>.</para>
</listitem> </listitem>
<listitem>
<para>
OpenSSH has been upgraded from 7.9 to 8.1, improving security and adding features
but with potential incompatibilities. Consult the
<link xlink:href="https://www.openssh.com/txt/release-8.1">
release announcement</link> for more information.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

16
pkgs/tools/networking/openssh/default.nix
View File

@ -13,16 +13,16 @@ let
gssapiPatch = fetchpatch { gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch"; name = "openssh-gssapi.patch";
url = "https://salsa.debian.org/ssh-team/openssh/raw/" url = "https://salsa.debian.org/ssh-team/openssh/raw/"
+ "d80ebbf028196b2478beebf5a290b97f35e1eed9" + "e50a98bda787a3b9f53ed67bdccbbac0bde1f9ae"
+ "/debian/patches/gssapi.patch"; + "/debian/patches/gssapi.patch";
sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2wv"; sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2hv";
}; };
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openssh"; pname = "openssh";
version = if hpnSupport then "7.8p1" else "7.9p1"; version = if hpnSupport then "7.8p1" else "8.1p1";
src = if hpnSupport then src = if hpnSupport then
fetchurl { fetchurl {
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
else else
fetchurl { fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb"; sha256 = "1zwk3g57gb13br206k6jdhgnp6y1nibwswzraqspbl1m73pxpx82";
}; };
patches = patches =
@ -42,6 +42,8 @@ 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
./ssh-keysign.patch
] ++ optional hpnSupport
# CVE-2018-20685, can probably be dropped with next version bump # CVE-2018-20685, can probably be dropped with next version bump
# See https://sintonen.fi/advisories/scp-client-multiple-vulnerabilities.txt # See https://sintonen.fi/advisories/scp-client-multiple-vulnerabilities.txt
# for details # for details
@ -50,9 +52,6 @@ stdenv.mkDerivation rec {
url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch; url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch;
sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds"; sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds";
}) })
./ssh-keysign.patch
]
++ optional withGssapiPatches (assert withKerberos; gssapiPatch); ++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
postPatch = postPatch =
@ -89,6 +88,8 @@ stdenv.mkDerivation rec {
++ optional stdenv.isDarwin "--disable-libutil" ++ optional stdenv.isDarwin "--disable-libutil"
++ optional (!linkOpenssl) "--without-openssl"; ++ optional (!linkOpenssl) "--without-openssl";
buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ];
enableParallelBuilding = true; enableParallelBuilding = true;
hardeningEnable = [ "pie" ]; hardeningEnable = [ "pie" ];
@ -111,5 +112,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd2; license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix ++ platforms.windows; platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ eelco aneeshusa ]; maintainers = with maintainers; [ eelco aneeshusa ];
broken = hpnSupport;
}; };
} }