From 1b3043f6ce9cfb9381173f236fad907d58c9b179 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 10 Jan 2008 03:17:21 +0200 Subject: [PATCH] Updated libcap (1.10 -> 2.04) --- base/libcap/libcap-1.10-alpha.patch | 34 ---------------- base/libcap/libcap-1.10-ia64.patch | 55 -------------------------- base/libcap/libcap-1.10-shared.patch | 40 ------------------- base/libcap/libcap-1.10-userland.patch | 42 -------------------- base/libcap/libcap.desc | 8 ++-- 5 files changed, 3 insertions(+), 176 deletions(-) delete mode 100644 base/libcap/libcap-1.10-alpha.patch delete mode 100644 base/libcap/libcap-1.10-ia64.patch delete mode 100644 base/libcap/libcap-1.10-shared.patch delete mode 100644 base/libcap/libcap-1.10-userland.patch diff --git a/base/libcap/libcap-1.10-alpha.patch b/base/libcap/libcap-1.10-alpha.patch deleted file mode 100644 index e1100161e..000000000 --- a/base/libcap/libcap-1.10-alpha.patch +++ /dev/null @@ -1,34 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../libcap/libcap-1.10-alpha.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2004 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Pulled from RedHat SRPM to (mostly) fix samba (3.0.x) compilation on -non-x86 systems. Most of this patches are bare hacks - but seem to be -commonly accepted ... :-( - - - Rene Rebe - ---- libcap-1.10/libcap/_makenames.c.foo Fri Nov 9 16:38:45 2001 -+++ libcap-1.10/libcap/_makenames.c Fri Nov 9 16:39:30 2001 -@@ -9,7 +9,7 @@ - - #include - #include --#include -+#include "include/sys/capability.h" - - /* - * #include 'sed' generated array diff --git a/base/libcap/libcap-1.10-ia64.patch b/base/libcap/libcap-1.10-ia64.patch deleted file mode 100644 index 88b6019e9..000000000 --- a/base/libcap/libcap-1.10-ia64.patch +++ /dev/null @@ -1,55 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../libcap/libcap-1.10-ia64.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2004 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Pulled from RedHat SRPM to (mostly) fix samba (3.0.x) compilation on -non-x86 systems. Most of this patches are bare hacks - but seem to be -commonly accepted ... :-( - - - Rene Rebe - ---- libcap-1.10/libcap/cap_sys.c.ia64 Mon May 21 16:23:27 2001 -+++ libcap-1.10/libcap/cap_sys.c Mon May 21 16:24:09 2001 -@@ -11,14 +11,6 @@ - #define __LIBRARY__ - #include - --_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) -- - /* - * $Log: cap_sys.c,v $ - * Revision 1.1.1.1 1999/04/17 22:16:31 morgan ---- libcap-1.10/Make.Rules.ia64 Mon May 21 16:22:08 2001 -+++ libcap-1.10/Make.Rules Mon May 21 16:22:32 2001 -@@ -44,10 +44,10 @@ - CC=gcc - COPTFLAGS=-O2 - DEBUG=-g #-DDEBUG --WARNINGS=-ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \ -+WARNINGS=-D_POSIX_SOURCE -Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wtraditional -Wstrict-prototypes -Wmissing-prototypes \ -- -Wnested-externs -Winline -Wshadow -pedantic -+ -Wnested-externs -Winline -Wshadow - LD=ld - LDFLAGS=-s #-g - diff --git a/base/libcap/libcap-1.10-shared.patch b/base/libcap/libcap-1.10-shared.patch deleted file mode 100644 index 9ba61e372..000000000 --- a/base/libcap/libcap-1.10-shared.patch +++ /dev/null @@ -1,40 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../libcap/libcap-1.10-shared.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2004 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Pulled from RedHat SRPM to (mostly) fix samba (3.0.x) compilation on -non-x86 systems. Most of this patches are bare hacks - but seem to be -commonly accepted ... :-( - - - Rene Rebe - ---- libcap-1.11/libcap/Makefile.shared 1999-04-17 18:16:31.000000000 -0400 -+++ libcap-1.11/libcap/Makefile 2002-07-19 06:24:23.000000000 -0400 -@@ -56,12 +56,12 @@ cap_names.sed: Makefile /usr/include/lin - # @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed - - $(MINLIBNAME): $(OBJS) -- $(LD) -soname $(MAJLIBNAME) -x -shared -o $@ $(OBJS) -+ $(CC) -Wl,-soname,$(MAJLIBNAME) -Wl,-x -shared -o $@ $(OBJS) - ln -sf $(MINLIBNAME) $(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBNAME) - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) -fpic -c $< -o $@ - - install: all - mkdir -p -m 0755 $(INCDIR)/sys diff --git a/base/libcap/libcap-1.10-userland.patch b/base/libcap/libcap-1.10-userland.patch deleted file mode 100644 index 45f000a86..000000000 --- a/base/libcap/libcap-1.10-userland.patch +++ /dev/null @@ -1,42 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../libcap/libcap-1.10-userland.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2004 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Pulled from RedHat SRPM to (mostly) fix samba (3.0.x) compilation on -non-x86 systems. Most of this patches are bare hacks - but seem to be -commonly accepted ... :-( - - - Rene Rebe - ---- libcap-1.10/libcap/include/sys/capability.h.foo Fri Nov 9 16:26:25 2001 -+++ libcap-1.10/libcap/include/sys/capability.h Fri Nov 9 16:28:47 2001 -@@ -21,6 +21,16 @@ - */ - - #include -+#include -+ -+/* -+ * 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 -+typedef uint32_t __u32; -+ - #include - - /* diff --git a/base/libcap/libcap.desc b/base/libcap/libcap.desc index 2e83551a9..397460641 100644 --- a/base/libcap/libcap.desc +++ b/base/libcap/libcap.desc @@ -1,9 +1,8 @@ - [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../libcap/libcap.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -34,9 +33,8 @@ [L] BSD [S] Stable -[V] 1.10 +[V] 2.04 [P] X -----5---9 138.800 -[D] 2513665576 libcap-1.10.tar.bz2 http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/ +[D] 3811970017 libcap-2.04.tar.bz2 http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ [D] 1403010116 capfaq-0.2.txt http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/ -