diff options
| -rwxr-xr-x | extra/libcap/Pkgfile | 2 | ||||
| -rw-r--r-- | extra/libcap/libcap-2.16-drop-linux-workarounds.patch | 43 | ||||
| -rw-r--r-- | extra/libcap/libcap-2.16-makefile.patch | 14 |
3 files changed, 1 insertions, 58 deletions
diff --git a/extra/libcap/Pkgfile b/extra/libcap/Pkgfile index 93954f86e..1cbf24b4d 100755 --- a/extra/libcap/Pkgfile +++ b/extra/libcap/Pkgfile @@ -8,7 +8,7 @@ name=libcap version=2.16 release=1 source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-$version.tar.bz2\ - $name-$version-makefile.patch $name-$version-drop-linux-workarounds.patch) + http://nutyx.meticul.eu/files/$name/{$name-$version-makefile.patch,$name-$version-drop-linux-workarounds.patch}) build() { cd $name-$version diff --git a/extra/libcap/libcap-2.16-drop-linux-workarounds.patch b/extra/libcap/libcap-2.16-drop-linux-workarounds.patch deleted file mode 100644 index bbd6db835..000000000 --- a/extra/libcap/libcap-2.16-drop-linux-workarounds.patch +++ /dev/null @@ -1,43 +0,0 @@ -dont need these compat hacks anymore - -http://bugs.gentoo.org/265304 - ---- libcap/include/sys/capability.h -+++ libcap/include/sys/capability.h -@@ -22,18 +22,6 @@ - #include <sys/types.h> - #include <stdint.h> - --/* -- * Make sure we can be included from userland by preventing -- * capability.h from including other kernel headers -- */ --#define _LINUX_TYPES_H --#define _LINUX_FS_H --#define __LINUX_COMPILER_H --#define __user -- --typedef unsigned int __u32; --typedef __u32 __le32; -- - #include <linux/capability.h> - - /* ---- libcap/include/linux/capability.h -+++ libcap/include/linux/capability.h -@@ -40,13 +40,13 @@ - typedef struct __user_cap_header_struct { - __u32 version; - int pid; --} __user *cap_user_header_t; -+} *cap_user_header_t; - - typedef struct __user_cap_data_struct { - __u32 effective; - __u32 permitted; - __u32 inheritable; --} __user *cap_user_data_t; -+} *cap_user_data_t; - - - #define XATTR_CAPS_SUFFIX "capability" diff --git a/extra/libcap/libcap-2.16-makefile.patch b/extra/libcap/libcap-2.16-makefile.patch deleted file mode 100644 index 529c437a5..000000000 --- a/extra/libcap/libcap-2.16-makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libcap/Makefile~ 2008-12-04 09:03:12.000000000 +0200 -+++ libcap/Makefile 2009-01-12 17:17:07.000000000 +0200 -@@ -27,11 +27,6 @@ - - all: $(MINLIBNAME) $(STALIBNAME) - --ifeq ($(shell gperf --version > /dev/null 2>&1 && echo yes),yes) --USE_GPERF_OUTPUT = $(GPERF_OUTPUT) --INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT) --endif -- - _makenames: _makenames.c cap_names.list.h - $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ - |