From 7e41999280a80efda49947d54600de7b5fbef7b4 Mon Sep 17 00:00:00 2001
From: birlorg <python@birl.org>
Date: Sat, 8 May 2021 20:22:39 +0000
Subject: [PATCH 1/4] spiped: 1.5.0 -> 1.6.1

upgrade spiped from 1.5.0 to 1.6.1
---
 pkgs/tools/networking/spiped/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index 67ee51d6610..04fc1129a25 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -2,22 +2,22 @@
 
 stdenv.mkDerivation rec {
   pname = "spiped";
-  version = "1.5.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url    = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz";
-    sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj";
+    sha256 = "8d7089979db79a531a0ecc507b113ac6f2cf5f19305571eff1d3413e0ab33713";
   };
 
   buildInputs = [ openssl ];
 
   patchPhase = ''
     substituteInPlace libcperciva/cpusupport/Build/cpusupport.sh \
+      --replace "dirname" "${coreutils}/bin/dirname" \
       --replace "2>/dev/null" "2>stderr.log"
 
-    substituteInPlace POSIX/posix-l.sh       \
+    substituteInPlace libcperciva/POSIX/posix-l.sh       \
       --replace "rm" "${coreutils}/bin/rm"   \
-      --replace ">/dev/stderr" ">stderr.log" \
       --replace "2>/dev/null" "2>stderr.log"
 
     substituteInPlace POSIX/posix-cflags.sh  \

From a3f27b548233e75d5ee2a6dded2c84fd72dff74b Mon Sep 17 00:00:00 2001
From: birlorg <python@birl.org>
Date: Sat, 8 May 2021 20:51:32 +0000
Subject: [PATCH 2/4] spiped: 1.5.0 -> 1.6.1

fix changes per @r-rmcgibbo
---
 pkgs/tools/networking/spiped/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index 04fc1129a25..d534f00ad40 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl ];
 
-  patchPhase = ''
+  postPatch = ''
     substituteInPlace libcperciva/cpusupport/Build/cpusupport.sh \
       --replace "dirname" "${coreutils}/bin/dirname" \
       --replace "2>/dev/null" "2>stderr.log"
@@ -27,8 +27,10 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/bin $out/share/man/man1
     make install BINDIR=$out/bin MAN1DIR=$out/share/man/man1
+    runHook postInstall
   '';
 
   meta = {

From e6ed1aca78e73315d565656080af2827b5147710 Mon Sep 17 00:00:00 2001
From: birlorg <python@birl.org>
Date: Sat, 8 May 2021 20:53:17 +0000
Subject: [PATCH 3/4] spiped: 1.5.0 -> 1.6.1

oops, I'm editing using the web UI and I forgot to delete this patch as it's no longer needed.
---
 pkgs/tools/networking/spiped/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index d534f00ad40..315d3b0c247 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -20,11 +20,6 @@ stdenv.mkDerivation rec {
       --replace "rm" "${coreutils}/bin/rm"   \
       --replace "2>/dev/null" "2>stderr.log"
 
-    substituteInPlace POSIX/posix-cflags.sh  \
-      --replace "rm" "${coreutils}/bin/rm"   \
-      --replace ">/dev/stderr" ">stderr.log" \
-      --replace "2>/dev/null" "2>stderr.log"
-  '';
 
   installPhase = ''
     runHook preInstall

From 1a5f2a4e259032c53f63c314dc1b0c4a8fd3ad83 Mon Sep 17 00:00:00 2001
From: birlorg <python@birl.org>
Date: Sat, 8 May 2021 22:22:52 +0000
Subject: [PATCH 4/4] spipe: 1.5.0 -> 1.6.1

fix by re-adding '';
---
 pkgs/tools/networking/spiped/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index 315d3b0c247..8b9d4c9e7b8 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     substituteInPlace libcperciva/POSIX/posix-l.sh       \
       --replace "rm" "${coreutils}/bin/rm"   \
       --replace "2>/dev/null" "2>stderr.log"
-
+   '';
 
   installPhase = ''
     runHook preInstall