Version bump #352680 by Marc Koschewski.

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

5 files changed, 246 insertions, 15 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index da15347ad29f..fc979d498732 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libcap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.104 2010/03/07 00:12:48 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.105 2011/01/25 21:00:58 vapier Exp $
+
+*libcap-2.20 (25 Jan 2011)
+
+  25 Jan 2011; Mike Frysinger <vapier@gentoo.org> +libcap-2.20.ebuild,
+  +files/libcap-2.20-build-system-fixes.patch,
+  +files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch:
+  Version bump #352680 by Marc Koschewski.
 
 *libcap-2.19 (07 Mar 2010)
 
diff --git a/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch
new file mode 100644
index 000000000000..4e113fb93866
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch
@@ -0,0 +1,153 @@
+From bb4491059b315433a421e8fd37286f1a0077fd1e 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 |    6 +++---
+ progs/Makefile   |    2 +-
+ 4 files changed, 23 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
+-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)
++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..be49338 100644
+--- a/pam_cap/Makefile
++++ b/pam_cap/Makefile
+@@ -17,13 +17,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/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
new file mode 100644
index 000000000000..1bc4d63ebb1a
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
@@ -0,0 +1,29 @@
+From f2020ee4ee4b2f245637c77e81d62ab6d1db3c6c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 25 Jan 2011 15:52:31 -0500
+Subject: [PATCH] ignore RAISE_SETFCAP install failures
+
+While the new RAISE_SETFCAP feature is nifty, its failure to run (often
+due to the fs not supporting it) shouldn't impair the default install.
+
+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 c261f57..9e1a84d 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -30,7 +30,7 @@ install: all
+ 		install -m 0755 $$p $(SBINDIR) ; \
+ 	done
+ ifeq ($(RAISE_SETFCAP),yes)
+-	$(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap
++	-$(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap
+ endif
+ 
+ clean:
+-- 
+1.7.4.rc2
+
diff --git a/sys-libs/libcap/libcap-2.20.ebuild b/sys-libs/libcap/libcap-2.20.ebuild
new file mode 100644
index 000000000000..3ce26e997bb5
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.20.ebuild
@@ -0,0 +1,47 @@
+# 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.20.ebuild,v 1.1 2011/01/25 21:00:58 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.20-build-system-fixes.patch
+	epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.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
+}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index be9f12045e33..06ae242443f0 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -2,23 +2,18 @@
 Hash: SHA256
 
 AUX timezone-data-2008h-makefile.patch 4037 RMD160 b7b9926ccee050dd18f2c33f2654a0b6dc4d35e0 SHA1 281539ae7f6fd804fc1e7ec9533552fa7fd50d88 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39
-DIST tzcode2010l.tar.gz 192046 RMD160 2fa4dc6de8b728033cad088e71cb5e7a909729e7 SHA1 c5957ab9cd82f5c2acfec941cc65cf1d61ef62a8 SHA256 489876779f75f1c7659d26c09c3bcce62188b60eeb3981e0e3cd1f7669808ccc
-DIST tzcode2010m.tar.gz 192450 RMD160 5eb78b3ee6801952b4b4d0543d7eff1f94f4e30b SHA1 605eb305d899d48a8ad0d48b0fb175daaf743bb0 SHA256 24f0274d531a53415f1314891bc0df47778044a53186a1c0eb2df3991af91a18
 DIST tzcode2010n.tar.gz 192605 RMD160 27a4c430a12f1c58054d64b32bb8cb5091eef3a9 SHA1 403eff4d9875fb97d73a4d624caa127125f6e1f0 SHA256 f2810d87764f142c762b6d5ec3cb9621c981503c041246a1f6f3c24fd5ef131a
-DIST tzdata2010l.tar.gz 191467 RMD160 da2477896c92a57d6bb93f3dea6febaf63d6e8d1 SHA1 cdf10096260437556c3b7151790ec0db13d3d908 SHA256 bae7b4a8364f7ab3d6d644eb6075de1e9a0c72fb3fb5843fc217d2ff57408577
-DIST tzdata2010m.tar.gz 191470 RMD160 551ea7eaccf64230dd4224997629c647d246535b SHA1 3e74330984b6aeb47cf27de2b860b2c69b2a0731 SHA256 1454a13a32e23e81195404d00ab97a64a356e9a5852fc7d121ed7e58cbdb75aa
-DIST tzdata2010n.tar.gz 191593 RMD160 84e039096a35be5344217f54ac481449ed711062 SHA1 8b7513a69b98af2ee7b61ab6c3c611659bb9f983 SHA256 5946bff5cef28feda6cff241f03c84e528cd4fcc0c2b27b537f52994f8afc70b
+DIST tzcode2011a.tar.gz 193478 RMD160 1cac5d1d12c328ea4848830d296a72ad39e9c9ff SHA1 a7b09c47e04013f28235158d6e04db0e9ac84255 SHA256 65a82a9411f3c085bcd3a4f195709717d3efbca36d9f726afaa3d3155fa34c44
 DIST tzdata2010o.tar.gz 191722 RMD160 8c6aaa2f2ff080d4d371b95e46b3a5a4dbc0412c SHA1 bf1541379d987e99ea1941a32ff629f14b1b142c SHA256 cd0f3799688b3b870cd988505e47c2975b1808e73ec0677bc9db4b705b534c07
-EBUILD timezone-data-2010l.ebuild 3008 RMD160 1b6fd07131a6cd5db07923660a7bc7c0886755d3 SHA1 a84bc3a07f4a234d24d415a51761bdabd033c43d SHA256 ed4b28b918a05bcafa9755423c6ec3065342b6429a30ca684769ecb6a19c0887
-EBUILD timezone-data-2010m.ebuild 3020 RMD160 4e87a592589b744ee06b8375b733ce975da37b14 SHA1 785adb78f63ecb2e5a6b72bfc7c334dbcaf331ff SHA256 ac32e2285f191383b1c3cac8f7bd5914b9497e5d6e9c09212fcaf4b7a81d85ca
-EBUILD timezone-data-2010n.ebuild 3020 RMD160 abdbcb5d0056d7b49e7fa5538991f41a6f14245f SHA1 2df6b015c07235c26526c140226aae06d04baefe SHA256 e4228028946cace2a9e742e07797c175c85fa9301ace24f1932987f87f70df5e
+DIST tzdata2011a.tar.gz 192593 RMD160 636ddcaa2ededce5e01120e7905bd468aa8cfbcc SHA1 5b43a87750c396ce85eae95914a3b1a1458a94ca SHA256 782c691b4750bdefeb84063128db685a8b8f31dc2efb887ee841ae105bfa747b
 EBUILD timezone-data-2010o.ebuild 3011 RMD160 4c57a003fab5e13dae230ba6965a5c4abf414378 SHA1 9043150dbd1cfbfd52ed2feec64d76cddc862d42 SHA256 e70f7258dd901b7295fa76ede9aaa64c279f234f4dbf5240fe2bed0f4ffefdca
-MISC ChangeLog 31071 RMD160 6ccd7b20ed13713c491a92988b1b90bee85c3e24 SHA1 7d319aefa48ce359223f56fd4939a83f11cc0a77 SHA256 764515bfda3ff95ca60cb78d62473a7e1a10ecc0e87299e921d45c81d4166a11
+EBUILD timezone-data-2011a.ebuild 3020 RMD160 976a892911085eb6548722579cbe36b0bb03081a SHA1 f3cca18215fdad79d1fe3e82f5470a21fedbd0a2 SHA256 d4cab3ca14694bc24f0d842a0171feab6f5c7ba15733907cdc559603ec9acb5e
+MISC ChangeLog 31229 RMD160 a63902399c4c68525182d3df0f3f368f78367f10 SHA1 0a654094c86225e26feea23092a31b9afa00e3ff SHA256 c3c6ce96c186458740c1c57a9ffe5226338a29737475183bcfe7c790e37c384b
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0ozcwACgkQaC/OocHi7JYAiwD/XakViE71pBvGhsNu1wXvlzyD
-l7jLGXUlt5BhV4Odx0MA/j2OCN/WYS4q3WYOJaRCBO+DKSnluByrT0ZpwbjT+giK
-=Ubdt
+iF4EAREIAAYFAk0/OhgACgkQaC/OocHi7JbfqAD/eVI+pYY0GNeu957X63esz2Vz
+rh4ijgXyZLeio5sAxXEA/jjpz1BuPmZ5CPKmiGCioZD0gdp0CY1huxSY8tIqj3Sq
+=zVKn
 -----END PGP SIGNATURE-----