Treating bug 22016

6 files changed, 76 insertions, 4 deletions

diff --git a/app-admin/lcap/ChangeLog b/app-admin/lcap/ChangeLog
index cb37e9c9271e..33929e0d12b7 100644
--- a/app-admin/lcap/ChangeLog
+++ b/app-admin/lcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/lcap
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/ChangeLog,v 1.2 2003/04/24 12:32:18 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/ChangeLog,v 1.3 2003/06/11 13:14:31 phosphan Exp $
+
+*lcap-0.0.6-r1 (11 Jun 2003)
+
+  11 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> lcap-0.0.6-r1.ebuild,
+  files/lcap-0.0.6-r1.patch:
+  Should clarify bug 22016 by printing an error message instead of
+  wrong information.
 
   24 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> lcap-0.0.6.ebuild :
   Marked as stable for x86
diff --git a/app-admin/lcap/Manifest b/app-admin/lcap/Manifest
index 0581ec9f983b..85a16293713f 100644
--- a/app-admin/lcap/Manifest
+++ b/app-admin/lcap/Manifest
@@ -1,6 +1,7 @@
 MD5 cc722b2b3adad6f1d0c0836dd72ce3b7 lcap-0.0.6.ebuild 903
-MD5 0682d3ca2805bf18a40a44ef7ce21e80 ChangeLog 643
-MD5 bc8d49bf8884476af8e36258b5c07648 lcap-0.0.6-r1.ebuild 958
+MD5 0c63da71a7ab14a7d4831a42e97553f3 ChangeLog 708
+MD5 9ee839c66a0c0053c6be7089c67a23a3 lcap-0.0.6-r1.ebuild 994
+MD5 bf12167d46f239f3aa2b87d3686b6a36 files/README.gentoo 185
 MD5 b147ed00fa64b3b0be0b78cf2617ce98 files/digest-lcap-0.0.6-r1 66
 MD5 b147ed00fa64b3b0be0b78cf2617ce98 files/digest-lcap-0.0.6 66
-MD5 d25bdd18d8fd480b7324cf9164400651 files/lcap-0.0.6-r1.patch 385
+MD5 7dd1c423588fc70ca3060a912fc32aab files/lcap-0.0.6-r1.patch 385
diff --git a/app-admin/lcap/files/README.gentoo b/app-admin/lcap/files/README.gentoo
new file mode 100644
index 000000000000..4e4c415a92f8
--- /dev/null
+++ b/app-admin/lcap/files/README.gentoo
@@ -0,0 +1,5 @@
+With at least some kernel versions (tried only 2.4.20),
+removing the CAP_SYS_MODULE capability will make you unable to
+alter capabilities at all.
+
+Patrick Kursawe <phosphan@gentoo.org>
diff --git a/app-admin/lcap/files/digest-lcap-0.0.6-r1 b/app-admin/lcap/files/digest-lcap-0.0.6-r1
new file mode 100644
index 000000000000..30b992f2945d
--- /dev/null
+++ b/app-admin/lcap/files/digest-lcap-0.0.6-r1
@@ -0,0 +1 @@
+MD5 bd1c4511c3297e464e1392320c1bdaa5 lcap_0.0.6.orig.tar.gz 12766
diff --git a/app-admin/lcap/files/lcap-0.0.6-r1.patch b/app-admin/lcap/files/lcap-0.0.6-r1.patch
new file mode 100644
index 000000000000..b89f74b874ba
--- /dev/null
+++ b/app-admin/lcap/files/lcap-0.0.6-r1.patch
@@ -0,0 +1,14 @@
+--- lcap.c	2003-06-11 14:29:13.000000000 +0200
++++ lcap-new.c	2003-06-11 15:01:56.000000000 +0200
+@@ -190,7 +190,10 @@
+     exit(errno);
+     };
+   /* snag the current setting */
+-  fscanf(fptr, "%d", &caps);
++  if(fscanf(fptr, "%d", &caps) != 1) {
++	perror("Can't read caps from "PROC_CAP);
++	exit(errno);
++  }	
+   fclose(fptr);
+ 
+   while ((option=getopt(argc, argv, "chvz")) != -1)
diff --git a/app-admin/lcap/lcap-0.0.6-r1.ebuild b/app-admin/lcap/lcap-0.0.6-r1.ebuild
new file mode 100644
index 000000000000..02412aa575e3
--- /dev/null
+++ b/app-admin/lcap/lcap-0.0.6-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/lcap-0.0.6-r1.ebuild,v 1.1 2003/06/11 13:14:43 phosphan Exp $
+
+DESCRIPTION="kernel capability remover"
+
+# The normal homepage of the program was not reachable by the time
+# this ebuild was written
+HOMEPAGE="http://packages.debian.org/unstable/admin/lcap.html"
+
+# same for the sources
+SRC_URI="http://ftp.debian.org/debian/pool/main/l/lcap/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="x86"
+
+IUSE="lids"
+
+DEPEND="virtual/os-headers
+		virtual/glibc"
+RDEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch < ${FILESDIR}/${PF}.patch || die "patch failed"
+	use lids || (sed < Makefile > Makefile.tmp -e "s:LIDS =:#\0:" && \
+				mv Makefile.tmp Makefile)
+}
+		
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	exeinto /usr/sbin
+	doexe lcap
+	doman lcap.8
+	dodoc README
+	dodoc ${FILESDIR}/README.gentoo
+}