fwknop: 2.6.10 -> 2.6.11

pkgs/tools/security/fwknop/default.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   autoreconfHook,
   libpcap,
   texinfo,
@@ -18,34 +17,17 @@
 
 stdenv.mkDerivation rec {
   pname = "fwknop";
-  version = "2.6.10";
+  version = "2.6.11";
 
   src = fetchFromGitHub {
     owner = "mrash";
-    repo = pname;
-    rev = version;
-    sha256 = "05kvqhmxj9p2y835w75f3jvhr38bb96cd58mvfd7xil9dhmhn9ra";
+    repo = "fwknop";
+    tag = version;
+    hash = "sha256-jnEBRJCt7pAmXRIBVT2OwJqT5Zr/JaRgPDqccx0W/9o=";
   };
 
-  patches = [
-    # Pull patch pending upstream inclusion for -fno-common tollchains:
-    #   https://github.com/mrash/fwknop/pull/319
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/mrash/fwknop/commit/a8214fd58bc46d23b64b3a55db023c7f5a5ea6af.patch";
-      sha256 = "0cp1350q66n455hpd3rdydb9anx66bcirza5gyyyy5232zgg58bi";
-    })
-
-    # Pull patch pending upstream inclusion for `autoconf-2.72` support:
-    #   https://github.com/mrash/fwknop/pull/357
-    (fetchpatch {
-      name = "autoconf-2.72.patch";
-      url = "https://github.com/mrash/fwknop/commit/bee7958532338499e35c19e75937891c8113f7de.patch";
-      hash = "sha256-lrro5dSDR0Zz9aO3bV5vFFADNJjoDR9z6P5lFYWyLW8=";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook ];
+
   buildInputs =
     [
       libpcap
@@ -76,10 +58,10 @@ stdenv.mkDerivation rec {
   # this'll probably be helpful until there's a NixOS module for that (feel free
   # to ping me (@primeos) if you want to help).
   preInstall = ''
-    substituteInPlace Makefile --replace\
+    substituteInPlace Makefile --replace-fail \
       "sysconfdir = /etc"\
       "sysconfdir = $out/etc"
-    substituteInPlace server/Makefile --replace\
+    substituteInPlace server/Makefile --replace-fail \
       "wknopddir = /etc/fwknop"\
       "wknopddir = $out/etc/fwknop"
   '';

pkgs/top-level/all-packages.nix

@@ -3012,9 +3012,7 @@ with pkgs;
 
   fstl = callPackage ../applications/graphics/fstl { };
 
-  fwknop = callPackage ../tools/security/fwknop {
-    texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
-  };
+  fwknop = callPackage ../tools/security/fwknop { };
 
   uniscribe = callPackage ../tools/text/uniscribe { };