Revision bump to fix PAM handling: now the pam USE flag does not only build but also...

Not that I was able to get my user to receive any additional capability, yet.
Package-Manager: portage-2.1.4.4

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 25f48660d2573705da44293ef6475f91dd7584d1..0174171adc873a730b5a80868a507669b482af86 100644 (file)
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,15 @@
 # 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.61 2008/02/18 05:22:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.62 2008/02/18 14:42:57 flameeyes Exp $
+
+*libcap-2.06-r1 (18 Feb 2008)
+
+  18 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/2.06/0006-cleanup-build-system.patch, +libcap-2.06-r1.ebuild:
+  Revision bump to fix PAM handling: now the pam USE flag does not only build
+  but also install pam_cap.so, and the built pam_cap.so is actually working
+  with PAM. Not that I was able to get my user to receive any additional
+  capability, yet.
 
   18 Feb 2008; Mike Frysinger <vapier@gentoo.org> libcap-2.06.ebuild:
   Dont install the capget(2)/capset(2) man pages since the man-pages package

diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 457bdd27c9cc66eea403af0eb46ecbd8a3e7ee98..5b52c88c4408db7248809c66a0834a8af0cac8d4 100644 (file)
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -7,7 +7,7 @@ AUX 2.06/0002-do-not-use-the-s-flag-with-install.patch 930 RMD160 ced887aa7f8739
 AUX 2.06/0003-Add-.gitignore-files.patch 1294 RMD160 fdc4380137ccd12c6870b08422e6b742b4315752 SHA1 331a911b5599a1bf5e7c8b131495e9c6124a9b63 SHA256 efc9a4b172bb1a65915a253e44309646b95a9960b164d72cb6d25f2419ae86fe
 AUX 2.06/0004-Do-not-run-ldconfig-for-FAKEROOT-installs.patch 1030 RMD160 468f0684eb1b0002d795096778744acdc98ef8d6 SHA1 d66aa93977200102f2d375e18bbef09b441a8af8 SHA256 77d41772682d124bfb02ef2a9cd123077383b1ec2950d54954a801afa25cae03
 AUX 2.06/0005-Do-not-hard-code-toolchain-binaries.patch 1543 RMD160 64807ed0e80588b4dfc0836b3bf87bfcb1f53976 SHA1 de92ba2febc538c13af72e456e4d87561002f00a SHA256 f1a77398df4d131016e15bcc53ff7932424fb5db45fe2e51b1a0c993083f3d81
-AUX 2.06/0006-cleanup-build-system.patch 5903 RMD160 cd17e24cfad41bfce72de7d8e1f61d0687be4b3e SHA1 74b3d3e7c26b430ab06743dec83ae4dbf0a1fc04 SHA256 3907880bc0107b65570ca0ec90860edd384e1c862f1e1f22d32aed6e561f8941
+AUX 2.06/0006-cleanup-build-system.patch 5909 RMD160 8223cf9559295053d42b0a5372c437981989d0e2 SHA1 667174e4116ed740436d2584f4fd8865051466f3 SHA256 97bc2509be1da90d2fdc9daa714a308cb3fb3dc088e325164aae64022b98e75c
 AUX libcap-1.10-auditcaps.diff 443 RMD160 a53709c50e907c0a250caa86966c4af36b08629d SHA1 6ce77a09480e5b8b216348ddfad0b4a164cb1356 SHA256 1147f37baedb71d3c1242fa3ff5dd7f784d06d0815ce77429ba3570b0be40b3f
 AUX libcap-1.10-headers.patch 422 RMD160 b1177097e4e76acb295e4ee4de478eb214c4e45e SHA1 17d7c7e025205a5d8f250b0527f7026ed980f594 SHA256 75a478e4e7b01ae67b93f80580310259e7d436c3ef32da8d8562690881ccf550
 AUX libcap-1.10-nostrip.patch 325 RMD160 f4bb1eedfee569c5ea92836f6944555fb2197e24 SHA1 760505b69d6e5156bcddd85b4b08bce374da2fca SHA256 ee2f10a6b8f9d5d680f19fe58e3dd03f1d8045e0cbf0bef5b9cb9b1c8329dc74
@@ -22,13 +22,14 @@ EBUILD libcap-1.10-r11.ebuild 2377 RMD160 40d9e7e4fac164fc093a1ff2e4c86c47bd5368
 EBUILD libcap-1.10-r5.ebuild 2136 RMD160 09ed5c4e207aceee1237bcbed5c301a9756885fb SHA1 764dce4c35816792ec581f7838c2168a6ee2dbfb SHA256 219f4113c5be9961be727914347fcd1390b51ad0963f875210d206035abddfe1
 EBUILD libcap-1.10-r8.ebuild 2136 RMD160 3c44061c68c60ae368e30e4c83eba7620ebf7c5b SHA1 6d7bff54083be7b85f915cd646acf69f31f00a58 SHA256 ae0a5368b189a63411c21c64fb700b10a40303cccccf15d90030b9a8486b4cde
 EBUILD libcap-1.10-r9.ebuild 2217 RMD160 4709b38cf001980835311b0c45538ead80c5752d SHA1 09a7cb05b308ad9edb4fe353bb231a06709cb930 SHA256 39b65d70ec65684049d1f38ab095c4d5b1b233a44e6fa26ab85ee27bbe6354be
+EBUILD libcap-2.06-r1.ebuild 1348 RMD160 2038b9f5bb6480115b872776798f8715833c79c2 SHA1 30b9ed201f11badb37c162b9bb19bcbd900fe00e SHA256 880fb901840e2adddec3a49d4ef000c2a6aaec30a8786ab3248060ca514e70c6
 EBUILD libcap-2.06.ebuild 1200 RMD160 a9aca6e07a95d62e3fc27e9075b07e4afd55f772 SHA1 ebf2cbb14eff16257950ee8aa97bc5a6614d50b4 SHA256 c6b36301ebdc5663b34acecb69c16200906d6e7313e4b2b96616c86b00e0bee1
-MISC ChangeLog 8434 RMD160 702260f11861981a305a7f17ded2e59e512e29ca SHA1 e1f782ead1e120df7374cde1af89bd7949625de3 SHA256 84d8cc308c387ca1a53593feba5a551f8afe78273949264ed3bb9862002d0375
+MISC ChangeLog 8838 RMD160 da0b30bbca2228bf47f48410fe8546a9429c05e6 SHA1 82aa8fd719eb32ec1ae7b95f9a4c73b659240d31 SHA256 c9c70295fb58f0494447545256493ae9053645068c9e9ad8f83134958529cd9f
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHuRYaj9hvisErhMIRArbHAKDR641BmSvOn79vHfi5V3+JHziDkwCeJeso
-/t4bCDPzAhW/eX1MU2ywGas=
-=yp1B
+iD8DBQFHuZl3AiZjviIA2XgRApabAJsEWv7pWt32GwT+g6uX/ymoRaWtigCeNLPW
+7Vx4uDdoLUy/lDRQHBS1kn4=
+=JuEH
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/libcap/files/2.06/0006-cleanup-build-system.patch b/sys-libs/libcap/files/2.06/0006-cleanup-build-system.patch
index cecde8cd2cbefdd17d737ff272fd2bff65a9db1b..590567013a2b9dc5b054c7838400a96906bdd9df 100644 (file)
--- a/sys-libs/libcap/files/2.06/0006-cleanup-build-system.patch
+++ b/sys-libs/libcap/files/2.06/0006-cleanup-build-system.patch
@@ -148,7 +148,7 @@ index 3b3d266..e20d059 100644
  topdir=$(shell pwd)/..
  include ../Make.Rules
  
-+LDLIBS += -lcap
++LDLIBS += -lcap -lpam
 +CFLAGS += -fPIC
 +
  all: pam_cap.so

diff --git a/sys-libs/libcap/libcap-2.06-r1.ebuild b/sys-libs/libcap/libcap-2.06-r1.ebuild
new file mode 100644 (file)
index 0000000..04bc49c
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.06-r1.ebuild
@@ -0,0 +1,48 @@
+# 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.06-r1.ebuild,v 1.1 2008/02/18 14:42:57 flameeyes Exp $
+
+inherit eutils multilib toolchain-funcs pam
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html"
+SRC_URI="http://www.kernel.org/pub/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"
+DEPEND="${RDEPEND}
+       sys-kernel/linux-headers"
+
+src_unpack() {
+       unpack ${P}.tar.bz2
+       cd "${S}"
+       epatch "${FILESDIR}"/${PV}/*.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
+       export PAM_CAP=$(use pam && echo yes || echo no)
+       emake || die
+}
+
+src_install() {
+       emake install DESTDIR="${D}" lib=$(get_libdir) || die
+
+       dolib.a libcap/libcap.a || die
+       gen_usr_ldscript libcap.so
+
+       dopammod pam_cap/pam_cap.so
+       dopamsecurity '' pam_cap/capability.conf
+
+       dodoc CHANGELOG README doc/capability.notes
+
+       # let man-pages handle these, especially since theirs are better
+       rm "${D}"/usr/share/man/man2/cap{g,s}et.2 || die
+}