Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-libs/libcap/files/1.10-python.patch112
-rw-r--r--sys-libs/libcap/files/libcap-1.10-auditcaps.diff14
-rw-r--r--sys-libs/libcap/files/libcap-1.10-headers.patch20
-rw-r--r--sys-libs/libcap/files/libcap-1.10-nostrip.patch15
-rw-r--r--sys-libs/libcap/files/libcap-1.10-r4-staticfix.diff55
-rw-r--r--sys-libs/libcap/libcap-1.10-r11.ebuild78
-rw-r--r--sys-libs/libcap/libcap-2.08-r1.ebuild49
-rw-r--r--sys-libs/libcap/libcap-2.08.ebuild48
-rw-r--r--sys-libs/libcap/libcap-2.10.ebuild46
9 files changed, 0 insertions, 437 deletions
diff --git a/sys-libs/libcap/files/1.10-python.patch b/sys-libs/libcap/files/1.10-python.patch
deleted file mode 100644
index 6e87babc983e..000000000000
--- a/sys-libs/libcap/files/1.10-python.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ur libcap-1.10.orig/libcap/Makefile libcap-1.10/libcap/Makefile
---- libcap-1.10.orig/libcap/Makefile 2003-09-29 22:26:56.856116136 -0400
-+++ libcap-1.10/libcap/Makefile 2003-09-29 22:31:06.204209464 -0400
-@@ -33,6 +33,7 @@
- # Library version
- #
- LIBNAME=libcap
-+PYTHONMODNAME=libcapmodule.so
- #
-
- FILES=cap_alloc cap_proc cap_extint cap_flag cap_text cap_sys
-@@ -46,7 +47,11 @@
- MAJLIBNAME=$(LIBNAME).so.$(VERSION)
- MINLIBNAME=$(MAJLIBNAME).$(MINOR)
-
-+ifdef PYTHON
-+all: $(MINLIBNAME) $(LIBNAME).a $(PYTHONMODNAME)
-+else
- all: $(MINLIBNAME) $(LIBNAME).a
-+endif
-
- _makenames: _makenames.c cap_names.sed
- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-@@ -66,6 +71,15 @@
- 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
-+
-+libcap_wrap.o: libcap_wrap.c
-+ $(CC) $(CFLAGS) -fPIC -c $< -o $@
-+
-+$(PYTHONMODNAME): $(LOBJS) libcap_wrap.o
-+ $(LD) -x -shared -o $@ libcap_wrap.o $(LOBJS)
-+
- %.o: %.c $(INCLS)
- $(CC) $(CFLAGS) -c $< -o $@
-
-@@ -82,10 +93,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 libcap.py $(PYTHONMODDIR)/
-+endif
-
- clean:
- $(LOCALCLEAN)
- rm -f $(OBJS) $(LOBJS) $(LIBNAME).a $(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 -ur libcap-1.10.orig/libcap/include/sys/capability.h libcap-1.10/libcap/include/sys/capability.h
---- libcap-1.10.orig/libcap/include/sys/capability.h 2003-09-29 22:26:56.856116136 -0400
-+++ libcap-1.10/libcap/include/sys/capability.h 2003-09-29 22:29:07.457261744 -0400
-@@ -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>
- *
-@@ -354,10 +365,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 +390,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 +400,7 @@
- extern char const *_cap_names[];
-
- #endif /* !defined(_POSIX_SOURCE) */
-+#endif
-
- #ifdef __cplusplus
- }
diff --git a/sys-libs/libcap/files/libcap-1.10-auditcaps.diff b/sys-libs/libcap/files/libcap-1.10-auditcaps.diff
deleted file mode 100644
index efb0a8bc4a89..000000000000
--- a/sys-libs/libcap/files/libcap-1.10-auditcaps.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN libcap-1.10.orig/libcap/include/sys/capability.h libcap-1.10/libcap/include/sys/capability.h
---- libcap-1.10.orig/libcap/include/sys/capability.h 2007-04-01 19:54:19.660718912 -0400
-+++ libcap-1.10/libcap/include/sys/capability.h 2007-04-01 19:56:04.272759689 -0400
-@@ -311,6 +311,10 @@
-
- #define CAP_LEASE 28
-
-+#define CAP_AUDIT_WRITE 29
-+
-+#define CAP_AUDIT_CONTROL 30
-+
- #endif /* !_LINUX_CAPABILITY_H */
-
-
diff --git a/sys-libs/libcap/files/libcap-1.10-headers.patch b/sys-libs/libcap/files/libcap-1.10-headers.patch
deleted file mode 100644
index a936b882ea37..000000000000
--- a/sys-libs/libcap/files/libcap-1.10-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- progs/sucap.c
-+++ progs/sucap.c
-@@ -11,6 +11,7 @@
- #include <sys/types.h>
- #include <errno.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #undef _POSIX_SOURCE
- #include <sys/capability.h>
- #include <pwd.h>
---- progs/execcap.c
-+++ progs/execcap.c
-@@ -10,6 +10,7 @@
- #include <sys/types.h>
- #include <errno.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <sys/capability.h>
- #include <unistd.h>
- #include <string.h>
diff --git a/sys-libs/libcap/files/libcap-1.10-nostrip.patch b/sys-libs/libcap/files/libcap-1.10-nostrip.patch
deleted file mode 100644
index 9908b75520c3..000000000000
--- a/sys-libs/libcap/files/libcap-1.10-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-let portage do the stripping
-
-http://bugs.gentoo.org/133580
-
---- libcap-1.10/progs/Makefile
-+++ libcap-1.10/progs/Makefile
-@@ -44,7 +44,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:
diff --git a/sys-libs/libcap/files/libcap-1.10-r4-staticfix.diff b/sys-libs/libcap/files/libcap-1.10-r4-staticfix.diff
deleted file mode 100644
index 2e8d7e0a5835..000000000000
--- a/sys-libs/libcap/files/libcap-1.10-r4-staticfix.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur libcap-1.10.orig/libcap/Makefile libcap-1.10/libcap/Makefile
---- libcap-1.10.orig/libcap/Makefile 2004-04-25 12:15:02.000000000 -0700
-+++ libcap-1.10/libcap/Makefile 2004-04-25 12:40:47.000000000 -0700
-@@ -34,6 +34,7 @@
- #
- LIBNAME=libcap
- PYTHONMODNAME=libcapmodule.so
-+STATLIBNAME=$(LIBNAME).a
- #
-
- FILES=cap_alloc cap_proc cap_extint cap_flag cap_text cap_sys
-@@ -48,9 +49,9 @@
- MINLIBNAME=$(MAJLIBNAME).$(MINOR)
-
- ifdef PYTHON
--all: $(MINLIBNAME) $(LIBNAME).a $(PYTHONMODNAME)
-+all: $(MINLIBNAME) $(STATLIBNAME) $(PYTHONMODNAME)
- else
--all: $(MINLIBNAME) $(LIBNAME).a
-+all: $(MINLIBNAME) $(STATLIBNAME)
- endif
-
- _makenames: _makenames.c cap_names.sed
-@@ -63,8 +64,8 @@
- @echo "=> making cap_names.c from <sys/capability.h>"
- @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < include/sys/capability.h | fgrep -v 0x > cap_names.sed # @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
-
--$(LIBNAME).a: $(OBJS)
-- ar cruv $(LIBNAME).a $(OBJS)
-+$(STATLIBNAME): $(OBJS)
-+ ar csruv $(STATLIBNAME) $(OBJS)
-
- $(MINLIBNAME): $(LOBJS)
- $(CC) -shared -fPIC -Wl,-soname,$(MAJLIBNAME) -o $@ $(LOBJS)
-@@ -88,7 +89,7 @@
- mkdir -p -m 0755 $(INCDIR)/sys
- install -m 0644 include/sys/capability.h $(INCDIR)/sys
- mkdir -p -m 0755 $(LIBDIR)
-- install -m 0644 $(LIBNAME).a $(LIBDIR)
-+ install -m 0644 $(STATLIBNAME) $(LIBDIR)
- install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
- ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
- ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME).so
-@@ -100,7 +101,10 @@
-
- clean:
- $(LOCALCLEAN)
-- rm -f $(OBJS) $(LOBJS) $(LIBNAME).a $(LIBNAME).so*
-+ rm -f $(OBJS) $(LOBJS) $(STATLIBNAME) $(LIBNAME).so*
- rm -f cap_names.h cap_names.sed _makenames libcap_wrap.c
- cd include/sys && $(LOCALCLEAN)
-+ifdef PYTHON
-+ rm libcap.py libcap_wrap.o libcapmodule.so
-+endif
-
diff --git a/sys-libs/libcap/libcap-1.10-r11.ebuild b/sys-libs/libcap/libcap-1.10-r11.ebuild
deleted file mode 100644
index e2d653b97276..000000000000
--- a/sys-libs/libcap/libcap-1.10-r11.ebuild
+++ /dev/null
@@ -1,78 +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-1.10-r11.ebuild,v 1.9 2008/03/05 15:28:28 nixnut 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
-}
-
-pkg_postinst() {
- use python && python_mod_optimize
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup
-}
diff --git a/sys-libs/libcap/libcap-2.08-r1.ebuild b/sys-libs/libcap/libcap-2.08-r1.ebuild
deleted file mode 100644
index 457b0e3b0e65..000000000000
--- a/sys-libs/libcap/libcap-2.08-r1.ebuild
+++ /dev/null
@@ -1,49 +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.08-r1.ebuild,v 1.1 2008/03/24 14:01:49 vapier 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
- epatch "${FILESDIR}"/${P}-no-static.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.08.ebuild b/sys-libs/libcap/libcap-2.08.ebuild
deleted file mode 100644
index 9734c2e7c257..000000000000
--- a/sys-libs/libcap/libcap-2.08.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.08.ebuild,v 1.1 2008/03/16 07:49:11 vapier 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.10.ebuild b/sys-libs/libcap/libcap-2.10.ebuild
deleted file mode 100644
index 7bf50cce47cc..000000000000
--- a/sys-libs/libcap/libcap-2.10.ebuild
+++ /dev/null
@@ -1,46 +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.10.ebuild,v 1.1 2008/06/01 02:28:26 vapier 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
- epatch "${FILESDIR}"/${PN}-2.08-no-static.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
-
- gen_usr_ldscript libcap.so
- mv "${D}"/$(get_libdir)/libcap.a "${D}"/usr/$(get_libdir)/ || die
-
- dopammod pam_cap/pam_cap.so
- dopamsecurity '' pam_cap/capability.conf
-
- dodoc CHANGELOG README doc/capability.notes
-}