diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 523c065368f..f5c9ff00d92 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.0"; + version = "2.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5XPVZuVTk5QAmYYuf4mUFkoO0S9ahsM0U4CEK9wSRyI="; + sha256 = "sha256-1Uf2kXLfc6/vaRoPeIYoD9eBrOoo3vT/S0shIIaonYA"; }; outputs = ["out" "apparmor"]; @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch - ./whois-Update-ORG-TLD-server.patch - ./whois-Update-Indian-TLD-server.patch ]; nativeBuildInputs = [ help2man perl /* for `whois' */ ]; diff --git a/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch deleted file mode 100644 index 969b24436fb..00000000000 --- a/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1d64e6ae8fa1ef685f3f54c070eb47e7a45895eb Mon Sep 17 00:00:00 2001 -From: Ashish SHUKLA -Date: Sun, 25 Apr 2021 08:17:52 +0530 -Subject: [PATCH] whois: Update whois server for .IN - ---- - whois/tld_serv_list | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/whois/tld_serv_list b/whois/tld_serv_list -index d9257f36..41083c18 100644 ---- a/whois/tld_serv_list -+++ b/whois/tld_serv_list -@@ -151,7 +151,7 @@ - .ie whois.domainregistry.ie - .il whois.isoc.org.il - .im whois.nic.im --.in whois.inregistry.net -+.in whois.registry.in - .io whois.nic.io - #.iq # NIC? - .ir whois.nic.ir --- -2.31.1 - diff --git a/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch deleted file mode 100644 index dd45ec6ebf7..00000000000 --- a/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a7a517ca23682b160a2a3be47f1f3f262f8f306f Mon Sep 17 00:00:00 2001 -From: Ashish SHUKLA -Date: Sun, 25 Apr 2021 08:07:52 +0530 -Subject: [PATCH 1/2] whois: .ORG is not handled by InterNIC anymore - -See https://www.iana.org/domains/root/db/org.html ---- - whois/data.h | 1 - - whois/tld_serv_list | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/whois/data.h b/whois/data.h -index d1eb10ad..82e22b6f 100644 ---- a/whois/data.h -+++ b/whois/data.h -@@ -68,7 +68,6 @@ const char *rwhois_servers[] = { - const char *gtlds[] = { - ".com", - ".net", -- ".org", - ".edu", - NULL - }; -diff --git a/whois/tld_serv_list b/whois/tld_serv_list -index ad7b9826..d9257f36 100644 ---- a/whois/tld_serv_list -+++ b/whois/tld_serv_list -@@ -219,6 +219,7 @@ - .nu whois.nic.nu - .nz whois.srs.net.nz - #.om NONE # NIC? http://www.gto.net.om -+.org whois.pir.org - .pa WEB http://www.nic.pa - #.pe whois.rcp.net.pe # kero.yachay.pe valid 2011-03-10 - .pe kero.yachay.pe --- -2.31.1 -