diff options
Diffstat (limited to 'sys-libs/libcap')
| -rw-r--r-- | sys-libs/libcap/files/2.06/0001-set-FAKEROOT-to-DESTDIR-by-default.patch | 29 | ||||
| -rw-r--r-- | sys-libs/libcap/files/2.06/0002-do-not-use-the-s-flag-with-install.patch | 31 | ||||
| -rw-r--r-- | sys-libs/libcap/files/2.06/0003-Add-.gitignore-files.patch | 57 | ||||
| -rw-r--r-- | sys-libs/libcap/files/2.06/0004-Do-not-run-ldconfig-for-FAKEROOT-installs.patch | 33 | ||||
| -rw-r--r-- | sys-libs/libcap/files/2.06/0005-Do-not-hard-code-toolchain-binaries.patch | 48 | ||||
| -rw-r--r-- | sys-libs/libcap/files/2.06/0006-cleanup-build-system.patch | 199 | ||||
| -rw-r--r-- | sys-libs/libcap/files/libcap-1.10-python-2.patch | 132 | ||||
| -rw-r--r-- | sys-libs/libcap/files/libcap-1.10-syscall.patch | 37 | ||||
| -rw-r--r-- | sys-libs/libcap/libcap-1.10-r10.ebuild | 70 | ||||
| -rw-r--r-- | sys-libs/libcap/libcap-1.10-r5.ebuild | 55 | ||||
| -rw-r--r-- | sys-libs/libcap/libcap-1.10-r8.ebuild | 67 | ||||
| -rw-r--r-- | sys-libs/libcap/libcap-1.10-r9.ebuild | 69 | ||||
| -rw-r--r-- | sys-libs/libcap/libcap-2.06-r1.ebuild | 48 | ||||
| -rw-r--r-- | sys-libs/libcap/libcap-2.06.ebuild | 43 |
14 files changed, 0 insertions, 918 deletions
diff --git a/sys-libs/libcap/files/2.06/0001-set-FAKEROOT-to-DESTDIR-by-default.patch b/sys-libs/libcap/files/2.06/0001-set-FAKEROOT-to-DESTDIR-by-default.patch deleted file mode 100644 index c32f6e8cd7a9..000000000000 --- a/sys-libs/libcap/files/2.06/0001-set-FAKEROOT-to-DESTDIR-by-default.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bdf315fc208c8fcf2c1f1cfa5450e51ab9e29f20 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 16 Feb 2008 16:06:55 -0500 -Subject: [PATCH] set FAKEROOT to DESTDIR by default - -Since the DESTDIR variable is the common standard for installing into a -staging directory, the FAKEROOT variable should default to it. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Make.Rules | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index db3aab2..9bccbb7 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -4,7 +4,7 @@ - - # common 'packaging' directoty - --FAKEROOT= -+FAKEROOT=$(DESTDIR) - - # Autoconf-style prefixes are activated when $(prefix) is defined. - # Otherwise binaries and libraraies are installed in /{lib,sbin}/, --- -1.5.4 - diff --git a/sys-libs/libcap/files/2.06/0002-do-not-use-the-s-flag-with-install.patch b/sys-libs/libcap/files/2.06/0002-do-not-use-the-s-flag-with-install.patch deleted file mode 100644 index 2710efaea893..000000000000 --- a/sys-libs/libcap/files/2.06/0002-do-not-use-the-s-flag-with-install.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7dcf80ba834e54d6745575086eb4e4c4db1cad92 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 16 Feb 2008 16:09:51 -0500 -Subject: [PATCH] do not use the '-s' flag with `install` - -The `install` program strips binaries when given the '-s' flag. This step -should be left up to package maintainers to handle the stripping, especially -since the `install` program will always execute `strip` -- this is no good -for cross-compiling for example. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - progs/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/progs/Makefile b/progs/Makefile -index 9d25a78..d711656 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -17,7 +17,7 @@ $(PROGS): %: %.o - install: all - mkdir -p -m 0755 $(SBINDIR) - for p in $(PROGS) ; do \ -- install -s -m 0755 $$p $(SBINDIR) ; \ -+ install -m 0755 $$p $(SBINDIR) ; \ - done - - clean: --- -1.5.4 - diff --git a/sys-libs/libcap/files/2.06/0003-Add-.gitignore-files.patch b/sys-libs/libcap/files/2.06/0003-Add-.gitignore-files.patch deleted file mode 100644 index e4f71858b4fa..000000000000 --- a/sys-libs/libcap/files/2.06/0003-Add-.gitignore-files.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f016763e8d886120be6d3fe9740f34bb5ae8487a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 16 Feb 2008 16:14:58 -0500 -Subject: [PATCH] Add .gitignore files - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - .gitignore | 1 + - libcap/.gitignore | 6 ++++++ - pam_cap/.gitignore | 2 ++ - progs/.gitignore | 4 ++++ - 4 files changed, 13 insertions(+), 0 deletions(-) - create mode 100644 .gitignore - create mode 100644 libcap/.gitignore - create mode 100644 pam_cap/.gitignore - create mode 100644 progs/.gitignore - -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..5761abc ---- /dev/null -+++ b/.gitignore -@@ -0,0 +1 @@ -+*.o -diff --git a/libcap/.gitignore b/libcap/.gitignore -new file mode 100644 -index 0000000..9fc5e1d ---- /dev/null -+++ b/libcap/.gitignore -@@ -0,0 +1,6 @@ -+cap_names.h -+cap_names.sed -+_caps_output.gperf -+libcap.a -+libcap.so* -+_makenames -diff --git a/pam_cap/.gitignore b/pam_cap/.gitignore -new file mode 100644 -index 0000000..11806f5 ---- /dev/null -+++ b/pam_cap/.gitignore -@@ -0,0 +1,2 @@ -+pam_cap.so -+testcompile -diff --git a/progs/.gitignore b/progs/.gitignore -new file mode 100644 -index 0000000..280c19e ---- /dev/null -+++ b/progs/.gitignore -@@ -0,0 +1,4 @@ -+capsh -+getcap -+getpcaps -+setcap --- -1.5.4 - diff --git a/sys-libs/libcap/files/2.06/0004-Do-not-run-ldconfig-for-FAKEROOT-installs.patch b/sys-libs/libcap/files/2.06/0004-Do-not-run-ldconfig-for-FAKEROOT-installs.patch deleted file mode 100644 index 4e032f42193c..000000000000 --- a/sys-libs/libcap/files/2.06/0004-Do-not-run-ldconfig-for-FAKEROOT-installs.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4d901fdeb7af70d5e7800848f0a33af6cbeb491d Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 16 Feb 2008 16:22:02 -0500 -Subject: [PATCH] Do not run ldconfig for FAKEROOT installs - -If you're installing into a temporary directory, then running ldconfig will -simply waste CPU and I/O time. The install location will not be any path -that ldconfig searches, and generally people build as non-root so the -ldconfig binary will run for a while before erroring out due to lack of -permissions. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libcap/Makefile | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/libcap/Makefile b/libcap/Makefile -index fdb9ae2..b108aa9 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -62,7 +62,9 @@ install: all - install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME) - ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME) -+ifeq ($(FAKEROOT),) - -/sbin/ldconfig -+endif - - clean: - $(LOCALCLEAN) --- -1.5.4 - diff --git a/sys-libs/libcap/files/2.06/0005-Do-not-hard-code-toolchain-binaries.patch b/sys-libs/libcap/files/2.06/0005-Do-not-hard-code-toolchain-binaries.patch deleted file mode 100644 index d9431f9d6e53..000000000000 --- a/sys-libs/libcap/files/2.06/0005-Do-not-hard-code-toolchain-binaries.patch +++ /dev/null @@ -1,48 +0,0 @@ -From adf5e017030a62ea4cab21067b52ee1d336da222 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 16 Feb 2008 16:25:28 -0500 -Subject: [PATCH] Do not hard code toolchain binaries - -If you are cross-compiling, you cannot execute `ar` and `ranlib` on the -target library, otherwise things may break. Here we create standard AR -and RANLIB variables which can easily be overridden by the environment. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Make.Rules | 4 +++- - libcap/Makefile | 4 ++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 9bccbb7..3f38e72 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -42,7 +42,9 @@ MINOR=06 - - # Compilation specifics - --CC=gcc -+CC ?= gcc -+AR ?= ar -+RANLIB ?= ranlib - COPTFLAGS=-O2 - DEBUG=-O2 -g #-DDEBUG - WARNINGS=-fPIC -Wall -Wwrite-strings \ -diff --git a/libcap/Makefile b/libcap/Makefile -index b108aa9..09a12d2 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -40,8 +40,8 @@ cap_names.sed: Makefile $(KERNEL_HEADERS)/linux/capability.h - @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/\{\"\1\",\2\},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@ - - $(STALIBNAME): $(OBJS) -- ar rcs $(STALIBNAME) $(OBJS) -- ranlib $(STALIBNAME) -+ $(AR) rcs $(STALIBNAME) $(OBJS) -+ $(RANLIB) $(STALIBNAME) - - $(MINLIBNAME): $(OBJS) - $(LD) $(LDFLAGS) $(COPTFLAG) -Wl,-soname,$(MAJLIBNAME) -o $@ $(OBJS) --- -1.5.4 - diff --git a/sys-libs/libcap/files/2.06/0006-cleanup-build-system.patch b/sys-libs/libcap/files/2.06/0006-cleanup-build-system.patch deleted file mode 100644 index 590567013a2b..000000000000 --- a/sys-libs/libcap/files/2.06/0006-cleanup-build-system.patch +++ /dev/null @@ -1,199 +0,0 @@ -From 5ec19bea0899c6e305337331ad4f8f8669492f28 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 16 Feb 2008 16:51:53 -0500 -Subject: [PATCH] cleanup build system - -This refactors the homebrewed build system to work much better "out of the -box" for people. It moves tools/flags into appropriate env-overridable -variables as well as simplifies the subdirectory handling and flag passing. -A few bug fixes are also mixed in such as proper link order, parallel build -failure due to local header generation, and splitting up of logic between -binaries compiled and run on the build system and binaries compiled to run -on the target system. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Make.Rules | 27 +++++++++++---------------- - Makefile | 8 ++++---- - libcap/Makefile | 18 ++++++++++-------- - pam_cap/Makefile | 9 ++++++--- - progs/Makefile | 7 +++++-- - 5 files changed, 36 insertions(+), 33 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 3f38e72..17e71c1 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -43,33 +43,28 @@ MINOR=06 - # Compilation specifics - - CC ?= gcc -+BUILD_CC ?= $(CC) - AR ?= ar - RANLIB ?= ranlib --COPTFLAGS=-O2 --DEBUG=-O2 -g #-DDEBUG --WARNINGS=-fPIC -Wall -Wwrite-strings \ -+CFLAGS ?= -O2 -+BUILD_CFLAGS ?= -+WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow - LD=$(CC) -Wl,-x -shared --LDFLAGS=#-g -+LDFLAGS ?= #-g - - KERNEL_HEADERS = $(topdir)/libcap/include --SYSTEM_HEADERS = /usr/include --IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) -+LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) -+CPPFLAGS += $(LIBCAP_CPPFLAGS) -+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) - INCS=$(topdir)/libcap/include/sys/capability.h --LIBS=-L$(topdir)/libcap -lcap --CFLAGS=-Dlinux $(WARNINGS) $(DEBUG) $(COPTFLAG) $(IPATH) -+LDFLAGS += -L$(topdir)/libcap -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) - PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) - # Global cleanup stuff - - LOCALCLEAN=rm -f *~ core - DISTCLEAN=@find . \( -name '*.orig' -o -name '*.rej' \) | xargs rm -f -- --# Flags to pass down recursive makes -- --MAKE_DEFS = CC='$(CC)' CFLAGS='$(CFLAGS)' \ -- LD='$(LD)' LIBS='$(LIBS)' LDFLAGS='$(LDFLAGS)' \ -- VERSION='$(VERSION)' MINOR='$(MINOR)' \ -- LIBDIR='$(LIBDIR)' INCDIR='$(INCDIR)' \ -- SBINDIR='$(SBINDIR)' MANDIR='$(MANDIR)' -diff --git a/Makefile b/Makefile -index 52f7b42..9076724 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,12 +9,12 @@ include Make.Rules - # - - all install clean: %: %-here -- $(MAKE) -C libcap $(MAKE_DEFS) $@ -+ $(MAKE) -C libcap $@ - ifneq ($(PAM_CAP),no) -- $(MAKE) -C pam_cap $(MAKE_DEFS) $@ -+ $(MAKE) -C pam_cap $@ - endif -- $(MAKE) -C progs $(MAKE_DEFS) $@ -- $(MAKE) -C doc $(MAKE_DEFS) $@ -+ $(MAKE) -C progs $@ -+ $(MAKE) -C doc $@ - - all-here: - -diff --git a/libcap/Makefile b/libcap/Makefile -index 09a12d2..4bcc279 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -17,7 +17,9 @@ OBJS=$(addsuffix .o, $(FILES)) - MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf --LDFLAGS+=-lattr -+LDLIBS += -lattr -+CFLAGS += -fPIC -+INCLS += cap_names.h - - all: $(MINLIBNAME) $(STALIBNAME) - -@@ -27,7 +29,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT) - endif - - _makenames: _makenames.c cap_names.sed -- $(CC) $(CFLAGS) $< -o $@ -+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h -@@ -40,19 +42,19 @@ cap_names.sed: Makefile $(KERNEL_HEADERS)/linux/capability.h - @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/\{\"\1\",\2\},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@ - - $(STALIBNAME): $(OBJS) -- $(AR) rcs $(STALIBNAME) $(OBJS) -- $(RANLIB) $(STALIBNAME) -+ $(AR) rcs $@ $^ -+ $(RANLIB) $@ - - $(MINLIBNAME): $(OBJS) -- $(LD) $(LDFLAGS) $(COPTFLAG) -Wl,-soname,$(MAJLIBNAME) -o $@ $(OBJS) -+ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS) - ln -sf $(MINLIBNAME) $(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBNAME) - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - --cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) -- $(CC) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(INCDIR)/sys -diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index 3b3d266..e20d059 100644 ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -3,6 +3,9 @@ - topdir=$(shell pwd)/.. - include ../Make.Rules - -+LDLIBS += -lcap -lpam -+CFLAGS += -fPIC -+ - all: pam_cap.so - $(MAKE) testcompile - -@@ -14,13 +17,13 @@ install: - @echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - - pam_cap.so: pam_cap.o -- $(LD) -o pam_cap.so $< $(LIBS) -+ $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - testcompile: test.c pam_cap.o -- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) - - clean: - rm -f *.o *.so testcompile *~ -diff --git a/progs/Makefile b/progs/Makefile -index d711656..9b6b11c 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -6,13 +6,16 @@ include $(topdir)/Make.Rules - # - PROGS=getpcaps getcap setcap capsh - -+LDFLAGS += --static -+LDLIBS += -lcap -+ - all: $(PROGS) - - $(PROGS): %: %.o -- $(CC) --static $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) - - %.o: %.c $(INCS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(SBINDIR) --- -1.5.4 - diff --git a/sys-libs/libcap/files/libcap-1.10-python-2.patch b/sys-libs/libcap/files/libcap-1.10-python-2.patch deleted file mode 100644 index 2560ae06dff3..000000000000 --- a/sys-libs/libcap/files/libcap-1.10-python-2.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -Nur libcap-1.10-14.static/libcap/include/sys/capability.h libcap-1.10-14.static.python/libcap/include/sys/capability.h ---- libcap-1.10-14.static/libcap/include/sys/capability.h 2004-09-16 02:45:13.000000000 +0200 -+++ libcap-1.10-14.static.python/libcap/include/sys/capability.h 2004-09-16 02:52:58.000000000 +0200 -@@ -15,12 +15,23 @@ - extern "C" { - #endif - -+#ifdef SWIG -+%module libcap -+#endif -+ - /* - * This file complements the kernel file by providing prototype - * information for the user library. - */ - -+#ifdef SWIG -+%{ -+#include <sys/types.h> -+#include "libcap.h" -+%} -+#else - #include <sys/types.h> -+#endif - /* - * This is <linux/capability.h> - * -@@ -52,6 +63,7 @@ - - #define _LINUX_CAPABILITY_VERSION 0x19980330 - -+#ifndef SWIG - typedef struct __user_cap_header_struct { - __u32 version; - int pid; -@@ -62,6 +74,7 @@ - __u32 permitted; - __u32 inheritable; - } *cap_user_data_t; -+#endif - - #ifdef __KERNEL__ - -@@ -354,10 +367,12 @@ - int cap_clear(cap_t); - - /* libcap/cap_file.c */ -+#ifndef SWIG - cap_t cap_get_fd(int); - cap_t cap_get_file(const char *); - int cap_set_fd(int, cap_t); - int cap_set_file(const char *, cap_t); -+#endif - - /* libcap/cap_proc.c */ - cap_t cap_get_proc(void); -@@ -377,6 +392,7 @@ - * if the following _POSIX_SOURCE is _undefined_ - */ - -+#ifndef SWIG - #if !defined(_POSIX_SOURCE) - - extern int capset(cap_user_header_t header, cap_user_data_t data); -@@ -386,6 +402,7 @@ - extern char const *_cap_names[]; - - #endif /* !defined(_POSIX_SOURCE) */ -+#endif - - #ifdef __cplusplus - } -diff -Nur libcap-1.10-14.static/libcap/Makefile libcap-1.10-14.static.python/libcap/Makefile ---- libcap-1.10-14.static/libcap/Makefile 2004-09-16 02:48:30.000000000 +0200 -+++ libcap-1.10-14.static.python/libcap/Makefile 2004-09-16 03:01:06.000000000 +0200 -@@ -34,6 +34,8 @@ - # - LIBNAME=libcap - STATLIBNAME=$(LIBNAME).a -+PYTHONMODNAME=_$(LIBNAME).so -+PYTHONPYNAME=$(LIBNAME).py - # - - FILES=cap_alloc cap_proc cap_extint cap_flag cap_text cap_sys -@@ -47,7 +49,11 @@ - MAJLIBNAME=$(LIBNAME).so.$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - -+ifdef PYTHON -+all: $(MINLIBNAME) $(STATLIBNAME) $(PYTHONMODNAME) -+else - all: $(MINLIBNAME) $(STATLIBNAME) -+endif - - _makenames: _makenames.c cap_names.sed - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ -@@ -67,6 +73,18 @@ - ln -sf $(MINLIBNAME) $(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBNAME).so - -+libcap_wrap.c: include/sys/capability.h -+ swig -python -o libcap_wrap.c include/sys/capability.h -+ -+$(PYTHONMODNAME): $(OBJS) libcap_wrap.o -+ $(LD) -x -shared -o $@ libcap_wrap.o $(OBJS) -+ -+libcap_wrap.c: include/sys/capability.h -+ swig -python -o libcap_wrap.c include/sys/capability.h -+ -+$(PYTHONMODNAME): $(OBJS) libcap_wrap.o -+ $(LD) -x -shared -o $@ libcap_wrap.o $(OBJS) -+ - %.o: %.c $(INCLS) - $(CC) $(CFLAGS) -c $< -o $@ - -@@ -83,10 +101,15 @@ - ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME).so - -/sbin/ldconfig -+ifdef PYTHON -+ mkdir -p $(PYTHONMODDIR) -+ install -m 0644 $(PYTHONMODNAME) $(PYTHONMODDIR)/$(PYTHONMODNAME) -+ install -m 0644 $(PYTHONPYNAME) $(PYTHONMODDIR)/$(PYTHONPYNAME) -+endif - - clean: - $(LOCALCLEAN) - rm -f $(OBJS) $(LOBJS) $(STATLIBNAME) $(LIBNAME).so* -- rm -f cap_names.h cap_names.sed _makenames -+ rm -f cap_names.h cap_names.sed _makenames libcap_wrap.c - cd include/sys && $(LOCALCLEAN) - diff --git a/sys-libs/libcap/files/libcap-1.10-syscall.patch b/sys-libs/libcap/files/libcap-1.10-syscall.patch deleted file mode 100644 index 7c751f6514fa..000000000000 --- a/sys-libs/libcap/files/libcap-1.10-syscall.patch +++ /dev/null @@ -1,37 +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.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 diff --git a/sys-libs/libcap/libcap-1.10-r10.ebuild b/sys-libs/libcap/libcap-1.10-r10.ebuild deleted file mode 100644 index 1ec7409760a3..000000000000 --- a/sys-libs/libcap/libcap-1.10-r10.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r10.ebuild,v 1.1 2007/04/02 00:15:04 pebenito Exp $ - -inherit flag-o-matic eutils python multilib toolchain-funcs - -DEB_PVER="14" -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.kernel.org/pub/linux/libs/security/linux-privs/" -SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${P}.tar.bz2 - mirror://debian/pool/main/libc/libcap/libcap_${PV}-${DEB_PVER}.diff.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="python" - -#patch is in recent 2.2 kernels so it works there -DEPEND="virtual/os-headers - python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 )" -RDEPEND="python? ( >=virtual/python-2.2.1 )" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - epatch "${DISTDIR}"/libcap_${PV}-${DEB_PVER}.diff.gz - epatch "${FILESDIR}"/${PV}-python.patch - epatch "${FILESDIR}"/libcap-1.10-r4-staticfix.diff - epatch "${FILESDIR}"/libcap-1.10-nostrip.patch - epatch "${FILESDIR}"/libcap-1.10-headers.patch - epatch "${FILESDIR}"/libcap-1.10-auditcaps.diff - sed -i -e 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules -} - -src_compile() { - local myflags= - if ! tc-is-cross-compiler && use python ; then - python_version - myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYVER}/site-packages" - append-flags "-I/usr/include/python${PYVER}" - fi - - emake COPTFLAG="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${myflags} || die -} - -src_install() { - into / - dosbin progs/{sucap,execcap,setpcaps,getpcaps} || die - dolib.so libcap/libcap.so.${PV} || die - dosym libcap.so.${PV} /$(get_libdir)/libcap.so.1 - dosym libcap.so.1 /$(get_libdir)/libcap.so - gen_usr_ldscript libcap.so - into /usr - dolib.a libcap/libcap.a - - insinto /usr/include/sys - doins libcap/include/sys/capability.h - - dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt - doman doc/*.3 - - if ! tc-is-cross-compiler && use python ; then - python_version - local PYTHONMODDIR="/usr/$(get_libdir)/python${PYVER}/site-packages" - exeinto "${PYTHONMODDIR}" - doexe libcap/libcapmodule.so - insinto "${PYTHONMODDIR}" - doins libcap/libcap.py - fi -} diff --git a/sys-libs/libcap/libcap-1.10-r5.ebuild b/sys-libs/libcap/libcap-1.10-r5.ebuild deleted file mode 100644 index 4076b7ec06ac..000000000000 --- a/sys-libs/libcap/libcap-1.10-r5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r5.ebuild,v 1.6 2007/06/16 07:06:04 vapier Exp $ - -inherit flag-o-matic eutils toolchain-funcs - -DEB_PVER=14 -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.kernel.org/pub/linux/libs/security/linux-privs/" -SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${P}.tar.bz2 - mirror://debian/pool/main/libc/libcap/libcap_${PV}-${DEB_PVER}.diff.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="nocxx python static" - -#patch is in recent 2.2 kernels so it works there -DEPEND="virtual/os-headers - !nocxx? ( python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 ) )" -RDEPEND="!nocxx? ( python? ( >=virtual/python-2.2.1 ) )" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${WORKDIR}/libcap_${PV}-${DEB_PVER}.diff - epatch ${FILESDIR}/${PV}-python.patch - epatch ${FILESDIR}/libcap-1.10-r4-staticfix.diff - sed -i 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules -} - -src_compile() { - local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`" - local myflags="" - use static && CFLAGS="${CFLAGS} -static" && LDFLAGS="${LDFLAGS} -static" - if ! use nocxx && use python ; then - myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYTHONVER}/site-packages" - append-flags -I/usr/include/python${PYTHONVER} - fi - - emake COPTFLAG="${CFLAGS}" LDFLAGS="${LDFLAGS}" DEBUG="" ${myflags} || die -} - -src_install() { - local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`" - local myflags="" - if ! use nocxx && use python ; then - myflags="${myflags} PYTHON=1 PYTHONMODDIR=${D}/usr/$(get_libdir)/python${PYTHONVER}/site-packages" - fi - make install FAKEROOT="${D}" man_prefix=/usr/share LIBDIR="${D}/$(get_libdir)" ${myflags} || die - dodir /usr/$(get_libdir) - mv "${D}"/$(get_libdir)/libcap.a "${D}"/usr/$(get_libdir) - gen_usr_ldscript libcap.so - dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt -} diff --git a/sys-libs/libcap/libcap-1.10-r8.ebuild b/sys-libs/libcap/libcap-1.10-r8.ebuild deleted file mode 100644 index c4ee262f1647..000000000000 --- a/sys-libs/libcap/libcap-1.10-r8.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r8.ebuild,v 1.1 2006/07/15 09:21:27 vapier Exp $ - -inherit flag-o-matic eutils python multilib toolchain-funcs - -DEB_PVER="14" -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.kernel.org/pub/linux/libs/security/linux-privs/" -SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${P}.tar.bz2 - mirror://debian/pool/main/libc/libcap/libcap_${PV}-${DEB_PVER}.diff.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="python" - -#patch is in recent 2.2 kernels so it works there -DEPEND="virtual/os-headers - python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 )" -RDEPEND="python? ( >=virtual/python-2.2.1 )" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - epatch "${DISTDIR}"/libcap_${PV}-${DEB_PVER}.diff.gz - epatch "${FILESDIR}"/${PV}-python.patch - epatch "${FILESDIR}"/libcap-1.10-r4-staticfix.diff - epatch "${FILESDIR}"/libcap-1.10-nostrip.patch - sed -i -e 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules -} - -src_compile() { - local myflags= - if ! tc-is-cross-compiler && use python ; then - python_version - myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYVER}/site-packages" - append-flags "-I/usr/include/python${PYVER}" - fi - - emake COPTFLAG="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${myflags} || die -} - -src_install() { - into / - dosbin progs/{sucap,execcap,setpcaps,getpcaps} || die - dolib.so libcap/libcap.so.${PV} || die - dosym libcap.so.${PV} /$(get_libdir)/libcap.so - gen_usr_ldscript libcap.so - into /usr - dolib.a libcap/libcap.a - - insinto /usr/include/sys - doins libcap/include/sys/capability.h - - dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt - doman doc/*.3 - - if ! tc-is-cross-compiler && use python ; then - python_version - local PYTHONMODDIR="/usr/$(get_libdir)/python${PYVER}/site-packages" - exeinto "${PYTHONMODDIR}" - doexe libcap/libcapmodule.so - insinto "${PYTHONMODDIR}" - doins libcap/libcap.py - fi -} diff --git a/sys-libs/libcap/libcap-1.10-r9.ebuild b/sys-libs/libcap/libcap-1.10-r9.ebuild deleted file mode 100644 index 7d1c077a0920..000000000000 --- a/sys-libs/libcap/libcap-1.10-r9.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r9.ebuild,v 1.10 2007/11/19 06:32:27 kumba Exp $ - -inherit flag-o-matic eutils python multilib toolchain-funcs - -DEB_PVER="14" -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.kernel.org/pub/linux/libs/security/linux-privs/" -SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${P}.tar.bz2 - mirror://debian/pool/main/libc/libcap/libcap_${PV}-${DEB_PVER}.diff.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="python" - -#patch is in recent 2.2 kernels so it works there -DEPEND="virtual/os-headers - python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 )" -RDEPEND="python? ( >=virtual/python-2.2.1 )" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - epatch "${DISTDIR}"/libcap_${PV}-${DEB_PVER}.diff.gz - epatch "${FILESDIR}"/${PV}-python.patch - epatch "${FILESDIR}"/libcap-1.10-r4-staticfix.diff - epatch "${FILESDIR}"/libcap-1.10-nostrip.patch - epatch "${FILESDIR}"/libcap-1.10-headers.patch - sed -i -e 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules -} - -src_compile() { - local myflags= - if ! tc-is-cross-compiler && use python ; then - python_version - myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYVER}/site-packages" - append-flags "-I/usr/include/python${PYVER}" - fi - - emake COPTFLAG="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${myflags} || die -} - -src_install() { - into / - dosbin progs/{sucap,execcap,setpcaps,getpcaps} || die - dolib.so libcap/libcap.so.${PV} || die - dosym libcap.so.${PV} /$(get_libdir)/libcap.so.1 - dosym libcap.so.1 /$(get_libdir)/libcap.so - gen_usr_ldscript libcap.so - into /usr - dolib.a libcap/libcap.a - - insinto /usr/include/sys - doins libcap/include/sys/capability.h - - dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt - doman doc/*.3 - - if ! tc-is-cross-compiler && use python ; then - python_version - local PYTHONMODDIR="/usr/$(get_libdir)/python${PYVER}/site-packages" - exeinto "${PYTHONMODDIR}" - doexe libcap/libcapmodule.so - insinto "${PYTHONMODDIR}" - doins libcap/libcap.py - fi -} diff --git a/sys-libs/libcap/libcap-2.06-r1.ebuild b/sys-libs/libcap/libcap-2.06-r1.ebuild deleted file mode 100644 index 04bc49c506d3..000000000000 --- a/sys-libs/libcap/libcap-2.06-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.06-r1.ebuild,v 1.1 2008/02/18 14:42:57 flameeyes Exp $ - -inherit eutils multilib toolchain-funcs pam - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap${PV:0:1}/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="pam" - -RDEPEND="sys-apps/attr" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - epatch "${FILESDIR}"/${PV}/*.patch - sed -i 's:gperf:false:' libcap/Makefile #210424 - - sed -i -e '/cap_setfcap.*morgan/s:^:#:' pam_cap/capability.conf -} - -src_compile() { - tc-export BUILD_CC CC AR RANLIB - export PAM_CAP=$(use pam && echo yes || echo no) - emake || die -} - -src_install() { - emake install DESTDIR="${D}" lib=$(get_libdir) || die - - dolib.a libcap/libcap.a || die - gen_usr_ldscript libcap.so - - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - - dodoc CHANGELOG README doc/capability.notes - - # let man-pages handle these, especially since theirs are better - rm "${D}"/usr/share/man/man2/cap{g,s}et.2 || die -} diff --git a/sys-libs/libcap/libcap-2.06.ebuild b/sys-libs/libcap/libcap-2.06.ebuild deleted file mode 100644 index 831ea20164e9..000000000000 --- a/sys-libs/libcap/libcap-2.06.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.06.ebuild,v 1.3 2008/02/18 05:22:28 vapier Exp $ - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap${PV:0:1}/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="pam" - -RDEPEND="sys-apps/attr" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - epatch "${FILESDIR}"/${PV}/*.patch - sed -i 's:gperf:false:' libcap/Makefile #210424 -} - -src_compile() { - tc-export BUILD_CC CC AR RANLIB - export PAM_CAP=$(use pam && echo yes || echo no) - emake || die -} - -src_install() { - emake install DESTDIR="${D}" lib=$(get_libdir) || die - - dolib.a libcap/libcap.a || die - gen_usr_ldscript libcap.so - - dodoc CHANGELOG README doc/capability.notes - - # let man-pages handle these, especially since theirs are better - rm "${D}"/usr/share/man/man2/cap{g,s}et.2 || die -} |