From 19ff75b7ed460e91e0525077298cd23952f5f6f5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 17 Jan 2009 17:17:17 +0000 Subject: old --- sys-libs/libcap/files/2.11/0001-Make-fixes.patch | 120 ---------------------- sys-libs/libcap/files/libcap-2.08-no-static.patch | 10 -- sys-libs/libcap/libcap-2.11.ebuild | 46 --------- 3 files changed, 176 deletions(-) delete mode 100644 sys-libs/libcap/files/2.11/0001-Make-fixes.patch delete mode 100644 sys-libs/libcap/files/libcap-2.08-no-static.patch delete mode 100644 sys-libs/libcap/libcap-2.11.ebuild (limited to 'sys-libs') diff --git a/sys-libs/libcap/files/2.11/0001-Make-fixes.patch b/sys-libs/libcap/files/2.11/0001-Make-fixes.patch deleted file mode 100644 index a4f30a5033cd..000000000000 --- a/sys-libs/libcap/files/2.11/0001-Make-fixes.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/Make.Rules b/Make.Rules -index d597fde..26335e7 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -42,26 +42,27 @@ - - # Compilation specifics - --CC := gcc --CFLAGS := -O2 --BUILD_CC := $(CC) --BUILD_CFLAGS := $(CFLAGS) --AR := ar --RANLIB := ranlib --DEBUG = -g #-DDEBUG --WARNINGS=-fPIC -Wall -Wwrite-strings \ -+CC ?= gcc -+CFLAGS ?= -O2 -g -+BUILD_CC ?= $(CC) -+BUILD_CFLAGS ?= $(CFLAGS) -+AR ?= ar -+RANLIB ?= ranlib -+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_CFLAGS += $(LIBCAP_CPPFLAGS) - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH) -+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 - -diff --git a/libcap/Makefile b/libcap/Makefile -index da22bd1..55e4fe3 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -17,7 +17,8 @@ OBJS=$(addsuffix .o, $(FILES)) - MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf --LDFLAGS += -lattr -+LDLIBS += -lattr -+CFLAGS += -fPIC - - all: $(MINLIBNAME) $(STALIBNAME) - -@@ -44,15 +45,15 @@ $(STALIBNAME): $(OBJS) - $(RANLIB) $@ - - $(MINLIBNAME): $(OBJS) -- $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ -+ $(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) $(INCLS) -- $(CC) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(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 6483790..bef59d2 100644 ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -14,13 +14,13 @@ install: all - install -m 0755 pam_cap.so $(LIBDIR)/security - - pam_cap.so: pam_cap.o -- $(LD) $(CFLAGS) -o pam_cap.so $< $(LDLIBS) -+ $(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 $(LDLIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) - - clean: - rm -f *.o *.so testcompile *~ -diff --git a/progs/Makefile b/progs/Makefile -index a8e0e53..f568225 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -6,7 +6,7 @@ include $(topdir)/Make.Rules - # - PROGS=getpcaps getcap setcap capsh - --LDFLAGS += --static -+LDFLAGS += --static - LDLIBS += -lcap - - all: $(PROGS) -@@ -15,7 +15,7 @@ $(PROGS): %: %.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) - - %.o: %.c $(INCS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(SBINDIR) diff --git a/sys-libs/libcap/files/libcap-2.08-no-static.patch b/sys-libs/libcap/files/libcap-2.08-no-static.patch deleted file mode 100644 index e1184b3c68a8..000000000000 --- a/sys-libs/libcap/files/libcap-2.08-no-static.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- progs/Makefile -+++ progs/Makefile -@@ -6,7 +6,6 @@ - # - PROGS=getpcaps getcap setcap capsh - --LDFLAGS += --static - LDLIBS += -lcap - - all: $(PROGS) diff --git a/sys-libs/libcap/libcap-2.11.ebuild b/sys-libs/libcap/libcap-2.11.ebuild deleted file mode 100644 index 787e1d58d2c6..000000000000 --- a/sys-libs/libcap/libcap-2.11.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.11.ebuild,v 1.9 2008/10/26 02:35:41 vapier Exp $ - -inherit eutils multilib toolchain-funcs pam - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="mirror://kernel/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 - pam? ( virtual/pam )" -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 - emake PAM_CAP=$(use pam && echo yes || echo no) || 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 -} -- cgit v1.2.3-65-gdbad