From 458c8381e03bfbd8970699a67ee4a77be587a1e1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Apr 2015 14:07:26 -0700
Subject: [PATCH] ntp: 4.2.8 -> 4.2.8p2

---
 pkgs/tools/networking/ntp/default.nix | 15 +++++----------
 pkgs/top-level/all-packages.nix       |  4 +++-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 4c0b893b91d..93dad85ce1e 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -1,23 +1,18 @@
-{ stdenv, fetchurl, libcap, autoreconfHook }:
+{ stdenv, fetchurl, autoreconfHook, libcap ? null }:
 
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8";
+  name = "ntp-4.2.8p2";
 
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "1vnqa1542d01xmlkw8f3rq57y360b2j7yxkkg9b11955nvw0v4if";
+    sha256 = "0ccv9kh5asxpk7bjn73vwrqimbkbfl743bgx0km47bfajl7bqs8d";
   };
 
-  patches = [ ./no-openssl.patch ];
+  configureFlags = stdenv.lib.optional (libcap != null) "--enable-linuxcaps";
 
-  configureFlags = ''
-    --without-crypto
-    ${if stdenv.isLinux then "--enable-linuxcaps" else ""}
-  '';
-
-  buildInputs = [ autoreconfHook ] ++ stdenv.lib.optional stdenv.isLinux libcap;
+  buildInputs = [ autoreconfHook libcap ];
 
   postInstall = "rm -rf $out/share/doc";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2eec864638..766dd90d25a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2165,7 +2165,9 @@ let
 
   ntopng = callPackage ../tools/networking/ntopng { };
 
-  ntp = callPackage ../tools/networking/ntp { };
+  ntp = callPackage ../tools/networking/ntp {
+    libcap = if stdenv.isLinux then libcap else null;
+  };
 
   numdiff = callPackage ../tools/text/numdiff { };