From 5e03f9e8e0c41ac1c4a8ad3b0078663e504ef82a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 7 Aug 2021 12:51:33 -0300
Subject: [PATCH 1/2] gftp: move/reclassify it to applications

---
 pkgs/{tools => applications}/networking/gftp/default.nix | 0
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{tools => applications}/networking/gftp/default.nix (100%)

diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/applications/networking/gftp/default.nix
similarity index 100%
rename from pkgs/tools/networking/gftp/default.nix
rename to pkgs/applications/networking/gftp/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 298c197e175b..4dc2ff145366 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5147,7 +5147,7 @@ in
 
   gexiv2 = callPackage ../development/libraries/gexiv2 { };
 
-  gftp = callPackage ../tools/networking/gftp { };
+  gftp = callPackage ../applications/networking/gftp { };
 
   gfbgraph = callPackage ../development/libraries/gfbgraph { };
 

From 3f0a4b814e172a3efa0c8afcdae912214165e50d Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 7 Aug 2021 13:34:54 -0300
Subject: [PATCH 2/2] gftp: 2.0.19 -> 2.7.0b

---
 pkgs/applications/networking/gftp/default.nix | 61 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/gftp/default.nix b/pkgs/applications/networking/gftp/default.nix
index ab956a45b492..947a75d0e2d2 100644
--- a/pkgs/applications/networking/gftp/default.nix
+++ b/pkgs/applications/networking/gftp/default.nix
@@ -1,25 +1,56 @@
-{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoconf
+, automake
+, gettext
+, gtk
+, intltool
+, libtool
+, ncurses
+, openssl
+, pkg-config
+, readline
+}:
 
 stdenv.mkDerivation rec {
   pname = "gftp";
-  version = "2.0.19";
+  version = "2.7.0b";
 
-  src = fetchurl {
-    url = "https://www.gftp.org/gftp-${version}.tar.bz2";
-    sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk";
+  src = fetchFromGitHub {
+    owner = "masneyb";
+    repo = pname;
+    rev = version;
+    hash = "sha256-cIB3SneYKavgdI8eTtM1qsOrBJJ0c7/3CEvNPishNog=";
   };
 
-  postPatch = ''
-    sed -i -e '/<stropts.h>/d' lib/pty.c
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gettext
+    intltool
+    libtool
+    pkg-config
+  ];
+  buildInputs = [
+    gtk
+    ncurses
+    openssl
+    readline
+  ];
+
+  hardeningDisable = [ "format" ];
+
+  preConfigure = ''
+    ./autogen.sh
   '';
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk2 readline ncurses gettext openssl ];
-
-  meta = {
-    description = "GTK-based FTP client";
-    homepage = "http://www.gftp.org";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
+  meta = with lib; {
+    homepage = "https://github.com/masneyb/gftp";
+    description = "GTK-based multithreaded FTP client for *nix-based machines";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
   };
 }
+# TODO: report the hardeningDisable to upstream
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4dc2ff145366..69ec4d8ca8d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5147,7 +5147,9 @@ in
 
   gexiv2 = callPackage ../development/libraries/gexiv2 { };
 
-  gftp = callPackage ../applications/networking/gftp { };
+  gftp = callPackage ../applications/networking/gftp {
+    gtk = gtk2;
+  };
 
   gfbgraph = callPackage ../development/libraries/gfbgraph { };