Version bump #389201 by Jack Szpot.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 226 insertions, 7 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index aebd2a8774c1..c74cca2ee24d 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libcap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.107 2011/06/15 05:28:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.108 2011/11/01 20:42:29 vapier Exp $
+
+*libcap-2.22 (01 Nov 2011)
+
+  01 Nov 2011; Mike Frysinger <vapier@gentoo.org> +libcap-2.22.ebuild,
+  +files/libcap-2.22-build-system-fixes.patch:
+  Version bump #389201 by Jack Szpot.
 
 *libcap-2.21 (15 Jun 2011)
 
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index cf8015d812e2..52293a6bfc08 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2.16/0001-build-system-fixes.patch 4632 RMD160 f0d6589436465fe05227689243832f566e6bb03d SHA1 444bf8cbe6f0652deb4d34fe526057997d210bc7 SHA256 4c4e5dc5d465e7db63076d80b627705e8c65adb55d2e97aeaa976e2fe5c12a1e
 AUX libcap-2.20-build-system-fixes.patch 4832 RMD160 9cba5f737621ced058bd3d6539abe4102853000c SHA1 9c912ed404bf5eeb50b07a59bad23b36621b9e91 SHA256 67a741af74c13a283e73cd3d9e828b73e1db68db19e8010e942c341b6d280842
 AUX libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch 840 RMD160 50016332262dbc2a9af4acee8be28b3a230e655b SHA1 92ceabd66ea59bd92e050b46ddd91c3320ad183e SHA256 29be1427227f9b045151bd02597192bff1c6761c649014b0fd1384f08e010616
 AUX libcap-2.21-include.patch 290 RMD160 ee972e388d9b1ea036223e59d349cff2d5744634 SHA1 64f9c786be36687f37808f77b7ad2f181164c2a7 SHA256 60038e5f67928edbf7e1b43b8799d5a92cff40dd7c3678135c793ed434c29305
+AUX libcap-2.22-build-system-fixes.patch 4922 RMD160 874a60ff961325d0c0bc1f778cf516893b998d06 SHA1 e5665557cbc72770151cf3758617b6ebea861a8b SHA256 6c371caa4fb3e500eda4a98dc6dd4e21a8378117b4d01defb2198184d6ed5a16
 DIST libcap-2.17.tar.bz2 48899 RMD160 4b8ce8b3f42277aeb297a56fb741a8e2f6817dda SHA1 74cad53570cb5c69c08fa3f31b1a3fbf555dab0f SHA256 2cab109eed9bd944408c13efed910091479d8770cf9aa1bec4f9b26d9302f5b0
 DIST libcap-2.19.tar.bz2 53099 RMD160 09aa28c02af494a3ffa638a8c536a95dcd048190 SHA1 77e47faab6016383954a27777747a614edcd2640 SHA256 ed1693e344054a398e68a7cc840892e3d1a880562743bdf28fd918649aa5a4ce
 DIST libcap-2.20.tar.bz2 53629 RMD160 734ec196b63644c66849698a009392e00aea367e SHA1 90ea2ca7325c344d225f863a66b2a9f4b29434ee SHA256 20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220
 DIST libcap-2.21.tar.bz2 54360 RMD160 e422bce7af8bab21df9172fc0d14f7e1443b7299 SHA1 157107c24cb4953573d477bc30dca3c48d06336a SHA256 9e1615bb331786eb6cb3968ca27153bcfac8a16cf8db9253b8407faa53b3f011
+DIST libcap-2.22.tar.bz2 60051 RMD160 e280ca7e7b6247c5e161ddd86f21fe8ba3db4762 SHA1 2136bc24fa35cdcbd00816fbbf312b727150256b SHA256 73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f
 EBUILD libcap-2.17.ebuild 1295 RMD160 8c15404afb209e68ffb34cabd9610d71cc6aa3c9 SHA1 3df005d285c95c0a214dbae2dd59c417c46cc28f SHA256 54ea6cf5fb44e049d786b30578c0f47a5d0b67bd22c7575592693656f4a2abc0
 EBUILD libcap-2.19.ebuild 1241 RMD160 3e97c723b3580f1f1c623b6b075b53ed9912e4c4 SHA1 4338abf829038a8a70e5bdf1a7fc00879d106753 SHA256 8334b3d70bafccfbecac938629acfe6866b5f990a9ae449ec851c2e27a70d3cb
 EBUILD libcap-2.20.ebuild 1255 RMD160 5c564b48afcedade90d1cb6291ef1fa0bff56be6 SHA1 229ae4df168118e4124acc917b47d45c4032fd89 SHA256 14c38763c45c488e74a49a4399b844ea6e5326e8a189feba5e2650b6e424becd
 EBUILD libcap-2.21.ebuild 1299 RMD160 e9943729af5614ad2915b8df74b5d96dfa3a4e21 SHA1 e62f4886152f050a1bd071014aa066ed169c0d47 SHA256 db3f1beac4841be548fb653eed670c7562816f3eb4b318304bb11290c4939754
-MISC ChangeLog 15050 RMD160 dce0723ef53c666235ff57f7eb703dcad8add22c SHA1 e752dbe7e72cbe325b2f34ba887ff067207105f8 SHA256 842a9b7b516beee84542dc509bdbb633b1e9b5ae41d01729170a7278082298ea
+EBUILD libcap-2.22.ebuild 1302 RMD160 e9dc8a5427f522cb30c2208608693d73fa92a6f8 SHA1 b35fc0782562b100db2fbaf5dc6c7dfa94ccc238 SHA256 f63bcc4165024e39c724e3b2ef80e08da669ef8d0d2de3c8eb622e6a5fdf4f9c
+MISC ChangeLog 15238 RMD160 0c7cfd1be7485f3083dd4ee9d1649d51dddec06b SHA1 c5507a092c7b87b43c1d7ab00eee5e6c11f7d026 SHA256 b7f64aa7c21419a519e1d3e68e8453574727a0f5c36bd1d733f4014e9ea0c3ec
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk34QxYACgkQVWmRsqeSphNRKgCbBaAYqxBknQXDG4exBw0+gspC
-ASEAnjDMK3rlfeBKL5h5iDivXNKtuFu8
-=PF7I
+iF4EAREIAAYFAk6wWbwACgkQaC/OocHi7JZqVAD+MfKEy2O6xKPcapK7CKMkZv6U
+aa3kpmIKBRrNnfyVIPwA/17UkQAQ1BfU0qCunxlTVyD49hb/GS4S/tnss+0rfm3A
+=CJh2
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/files/libcap-2.22-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.22-build-system-fixes.patch
new file mode 100644
index 000000000000..51df716758c9
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.22-build-system-fixes.patch
@@ -0,0 +1,162 @@
+From 5540f3c2a3bd70ebc8140b74ac5a0aecdbc53234 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       |   25 +++++++++++++------------
+ libcap/Makefile  |   11 ++++++-----
+ pam_cap/Makefile |    8 +++++---
+ progs/Makefile   |    2 +-
+ 4 files changed, 25 insertions(+), 21 deletions(-)
+
+diff --git a/Make.Rules b/Make.Rules
+index 011aa14..6e432a6 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -44,27 +44,28 @@ MINOR=19
+ 
+ # Compilation specifics
+ 
+-KERNEL_HEADERS := $(topdir)/libcap/include
+-IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+-
+-CC := gcc
+-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-BUILD_CC := $(CC)
+-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
+-AR := ar
+-RANLIB := ranlib
++CC ?= gcc
++CFLAGS ?= -O2
++BUILD_CC ?= $(CC)
++BUILD_CFLAGS ?= $(CFLAGS)
++AR ?= ar
++RANLIB ?= ranlib
+ DEBUG = -g #-DDEBUG
+ 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) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
++CPPFLAGS += -Dlinux
++CFLAGS += $(WARNINGS) $(DEBUG)
+ 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 4762c60..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) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) $(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 9ca5bef..bdae933 100644
+--- a/pam_cap/Makefile
++++ b/pam_cap/Makefile
+@@ -9,6 +9,8 @@ include ../Make.Rules
+ # written (and you know why it fails), email me and explain why. Thanks!
+ LDLIBS += -L../libcap -lcap
+ 
++CFLAGS += -fPIC
++
+ all: pam_cap.so
+ 	$(MAKE) testcompile
+ 
+@@ -17,13 +19,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) $(IPATH) -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 ef51dc6..c261f57 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -22,7 +22,7 @@ $(BUILD): %: %.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+ 
+ %.o: %.c $(INCS)
+-	$(CC) $(IPATH) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(SBINDIR)
+-- 
+1.7.4.rc2
+
diff --git a/sys-libs/libcap/libcap-2.22.ebuild b/sys-libs/libcap/libcap-2.22.ebuild
new file mode 100644
index 000000000000..675f37242f5b
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.22.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22.ebuild,v 1.1 2011/11/01 20:42:29 vapier Exp $
+
+EAPI="2"
+
+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_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.22-build-system-fixes.patch
+	epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch
+	epatch "${FILESDIR}"/${PN}-2.21-include.patch
+	sed -i \
+		-e "/^PAM_CAP/s:=.*:=$(use pam && echo yes || echo no):" \
+		-e '/^DYNAMIC/s:=.*:=yes:' \
+		-e "/^lib=/s:=.*:=/usr/$(get_libdir):" \
+		Make.Rules
+}
+
+src_compile() {
+	tc-export BUILD_CC CC AR RANLIB
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	gen_usr_ldscript -a cap
+
+	dopammod pam_cap/pam_cap.so
+	dopamsecurity '' pam_cap/capability.conf
+
+	dodoc CHANGELOG README doc/capability.notes
+}