From a40b4b76efaa069d65a1a0d78d8df8c9a6cd693d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:12:54 +0100
Subject: [PATCH 1/2] libcli: 1.9.7 -> 1.10.7

---
 pkgs/by-name/li/libcli/package.nix | 39 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/li/libcli/package.nix b/pkgs/by-name/li/libcli/package.nix
index 71aca93bf84b..afc41038077a 100644
--- a/pkgs/by-name/li/libcli/package.nix
+++ b/pkgs/by-name/li/libcli/package.nix
@@ -2,47 +2,48 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
+  fetchDebianPatch,
   libxcrypt,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libcli";
-  version = "1.9.7";
+  version = "1.10.7";
 
   src = fetchFromGitHub {
-    sha256 = "08pmjhqkwldhmcwjhi2l27slf1fk6nxxfaihnk2637pqkycy8z0c";
-    rev = "v${version}";
-    repo = "libcli";
     owner = "dparrish";
+    repo = "libcli";
+    rev = "V${version}";
+    hash = "sha256-ItmZfclx2mprKUOk/MwlS2w4f0ukiiPA5/QaRdGfEO8=";
   };
 
   patches = [
-    (fetchurl {
-      url = "https://github.com/dparrish/libcli/commit/ebc5a09db457ee1be9996711463cbbafe5ea72d5.patch";
-      sha256 = "0szjiw3gd7by1sv924shnngfxvc98xvaqvx228b575xq93xxjcwl";
+    (fetchDebianPatch {
+      pname = "libcli";
+      version = "1.10.7";
+      debianRevision = "2";
+      patch = "02-fix-transposed-calloc-args";
+      hash = "sha256-lSZeg5h+LUIGa4DnkAmwIEs+tctCYs/tuY63hbBUjuw=";
     })
   ];
 
-  buildInputs = [ libxcrypt ];
+  buildInputs = [
+    libxcrypt
+  ];
 
   enableParallelBuilding = true;
 
   makeFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
     "AR=${stdenv.cc.targetPrefix}ar"
-    "PREFIX=$(out)"
+    "PREFIX=${placeholder "out"}"
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    # Needed with GCC 12
-    "-Wno-error=address"
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Emulate a Cisco-style telnet command-line interface";
-    homepage = "http://sites.dparrish.com/libcli";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.all;
+    homepage = "https://dparrish.com/pages/libcli";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ wegank ];
+    platforms = lib.platforms.linux;
   };
 }

From f4ce941ec47588b78a1101ef3a017d678e0a4a60 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:14:37 +0100
Subject: [PATCH 2/2] netsniff-ng: 0.6.8 -> 0.6.9

---
 pkgs/by-name/ne/netsniff-ng/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix
index 98fbc042a64c..8489627e329c 100644
--- a/pkgs/by-name/ne/netsniff-ng/package.nix
+++ b/pkgs/by-name/ne/netsniff-ng/package.nix
@@ -16,19 +16,18 @@
   liburcu,
   ncurses,
   pkg-config,
-  gnumake42,
   zlib,
 }:
 
 stdenv.mkDerivation rec {
   pname = "netsniff-ng";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchFromGitHub {
-    repo = pname;
-    owner = pname;
+    repo = "netsniff-ng";
+    owner = "netsniff-ng";
     rev = "v${version}";
-    sha256 = "10ih8amaqspy0zwg7hqvypa1v7ixpjl0n608cyfgyfzffp73lbqf";
+    hash = "sha256-P1xZqhZ/HJV3fAvh4xhhApZ0+FLDFqvYrZlbvb+FV7I=";
   };
 
   nativeBuildInputs = [
@@ -36,7 +35,6 @@ stdenv.mkDerivation rec {
     flex
     makeWrapper
     pkg-config
-    gnumake42 # fails with make 4.4
   ];
 
   buildInputs = [