From eee1c4d802a119efecef1b01b750c8ef7728267d Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Mon, 2 Apr 2007 00:15:04 +0000 Subject: [PATCH] bump libcap to add audit capabilities Package-Manager: portage-2.1.2.3 --- sys-libs/libcap/ChangeLog | 8 ++- sys-libs/libcap/Manifest | 27 ++++--- sys-libs/libcap/files/digest-libcap-1.10-r10 | 6 ++ .../libcap/files/libcap-1.10-auditcaps.diff | 14 ++++ sys-libs/libcap/libcap-1.10-r10.ebuild | 70 +++++++++++++++++++ 5 files changed, 116 insertions(+), 9 deletions(-) create mode 100644 sys-libs/libcap/files/digest-libcap-1.10-r10 create mode 100644 sys-libs/libcap/files/libcap-1.10-auditcaps.diff create mode 100644 sys-libs/libcap/libcap-1.10-r10.ebuild diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog index 9cbc1ca20d79..067f20798894 100644 --- a/sys-libs/libcap/ChangeLog +++ b/sys-libs/libcap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/libcap # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.48 2007/02/13 23:48:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.49 2007/04/02 00:15:04 pebenito Exp $ + +*libcap-1.10-r10 (02 Apr 2007) + + 02 Apr 2007; Chris PeBenito + +files/libcap-1.10-auditcaps.diff, +libcap-1.10-r10.ebuild: + Update capability.h with #defines for audit capabilities. 13 Feb 2007; Chris Gianelloni libcap-1.10-r9.ebuild: Stable on ppc wrt bug #165742. diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index 221a5c9ef0e1..0a670a6355ef 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -5,6 +5,10 @@ AUX 1.10-python.patch 2796 RMD160 b8fa02d2141048c95bcd07854f3b1a079475467b SHA1 MD5 c91cacf89f9e42e3f7ae3fc8c4fb8501 files/1.10-python.patch 2796 RMD160 b8fa02d2141048c95bcd07854f3b1a079475467b files/1.10-python.patch 2796 SHA256 52ddf875d1ab0553b66c83c01cf145f3e4c714a948a52a568dc1a7642ab3ba73 files/1.10-python.patch 2796 +AUX libcap-1.10-auditcaps.diff 443 RMD160 a53709c50e907c0a250caa86966c4af36b08629d SHA1 6ce77a09480e5b8b216348ddfad0b4a164cb1356 SHA256 1147f37baedb71d3c1242fa3ff5dd7f784d06d0815ce77429ba3570b0be40b3f +MD5 f561206bb25444e05f3f4af82e021077 files/libcap-1.10-auditcaps.diff 443 +RMD160 a53709c50e907c0a250caa86966c4af36b08629d files/libcap-1.10-auditcaps.diff 443 +SHA256 1147f37baedb71d3c1242fa3ff5dd7f784d06d0815ce77429ba3570b0be40b3f files/libcap-1.10-auditcaps.diff 443 AUX libcap-1.10-headers.patch 422 RMD160 b1177097e4e76acb295e4ee4de478eb214c4e45e SHA1 17d7c7e025205a5d8f250b0527f7026ed980f594 SHA256 75a478e4e7b01ae67b93f80580310259e7d436c3ef32da8d8562690881ccf550 MD5 1bd98698e91db1f1e18f46a1a2c8e0df files/libcap-1.10-headers.patch 422 RMD160 b1177097e4e76acb295e4ee4de478eb214c4e45e files/libcap-1.10-headers.patch 422 @@ -27,6 +31,10 @@ RMD160 b369627ad27c14559fdf6e6225c6f0ee607c3e8d files/libcap-1.10-syscall.patch SHA256 d07ade0e8c784074d23cd8a26c5619178f8aa16174543d41bd4e2a9aaf266254 files/libcap-1.10-syscall.patch 1051 DIST libcap-1.10.tar.bz2 26686 RMD160 c1fad30889f0651039efc9db34e72060c4567f71 SHA1 04e699788d98c9ceffaf1292f22a88189ac3d7b7 SHA256 66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc DIST libcap_1.10-14.diff.gz 12928 RMD160 7fbf66ca5795ae8ee05d208d74a76619ad81afae SHA1 e6661aec051ccb201061839d275f2282968d8b93 SHA256 e8fdb798774d49439dd07a6a2858da08a27e6b8057e0f87456a0bc223b74f706 +EBUILD libcap-1.10-r10.ebuild 2282 RMD160 adb1185013886c4b924d1603aa7fd7ebbf41e650 SHA1 73e9a1a6aac0584d066597b0a38206631d7d9543 SHA256 d8a54cddb62af2c8fbdc26db97107fa2d091b3424d4086d072552b5a870c4338 +MD5 fb8701b29577b80bac98d19caf326a86 libcap-1.10-r10.ebuild 2282 +RMD160 adb1185013886c4b924d1603aa7fd7ebbf41e650 libcap-1.10-r10.ebuild 2282 +SHA256 d8a54cddb62af2c8fbdc26db97107fa2d091b3424d4086d072552b5a870c4338 libcap-1.10-r10.ebuild 2282 EBUILD libcap-1.10-r5.ebuild 2120 RMD160 c57f3989bf1d64fb9059b15d390bc2ab288a25ff SHA1 55dc802524ae26aebda5d7d5c936bc36690f4f8f SHA256 e9048cb6f8066492d185cbbfc32112af76f147d4458036ac0b035388b4dba143 MD5 ad37133048585107190e4b3942acb7da libcap-1.10-r5.ebuild 2120 RMD160 c57f3989bf1d64fb9059b15d390bc2ab288a25ff libcap-1.10-r5.ebuild 2120 @@ -39,14 +47,17 @@ EBUILD libcap-1.10-r9.ebuild 2220 RMD160 519b220a7147cbbac48b2171a50c16d6e518a85 MD5 92e7161bd8a8e6f6cf8e0d34d6a53e77 libcap-1.10-r9.ebuild 2220 RMD160 519b220a7147cbbac48b2171a50c16d6e518a855 libcap-1.10-r9.ebuild 2220 SHA256 c2b7edd296c1d46d2b5007fb3badcd112a777dfdd696c52c919006b5e0289e86 libcap-1.10-r9.ebuild 2220 -MISC ChangeLog 6405 RMD160 7442a9c26a3a9854b3ca5a800f58835a76d27eb2 SHA1 42d38f23c73ed89fc11d020476743c843a9216ea SHA256 2bfb55e8418f60a9e148d97bfabfe349c1d1ee9815d77aa6327d45fa3600d99b -MD5 f2829cdb416e12089babbcbfdb4e2618 ChangeLog 6405 -RMD160 7442a9c26a3a9854b3ca5a800f58835a76d27eb2 ChangeLog 6405 -SHA256 2bfb55e8418f60a9e148d97bfabfe349c1d1ee9815d77aa6327d45fa3600d99b ChangeLog 6405 +MISC ChangeLog 6612 RMD160 ca070c2153771eac81fc99de71f7a35f8db3c706 SHA1 83f9760930a966d550d59e91f81f724bef330277 SHA256 bc61bb41227a8b56252448cfe855fbbe2a4a575cea45171003cb37fdf5ba6d8b +MD5 05140cce4fd0956ebf1d93cb744be26c ChangeLog 6612 +RMD160 ca070c2153771eac81fc99de71f7a35f8db3c706 ChangeLog 6612 +SHA256 bc61bb41227a8b56252448cfe855fbbe2a4a575cea45171003cb37fdf5ba6d8b ChangeLog 6612 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 +MD5 ad5f4999ea61a88174e7e84d9a8f84f4 files/digest-libcap-1.10-r10 479 +RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r10 479 +SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r10 479 MD5 ad5f4999ea61a88174e7e84d9a8f84f4 files/digest-libcap-1.10-r5 479 RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r5 479 SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r5 479 @@ -57,9 +68,9 @@ MD5 ad5f4999ea61a88174e7e84d9a8f84f4 files/digest-libcap-1.10-r9 479 RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r9 479 SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r9 479 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF0k45kT4lNIS36YERApK3AKCNEGx7dKhH0PH1xcKPwknh4zRcegCgr3U9 -aMMA9fe3u6kYQvxSmw85Jtw= -=f7T3 +iD8DBQFGEEs4j3aojXnnRpoRAqQ9AJ45iwE6IhRg+wl5tvrMFp+scR74vgCfXa7y +21xeexPPPDvgBNL/AbvRvto= +=VtAX -----END PGP SIGNATURE----- diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r10 b/sys-libs/libcap/files/digest-libcap-1.10-r10 new file mode 100644 index 000000000000..766f3c805465 --- /dev/null +++ b/sys-libs/libcap/files/digest-libcap-1.10-r10 @@ -0,0 +1,6 @@ +MD5 4426a413128142cab89eb2e6f13d8571 libcap-1.10.tar.bz2 26686 +RMD160 c1fad30889f0651039efc9db34e72060c4567f71 libcap-1.10.tar.bz2 26686 +SHA256 66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc libcap-1.10.tar.bz2 26686 +MD5 b867a0c1db9e8ff568415bbcd1fa65dc libcap_1.10-14.diff.gz 12928 +RMD160 7fbf66ca5795ae8ee05d208d74a76619ad81afae libcap_1.10-14.diff.gz 12928 +SHA256 e8fdb798774d49439dd07a6a2858da08a27e6b8057e0f87456a0bc223b74f706 libcap_1.10-14.diff.gz 12928 diff --git a/sys-libs/libcap/files/libcap-1.10-auditcaps.diff b/sys-libs/libcap/files/libcap-1.10-auditcaps.diff new file mode 100644 index 000000000000..efb0a8bc4a89 --- /dev/null +++ b/sys-libs/libcap/files/libcap-1.10-auditcaps.diff @@ -0,0 +1,14 @@ +diff -urN libcap-1.10.orig/libcap/include/sys/capability.h libcap-1.10/libcap/include/sys/capability.h +--- libcap-1.10.orig/libcap/include/sys/capability.h 2007-04-01 19:54:19.660718912 -0400 ++++ libcap-1.10/libcap/include/sys/capability.h 2007-04-01 19:56:04.272759689 -0400 +@@ -311,6 +311,10 @@ + + #define CAP_LEASE 28 + ++#define CAP_AUDIT_WRITE 29 ++ ++#define CAP_AUDIT_CONTROL 30 ++ + #endif /* !_LINUX_CAPABILITY_H */ + + diff --git a/sys-libs/libcap/libcap-1.10-r10.ebuild b/sys-libs/libcap/libcap-1.10-r10.ebuild new file mode 100644 index 000000000000..1ec7409760a3 --- /dev/null +++ b/sys-libs/libcap/libcap-1.10-r10.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r10.ebuild,v 1.1 2007/04/02 00:15:04 pebenito Exp $ + +inherit flag-o-matic eutils python multilib toolchain-funcs + +DEB_PVER="14" +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="http://www.kernel.org/pub/linux/libs/security/linux-privs/" +SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${P}.tar.bz2 + mirror://debian/pool/main/libc/libcap/libcap_${PV}-${DEB_PVER}.diff.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="python" + +#patch is in recent 2.2 kernels so it works there +DEPEND="virtual/os-headers + python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 )" +RDEPEND="python? ( >=virtual/python-2.2.1 )" + +src_unpack() { + unpack ${P}.tar.bz2 + cd "${S}" + epatch "${DISTDIR}"/libcap_${PV}-${DEB_PVER}.diff.gz + epatch "${FILESDIR}"/${PV}-python.patch + epatch "${FILESDIR}"/libcap-1.10-r4-staticfix.diff + epatch "${FILESDIR}"/libcap-1.10-nostrip.patch + epatch "${FILESDIR}"/libcap-1.10-headers.patch + epatch "${FILESDIR}"/libcap-1.10-auditcaps.diff + sed -i -e 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules +} + +src_compile() { + local myflags= + if ! tc-is-cross-compiler && use python ; then + python_version + myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYVER}/site-packages" + append-flags "-I/usr/include/python${PYVER}" + fi + + emake COPTFLAG="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${myflags} || die +} + +src_install() { + into / + dosbin progs/{sucap,execcap,setpcaps,getpcaps} || die + dolib.so libcap/libcap.so.${PV} || die + dosym libcap.so.${PV} /$(get_libdir)/libcap.so.1 + dosym libcap.so.1 /$(get_libdir)/libcap.so + gen_usr_ldscript libcap.so + into /usr + dolib.a libcap/libcap.a + + insinto /usr/include/sys + doins libcap/include/sys/capability.h + + dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt + doman doc/*.3 + + if ! tc-is-cross-compiler && use python ; then + python_version + local PYTHONMODDIR="/usr/$(get_libdir)/python${PYVER}/site-packages" + exeinto "${PYTHONMODDIR}" + doexe libcap/libcapmodule.so + insinto "${PYTHONMODDIR}" + doins libcap/libcap.py + fi +} -- 2.26.2