diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-29 09:42:12 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-29 09:42:12 +0000 |
| commit | afe69eecbee5f6162205b94d05c93b32f49cf9c7 (patch) | |
| tree | 606e521365b62fe39b306465922f4a2cab96640d /pkgs/os-specific/linux/libcap | |
| parent | 374509f104bf649afadb80cfd84ed91467fbfaa8 (diff) | |
| download | nixpkgs-afe69eecbee5f6162205b94d05c93b32f49cf9c7.tar nixpkgs-afe69eecbee5f6162205b94d05c93b32f49cf9c7.tar.gz nixpkgs-afe69eecbee5f6162205b94d05c93b32f49cf9c7.tar.bz2 nixpkgs-afe69eecbee5f6162205b94d05c93b32f49cf9c7.tar.lz nixpkgs-afe69eecbee5f6162205b94d05c93b32f49cf9c7.tar.xz nixpkgs-afe69eecbee5f6162205b94d05c93b32f49cf9c7.tar.zst nixpkgs-afe69eecbee5f6162205b94d05c93b32f49cf9c7.zip | |
* Use kernel 2.6 libcap.
svn path=/nixpkgs/trunk/; revision=10895
Diffstat (limited to 'pkgs/os-specific/linux/libcap')
| -rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/libcap/syscall.patch | 40 |
2 files changed, 9 insertions, 52 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index ad98ad05e2f..034989448d9 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,21 +1,18 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, attr}: assert stdenv.isLinux; stdenv.mkDerivation { - name = "libcap-1.10"; + name = "libcap-2.07"; + src = fetchurl { - url = mirror://kernel/linux/libs/security/linux-privs/kernel-2.4/libcap-1.10.tar.bz2; - md5 = "4426a413128142cab89eb2e6f13d8571"; + url = mirror://kernel/linux/libs/security/linux-privs/kernel-2.6/libcap-2.07.tar.gz; + sha256 = "1zz8nyqzb15lf31akwyzzfdhyhf9xvl9rqih90m9kypmcmc4yz5q"; }; - preBuild = " - substituteInPlace libcap/Makefile --replace /usr/include ${stdenv.glibc}/include - makeFlags=\"LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man\" - "; + buildInputs = [attr]; - patches = [ - # Borrowed from http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libcap/files/libcap-1.10-syscall.patch?rev=1.2&view=log. - ./syscall.patch - ]; + preBuild = '' + makeFlagsArray=(LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man) + ''; } diff --git a/pkgs/os-specific/linux/libcap/syscall.patch b/pkgs/os-specific/linux/libcap/syscall.patch deleted file mode 100644 index 7dd084ba32b..00000000000 --- a/pkgs/os-specific/linux/libcap/syscall.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- libcap-1.10/libcap/cap_sys.c.jj 2003-08-24 19:03:35.524759616 -0700 -+++ libcap-1.10/libcap/cap_sys.c 2003-08-24 19:03:48.406801248 -0700 -@@ -10,7 +10,7 @@ - #include "libcap.h" - #define __LIBRARY__ - #include <linux/unistd.h> -- -+/* - _syscall2(int, capget, - cap_user_header_t, header, - cap_user_data_t, data) -@@ -18,7 +18,7 @@ - _syscall2(int, capset, - cap_user_header_t, header, - const cap_user_data_t, data) -- -+*/ - /* - * $Log: libcap-1.10-syscall.patch,v $ - * Revision 1.1.1.1 2005/11/30 09:39:11 chriswhite - * *** empty log message *** - * - * Revision 1.2 2003/08/29 06:28:38 cretin - * Only add -fPIC for libcap.so objects - * - * Revision 1.1 2003/08/27 06:10:53 cretin - * Added -fPIC for prelink to work, and fixed compile error - * - * Revision 1.1.1.1 1999/04/17 22:16:31 morgan ---- libcap-1.10/libcap/Makefile.jj 2003-08-29 07:19:21.863907872 +0100 -+++ libcap-1.10/libcap/Makefile 2003-08-29 07:20:21.562832256 +0100 -@@ -61,7 +61,7 @@ - ln -sf $(MAJLIBNAME) $(LIBNAME) - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) -fPIC -c $< -o $@ - - install: all - mkdir -p -m 0755 $(INCDIR)/sys |