Version bump. Fix one compiler warning.

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

4 files changed, 73 insertions, 6 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index d1271d87a973..aebd2a8774c1 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.106 2011/01/26 03:31:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.107 2011/06/15 05:28:48 jer Exp $
+
+*libcap-2.21 (15 Jun 2011)
+
+  15 Jun 2011; Jeroen Roovers <jer@gentoo.org> +libcap-2.21.ebuild,
+  +files/libcap-2.21-include.patch:
+  Version bump. Fix one compiler warning.
 
   26 Jan 2011; Mike Frysinger <vapier@gentoo.org>
   files/libcap-2.20-build-system-fixes.patch:
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 5583b9edfdf0..cf8015d812e2 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
 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
 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
-MISC ChangeLog 14878 RMD160 dcb6c73387621f8df6445c7ba042e26850c4d997 SHA1 cea4175546c87cc9ea3d83409aae7a85288ca964 SHA256 7acd912e0730b0a07835563589595da49f27bcf6f433b8fe36b5f7bdc1d881fb
+EBUILD libcap-2.21.ebuild 1299 RMD160 e9943729af5614ad2915b8df74b5d96dfa3a4e21 SHA1 e62f4886152f050a1bd071014aa066ed169c0d47 SHA256 db3f1beac4841be548fb653eed670c7562816f3eb4b318304bb11290c4939754
+MISC ChangeLog 15050 RMD160 dce0723ef53c666235ff57f7eb703dcad8add22c SHA1 e752dbe7e72cbe325b2f34ba887ff067207105f8 SHA256 842a9b7b516beee84542dc509bdbb633b1e9b5ae41d01729170a7278082298ea
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0/lZYACgkQaC/OocHi7JaHTgEAiqz7lVr3RqhD8o1rDYXBNciH
-UhxniGjjSppGIx2G+00A/0JynG2ss5czZlkw054iHQsdXUbN1WxK8N46rEBujKA1
-=ku/3
+iEYEARECAAYFAk34QxYACgkQVWmRsqeSphNRKgCbBaAYqxBknQXDG4exBw0+gspC
+ASEAnjDMK3rlfeBKL5h5iDivXNKtuFu8
+=PF7I
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/files/libcap-2.21-include.patch b/sys-libs/libcap/files/libcap-2.21-include.patch
new file mode 100644
index 000000000000..2a534246ee01
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.21-include.patch
@@ -0,0 +1,10 @@
+--- libcap/libcap.h.org	2011-06-15 07:25:58.912480899 +0200
++++ libcap/libcap.h	2011-06-15 07:26:16.421329661 +0200
+@@ -13,6 +13,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/capability.h>
++#include <sys/prctl.h> /* prctl() */
+ 
+ #ifndef __u8
+ #define __u8    unsigned char
diff --git a/sys-libs/libcap/libcap-2.21.ebuild b/sys-libs/libcap/libcap-2.21.ebuild
new file mode 100644
index 000000000000..0fc646c7fb71
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.21.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.21.ebuild,v 1.1 2011/06/15 05:28:48 jer 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
+	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
+}