From e679aa51d59165113754d5658673cead14efc6a8 Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Tue, 7 Jul 2026 15:27:37 -0500
Subject: [PATCH 1/2] dropbear: 2026.91 -> 2026.92

* diff: https://github.com/mkj/dropbear/compare/DROPBEAR_2026.91...DROPBEAR_2026.92
* changelog: https://github.com/mkj/dropbear/releases/tag/DROPBEAR_2026.92
* change src to github
* update meta attributes

Supercedes: #539120
---
 pkgs/by-name/dr/dropbear/package.nix | 55 ++++++++++++++++++----------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix
index 2474bc2e0fb9..c0bc1d7333a8 100644
--- a/pkgs/by-name/dr/dropbear/package.nix
+++ b/pkgs/by-name/dr/dropbear/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   zlib,
   libxcrypt,
   enableSCP ? false,
@@ -15,18 +15,24 @@ let
     SFTPSERVER_PATH = sftpPath;
     DROPBEAR_PATH_SSH_PROGRAM = "${placeholder "out"}/bin/dbclient";
   };
-
 in
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "dropbear";
-  version = "2026.91";
+  version = "2026.92";
 
-  src = fetchurl {
-    url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-3vqSRHWr9rwedKvAAXPka/3IBL1Hyq+hT1pO8Mx22jQ=";
+  src = fetchFromGitHub {
+    owner = "mkj";
+    repo = "dropbear";
+    tag = "DROPBEAR_${finalAttrs.version}";
+    hash = "sha256-xXjKWj6tMW/Qlq4DttxKAqOwsER2QEeb1Qw3Gllu2QQ=";
   };
 
+  patches = [
+    # Allow sessions to inherit the PATH from the parent dropbear.
+    # Otherwise they only get the usual /bin:/usr/bin kind of PATH
+    ./pass-path.patch
+  ];
+
   env.CFLAGS = lib.pipe (lib.attrNames dflags) [
     (map (name: "-D${name}=\\\"${dflags.${name}}\\\""))
     (lib.concatStringsSep " ")
@@ -55,27 +61,36 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
-  postInstall = lib.optionalString enableSCP ''
-    ln -rs $out/bin/scp $out/bin/dbscp
-  '';
-
-  patches = [
-    # Allow sessions to inherit the PATH from the parent dropbear.
-    # Otherwise they only get the usual /bin:/usr/bin kind of PATH
-    ./pass-path.patch
-  ];
-
   buildInputs = [
     zlib
     libxcrypt
   ];
 
+  postInstall = lib.optionalString enableSCP ''
+    ln -rs $out/bin/scp $out/bin/dbscp
+  '';
+
   meta = {
-    description = "Small footprint implementation of the SSH 2 protocol";
+    description = "Small memory footprint ssh server/client suitable for memory-constrained environments";
+    longDescription = ''
+      Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers.
+
+      ## Features
+
+      * Implements X11 forwarding, and authentication-agent forwarding for OpenSSH clients
+      * Can run from inetd or standalone
+      * Compatible with OpenSSH ~/.ssh/authorized_keys public key authentication
+      * Multi-hop mode uses SSH TCP forwarding to tunnel through multiple SSH hosts in a single command:
+
+      ```shell
+      dbclient user1@hop1,user2@hop2,destination
+      ```
+    '';
     homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html";
-    changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${finalAttrs.version}/CHANGES";
+    changelog = "https://github.com/mkj/dropbear/releases/tag/DROPBEAR_${finalAttrs.version}";
+    downloadPage = "https://matt.ucc.asn.au/dropbear/releases";
     license = lib.licenses.mit;
-    maintainers = [ ];
     platforms = lib.platforms.linux;
+    maintainers = [ ];
   };
 })

From f3eb3e922bd37dd2b71bdc9fc6bc9dbf99c34885 Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Tue, 7 Jul 2026 15:42:04 -0500
Subject: [PATCH 2/2] dropbear: adopt package

* add self as maintainer
---
 pkgs/by-name/dr/dropbear/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix
index c0bc1d7333a8..6cd5364963f4 100644
--- a/pkgs/by-name/dr/dropbear/package.nix
+++ b/pkgs/by-name/dr/dropbear/package.nix
@@ -91,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
     downloadPage = "https://matt.ucc.asn.au/dropbear/releases";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      debtquity
+    ];
   };
 })