From 6e3de97225770d0f19d888ad5fde39eb1180fc9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 14:22:19 +0000 Subject: [PATCH 1/3] inetutils: 2.2 -> 2.3 --- pkgs/tools/networking/inetutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index f5c9ff00d9244..fb5e2aad5cce8 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "inetutils"; - version = "2.2"; + version = "2.3"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1Uf2kXLfc6/vaRoPeIYoD9eBrOoo3vT/S0shIIaonYA"; + sha256 = "sha256-CwG7COKWI8TjuUDyM8lhRR2a+MUGYwGt12pSqV1Rdyw="; }; outputs = ["out" "apparmor"]; From 8d0848b1a45d4099674796682b17076e7be60328 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 3 Sep 2022 12:32:49 +0100 Subject: [PATCH 2/3] inetutils: add patch for CVE-2022-39028 --- pkgs/tools/networking/inetutils/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index fb5e2aad5cce8..c6362f5446915 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ncurses, perl, help2man -, apparmorRulesFromClosure +, apparmorRulesFromClosure, fetchpatch }: stdenv.mkDerivation rec { @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + (fetchpatch { + name = "CVE-2022-39028.patch"; + url = "https://sources.debian.org/data/main/i/inetutils/2%3A2.3-5/debian/patches/inetutils-telnetd-EC_EL_null_deref.patch"; + sha256 = "sha256-NYNDbEk3q3EhQdJaR12JBbnjJIRRpOcKLBF/EJJPiGU="; + }) ]; nativeBuildInputs = [ help2man perl /* for `whois' */ ]; From 8e39245129d89b130a7c941976ef52114b511e63 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 29 Oct 2022 19:02:22 +0200 Subject: [PATCH 3/3] inetutils: 2.3 -> 2.4 ``` GNU inetutils NEWS -- history of user-visible changes. * Noteworthy changes in release 2.4 (2022-10-25) [stable] ** ifconfig *** Support specifying prefix netmask lengths in -A. Patch by Samuel Thibault . ** Hurd: tell pfinet translator interfaces to configure Patch by Samuel Thibault . ** ftp *** Avoid crash caused by signed integer overflow resulting in out-of-bounds buffer access. Reported by AiDai in . *** Avoid crash caused by heap buffer overflow. Reported by ZFeiXQ in . *** Avoid crash caused by NULL pointer dereference. Reported by AiDai in . *** Avoid crash caused by infinite macro recursion. Reported by AiDai in . ** telnetd *** Avoid crash on 0xff 0xf7 (IAC EC) or 0xff 0xf8 (IAC EL). CVE-2022-39028 https://pierrekim.github.io/blog/2022-08-24-2-byte-dos-freebsd-netbsd-telnetd-netkit-telnetd-inetutils-telnetd-kerberos-telnetd.html ** telnet *** Fix a buffer overflow problem. CVE-2019-0053 https://cgit.freebsd.org/src/commit/?id=14aab889f4e50072a6b914eb95ebbfa939539dad ** tftp *** Avoid crashing when given unexpected or invalid commands from tty. Reported by AiDai in . ** Various bugs fixes, internal improvements and clean ups. Update of gnulib and build fixes for C23. ``` --- pkgs/tools/networking/inetutils/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index c6362f5446915..57ed93d8130e3 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, ncurses, perl, help2man -, apparmorRulesFromClosure, fetchpatch +, apparmorRulesFromClosure }: stdenv.mkDerivation rec { pname = "inetutils"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CwG7COKWI8TjuUDyM8lhRR2a+MUGYwGt12pSqV1Rdyw="; + sha256 = "sha256-F4nWsbGlff4qere1M+6fXf2cv1tZuxuzwmEu0I0PaLI="; }; outputs = ["out" "apparmor"]; @@ -16,11 +16,6 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch - (fetchpatch { - name = "CVE-2022-39028.patch"; - url = "https://sources.debian.org/data/main/i/inetutils/2%3A2.3-5/debian/patches/inetutils-telnetd-EC_EL_null_deref.patch"; - sha256 = "sha256-NYNDbEk3q3EhQdJaR12JBbnjJIRRpOcKLBF/EJJPiGU="; - }) ]; nativeBuildInputs = [ help2man perl /* for `whois' */ ];