summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-12-24 21:46:15 +0000
committerMike Frysinger <vapier@gentoo.org>2008-12-24 21:46:15 +0000
commit2c5c75316cbbd435ae67cc1761e3aa9ac59587c3 (patch)
treec29dbbc02fc95b62bbb6baf505b5e133aa29cb0f /sys-libs
parentold (diff)
downloadhistorical-2c5c75316cbbd435ae67cc1761e3aa9ac59587c3.tar.gz
historical-2c5c75316cbbd435ae67cc1761e3aa9ac59587c3.tar.bz2
historical-2c5c75316cbbd435ae67cc1761e3aa9ac59587c3.zip
Version bump #252319 by Arfrever Frehtes Taifersar Arahesis.
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libcap/ChangeLog8
-rw-r--r--sys-libs/libcap/Manifest15
-rw-r--r--sys-libs/libcap/files/2.16/0001-build-system-fixes.patch154
-rw-r--r--sys-libs/libcap/libcap-2.16.ebuild43
4 files changed, 211 insertions, 9 deletions
diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 024fb19ae671..5741eed80af2 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-libs/libcap
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.77 2008/11/27 18:25:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.78 2008/12/24 21:46:15 vapier Exp $
+
+*libcap-2.16 (24 Dec 2008)
+
+ 24 Dec 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/2.16/0001-build-system-fixes.patch, +libcap-2.16.ebuild:
+ Version bump #252319 by Arfrever Frehtes Taifersar Arahesis.
*libcap-2.15 (27 Nov 2008)
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 4f14c1c8fde1..5d7687a488cf 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -2,22 +2,21 @@
Hash: SHA1
AUX 2.11/0001-Make-fixes.patch 3320 RMD160 083e071500f9e98475133a9b1e0b0ffe905e12a9 SHA1 3847289072d05e52224513a3c38a6874508f7159 SHA256 720907c5d37d9d8d81c20fcc5f8da67a87b048bfa95488cf03978282de2fd214
-AUX 2.14/0001-Make.Rules-fix-INDENT-test.patch 1081 RMD160 4354addce0171107b6aa2079a5fced8135b4a608 SHA1 d43a934a6f1a3263eedc979ea6b8ec9a344f481f SHA256 dcd5edb0d78400e0fc191369113bd832eb2066eaa2e1d85cdfee01b4af74ed98
-AUX 2.14/0001-cleanup-build-system.patch 4561 RMD160 0db65ee6b9cbe023801400d1492c592599b5a171 SHA1 9644f529216387fbeacdca6a218b006e75aae672 SHA256 2fdf24d69fde74e277bcd7b12ee4e36b5790eb792481a60fcec43d96c3227856
AUX 2.15/0001-build-system-fixes.patch 4623 RMD160 ce1bd3f18b19071b088361edcfebcfa21cb65d6d SHA1 cf3ce5a28af79c524a98909a8fa05152cf56e5ff SHA256 e369643f3c6cb92161607ecf685a19f8b975a8bc711f4274e2203deceb5503ee
+AUX 2.16/0001-build-system-fixes.patch 4626 RMD160 c65682439da1234a2d65c78331ad1abf662ade44 SHA1 26bb56752cd1cf51eb4cf0ee4baca6581c12f947 SHA256 b271302691e2839e36ca51d8aeef11f527ed70b5aa43b80e7e3b93fa7f6c255d
AUX libcap-2.08-no-static.patch 150 RMD160 d20c85f07180de6220c432a9dc38c226a76781d4 SHA1 145a2b9b8dbeca0bfc6158891668d9fa1dfd9cf9 SHA256 e8608c1b17d474d26f220774e9144b36d162c0e9122afd46ed76e17b7093bea5
DIST libcap-2.11.tar.bz2 47321 RMD160 e4ab15205b0638e88a4c5346c0ccc8e1fe6ccc81 SHA1 b292d74897bffd1f58a2cde0df4bd4a1433d58aa SHA256 a39882189f1921008eb18acc3f5517697ab13ad5eed1762ce67e31ff53805889
-DIST libcap-2.14.tar.bz2 47970 RMD160 f33ca18f2e62f94a7884f220542170583d52ddf3 SHA1 6445ec4a7faa090dbde8c7c419a0f1b17270fb32 SHA256 4bdf48718a8f4b210334570300857fd9efea3f6f905ac9be98d1d4da50c7882d
DIST libcap-2.15.tar.bz2 48366 RMD160 4b93df3706923589f95b6c3450638bf4651bebc7 SHA1 99f9ebbd31c83925b7420f18aff90bf345d8cb5c SHA256 1c2b35eda964f86db32f37d6962d6493ae8325d2bba71bdbc7742419a3dc8721
+DIST libcap-2.16.tar.bz2 48451 RMD160 5cafe706af24d05c7a170005584892071183e9f0 SHA1 df4129715f6d77366972723e885dd3df817ac99d SHA256 9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f
EBUILD libcap-2.11.ebuild 1301 RMD160 2e6bdd73f432a1df3aff331fe954b86943e86591 SHA1 a3726b9a30964b4283d559efc961ffc3780347ef SHA256 fc670bbdf1b9fa5ba1981304804e0a64043042223c7b504f54e44d93c192fc17
-EBUILD libcap-2.14.ebuild 1226 RMD160 a5ba5a66289663ca688194a9e1947749d53c081e SHA1 a684febec8a882b89f4e543e6a71a5ef1b4bf3d1 SHA256 2313392a2eb601e7ded35f29a6f272a41678ab8bcbb30891d53d8a747e2e2557
EBUILD libcap-2.15.ebuild 1226 RMD160 2f38c7acbcb4f2d87765402b507aacbb5202194a SHA1 5c0426322244bf2e5553680e6704a0ac67fa7774 SHA256 f77b4010aa75e5377dd6e9f0b52126e2c7cc622b8b659d702d58577b1ee2969d
-MISC ChangeLog 11145 RMD160 c0ab9c8805a70e9481d92c0f0c3c615f0e28382b SHA1 8abbd0dea7024e1b895bf08393833cecd528f6e7 SHA256 670e91953401d52afa31d0f71c4c618cb115a83ce5bf4539c4b8ed7bb33e7242
+EBUILD libcap-2.16.ebuild 1226 RMD160 ae1c87e7fd38e3f5aa20b94c999039033705486c SHA1 6b03a088f7a48b5b0407cf968afa90943ed3fc68 SHA256 1fd370af31527abc88801ebda8e790efa823ab9131b666883fce21e59ad4d784
+MISC ChangeLog 11353 RMD160 2f29b6ed40f89e13a9c6b9d9f5d22a939222ff39 SHA1 6479afd2711e90b44fe41ec29a7fe1b42d840248 SHA256 6ffe73b1066fafa5fccbfadfe762314c30d665b41d3f79021b46c66c12f55d0b
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkku5hcACgkQ67wieSYcaxeE3QCgm/4E/KVf5lcfOYOaZkz7lOiT
-LAsAnRovO1imhNIzGegA52o46OpF+5H+
-=QU9C
+iEYEARECAAYFAklSuCIACgkQn/5bYzqsSmHSYACcD8YzeZI2Bkxb5gXvWU335/9u
+lh0AoJCCtteuSYidjq6iERdIR9qEd8om
+=ihAP
-----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/files/2.16/0001-build-system-fixes.patch b/sys-libs/libcap/files/2.16/0001-build-system-fixes.patch
new file mode 100644
index 000000000000..9225f3237d05
--- /dev/null
+++ b/sys-libs/libcap/files/2.16/0001-build-system-fixes.patch
@@ -0,0 +1,154 @@
+From 7ee197885e113878aedab58bdda80302e42aff4c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 16 Nov 2008 09:10:31 -0500
+Subject: [PATCH] build system fixes
+
+This touches up the homebrewed build system to work much better "out of the
+box" for people. Specifically:
+ - allow toolchain vars to be set via environment
+ - CC / BUILD_CC / AR / RANLIB
+ - CFLAGS / CPPFLAGS / LDFLAGS
+ - split CPPFLAGS out of CFLAGS
+ - break -fPIC out of global CFLAGS and only use where needed
+ - use LDLIBS for libraries, not LDFLAGS
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Make.Rules | 28 ++++++++++++++--------------
+ libcap/Makefile | 11 ++++++-----
+ pam_cap/Makefile | 6 +++---
+ progs/Makefile | 2 +-
+ 4 files changed, 24 insertions(+), 23 deletions(-)
+
+diff --git a/Make.Rules b/Make.Rules
+index 6e63a5b..32cb5ea 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -42,27 +42,27 @@ MINOR=16
+
+ # Compilation specifics
+
+-KERNEL_HEADERS := $(topdir)/libcap/include
+-IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+-
+-CC := gcc
+-CFLAGS := -O2
+-BUILD_CC := $(CC)
+-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
+-AR := ar
+-RANLIB := ranlib
+-DEBUG = -g #-DDEBUG
+-WARNINGS=-fPIC -Wall -Wwrite-strings \
++CC ?= gcc
++BUILD_CC ?= $(CC)
++AR ?= ar
++RANLIB ?= ranlib
++CFLAGS ?= -O2
++BUILD_CFLAGS ?= $(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
+
+-SYSTEM_HEADERS = /usr/include
++KERNEL_HEADERS = $(topdir)/libcap/include
++LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
++CPPFLAGS += $(LIBCAP_CPPFLAGS)
++BUILD_CPPFLAGS += $(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)
+ INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 8a61752..cf99523 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text
+ # no support).
+ ifeq ($(LIBATTR),yes)
+ FILES += cap_file
+-LDFLAGS += -lattr
++LDLIBS += -lattr
+ endif
+
+ INCLS=libcap.h cap_names.h $(INCS)
+@@ -24,6 +24,7 @@ OBJS=$(addsuffix .o, $(FILES))
+ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
++CFLAGS += -fPIC
+
+ all: $(MINLIBNAME) $(STALIBNAME)
+
+@@ -33,7 +34,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT)
+ endif
+
+ _makenames: _makenames.c cap_names.list.h
+- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
+
+ cap_names.h: _makenames
+ ./_makenames > cap_names.h
+@@ -50,15 +51,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 eae88ed..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) $(LDFLAGS) -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) $(LDFLAGS) -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 a1542dc..612cf86 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -22,7 +22,7 @@ $(BUILD): %: %.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)
+--
+1.6.0.4
+
diff --git a/sys-libs/libcap/libcap-2.16.ebuild b/sys-libs/libcap/libcap-2.16.ebuild
new file mode 100644
index 000000000000..8c85e97da96b
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.16.ebuild
@@ -0,0 +1,43 @@
+# 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.16.ebuild,v 1.1 2008/12/24 21:46:15 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
+ sed -i -e '/cap_setfcap.*morgan/s:^:#:' pam_cap/capability.conf
+}
+
+src_compile() {
+ tc-export BUILD_CC CC AR RANLIB
+ emake DYNAMIC=yes 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
+}