- don't define capget/capset functions with syscall interfaces - they are provided

  by libc since glibc 2.1 or so

Changed files:
    libcap-link.patch -> 1.4

diff --git a/libcap-link.patch b/libcap-link.patch
index f25c6db913616463c184ebb6532868c3573c1380..2a24355c92c4790d26e80f1c027320f69be5d0a1 100644 (file)
--- a/libcap-link.patch
+++ b/libcap-link.patch
@@ -15,39 +15,23 @@
  
  install: all
        mkdir -p -m 0755 $(INCDIR)/sys
---- libcap-1.92/libcap/cap_sys.c.orig  1999-04-23 08:16:31.000000000 +0200
-+++ libcap-1.92/libcap/cap_sys.c       2003-07-26 23:46:58.000000000 +0200
-@@ -11,6 +11,25 @@
- #define __LIBRARY__
- #include <linux/unistd.h>
+--- libcap-1.10/libcap/cap_sys.c.orig  1999-04-18 00:16:31.000000000 +0200
++++ libcap-1.10/libcap/cap_sys.c       2004-08-03 21:06:00.506249264 +0200
+@@ -8,16 +8,8 @@
+  */
  
-+#ifdef __i386__
-+/* ugh, _syscall{1+} don't support PIC on x86 :/ */
-+int capget(cap_user_header_t header, cap_user_data_t data)
-+{ int __res;
-+  __asm__ volatile ("pushl %%ebx\nmovl %%edx, %%ebx\nint $0x80\npopl %%ebx" \
-+      : "=a" (__res) \
-+      : "0" (__NR_capget), "d" (header), "c" (data));
-+  /* printf("%d", _libcap_kernel_version); */
-+  __syscall_return(int, __res);
-+}
-+
-+int capset(cap_user_header_t header, const cap_user_data_t data)
-+{ int __res;
-+  __asm__ volatile ("pushl %%ebx\nmovl %%edx, %%ebx\nint $0x80\npopl %%ebx" \
-+      : "=a" (__res) \
-+      : "0" (__NR_capset), "d" (header), "c" (data));
-+  __syscall_return(int, __res);
-+}
-+#else
- _syscall2(int, capget,
-         cap_user_header_t, header,
-         cap_user_data_t, data)
-@@ -18,6 +37,7 @@
- _syscall2(int, capset,
-         cap_user_header_t, header,
-         const cap_user_data_t, data)
-+#endif
+ #include "libcap.h"
+-#define __LIBRARY__
+-#include <linux/unistd.h>
  
- /* library defaults to agreeing with the kernel under which it was
-    compiled */
+-_syscall2(int, capget,
+-        cap_user_header_t, header,
+-        cap_user_data_t, data)
+-
+-_syscall2(int, capset,
+-        cap_user_header_t, header,
+-        const cap_user_data_t, data)
++/* capget(), capset() syscalls are defined in libc */
+ 
+ /*
+  * $Log$