From 28a76a96bee8438de15f4c8abfb115d51e7ba0ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Jul 2012 10:25:56 -0400
Subject: libcap: Update to 2.22

Systemd requires the recent CAP_SYSLOG capability.
---
 pkgs/os-specific/linux/libcap/default.nix | 17 +++++++++++------
 pkgs/os-specific/linux/libcap/pam.nix     |  2 +-
 pkgs/os-specific/linux/libcap/progs.nix   |  2 ++
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'pkgs/os-specific/linux/libcap')

diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index c279393d7a4..667fe63bba7 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,18 +1,18 @@
-{stdenv, fetchurl, attr, perl}:
+{ stdenv, fetchurl, attr, perl }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name = "libcap-${version}";
-  version = "2.19";
+  version = "2.22";
   
   src = fetchurl {
-    url = "mirror://kernel/linux/libs/security/linux-privs/kernel-2.6/${name}.tar.gz";
-    sha256 = "0fdsz9j741npvh222f8p1y6l516z9liibiwdpdr3a4zg53m0pw45";
+    url = "mirror://gentoo/distfiles/${name}.tar.bz2";
+    sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk";
   };
   
-  buildNativeInputs = [perl];
-  propagatedBuildInputs = [attr];
+  buildNativeInputs = [ perl ];
+  propagatedBuildInputs = [ attr ];
 
   preConfigure = "cd libcap";
 
@@ -26,4 +26,9 @@ stdenv.mkDerivation rec {
   };
 
   postInstall = passthru.postinst name;
+
+  meta = {
+    description = "Library for working with POSIX capabilities";
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/os-specific/linux/libcap/pam.nix b/pkgs/os-specific/linux/libcap/pam.nix
index 4cefa825c8a..b78f32dccbb 100644
--- a/pkgs/os-specific/linux/libcap/pam.nix
+++ b/pkgs/os-specific/linux/libcap/pam.nix
@@ -3,7 +3,7 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "cap_pam.so-${libcap.version}";
+  name = "libcap-pam-${libcap.version}";
 
   inherit (libcap) src;
 
diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix
index 1b38848e77e..1902b4acb1a 100644
--- a/pkgs/os-specific/linux/libcap/progs.nix
+++ b/pkgs/os-specific/linux/libcap/progs.nix
@@ -11,5 +11,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "cd progs";
 
+  installFlags = "RAISE_SETFCAP=no";
+
   postInstall = libcap.postinst name;
 }
-- 
cgit 1.4.1