From 469546f46e75754f91308e472be1e733fe62a851 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 31 Jan 2017 16:12:22 +0300
Subject: [PATCH] tcp_wrappers: 7.6 -> 7.6.q

---
 .../linux/tcp-wrappers/default.nix            | 41 +++++++------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index eb50fc0abce..105a4cacd82 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -1,40 +1,30 @@
 { fetchurl, stdenv }:
 
-stdenv.mkDerivation {
-  name = "tcp-wrappers-7.6";
+stdenv.mkDerivation rec {
+  name = "tcp-wrappers-${version}";
+  version = "7.6.q";
 
   src = fetchurl {
-    url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz;
-    sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp";
+    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.orig.tar.gz";
+    sha256 = "0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm";
   };
 
-  patches = [
-    (fetchurl {
-       url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs-13.diff.gz;
-       sha256 = "071ir20rh8ckhgrc0y99wgnlbqjgkprf0qwbv84lqw5i6qajbcnh";
-     })
-  ];
+  debian = fetchurl {
+    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}-24.debian.tar.xz";
+    sha256 = "1kgax35rwaj5q8nf8fw60aczvxj99h2jjp7iv1f82y85yz9x0ak7";
+  };
 
   prePatch = ''
-    cd upstream/tarballs
-    tar xzvf *
-    cd tcp_wrappers_7.6
+    tar -xaf $debian
+    shopt -s extglob
+    patches="$(echo debian/patches/!(series)) $patches"
   '';
 
-  postPatch = ''
-    for patch in debian/patches/*; do
-      echo "applying Debian patch \`$(basename $patch)'..."
-      patch --batch -p1 < $patch
-    done
-  '';
-
-  buildPhase = ''
-    make REAL_DAEMON_DIR="$out/sbin" linux
-  '';
+  makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
 
   installPhase = ''
-    mkdir -p "$out/sbin"
-    cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin"
+    mkdir -p "$out/bin"
+    cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/bin"
 
     mkdir -p "$out/lib"
     cp -v shared/lib*.so* "$out/lib"
@@ -42,7 +32,6 @@ stdenv.mkDerivation {
     mkdir -p "$out/include"
     cp -v *.h "$out/include"
 
-    mkdir -p "$out/man"
     for i in 3 5 8;
     do
       mkdir -p "$out/man/man$i"