Package: libcap2
Version: 1:2.22-1.2
Followup-For: Bug #689035
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Add patch (which has been forwarded to the upstream maintainer) to define
    new capabilities in most recent kernels.  (LP: #1084000) (Closes: #689035)

This is submitted as an alternative to the previous patch, which uses
the kernel's capability.h to build.  The downside of that patch is that,
for instance, 'capsh --print' still does not know the names of 35 and
36.  With this patch it does.

Thanks for considering the patch.


diff -Nru libcap2-2.22/debian/changelog libcap2-2.22/debian/changelog
diff -Nru libcap2-2.22/debian/control libcap2-2.22/debian/control
--- libcap2-2.22/debian/control 2012-11-26 11:30:29.000000000 -0600
+++ libcap2-2.22/debian/control 2013-01-18 15:41:48.000000000 -0600
@@ -1,8 +1,7 @@
 Source: libcap2
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Torsten Werner <twer...@debian.org>
+Maintainer: Torsten Werner <twer...@debian.org>
 Standards-Version: 3.9.0
 Build-Depends: debhelper (>= 8.1.3~), indent, libattr1-dev, libpam0g-dev
 Homepage: http://sites.google.com/site/fullycapable/
diff -Nru 
libcap2-2.22/debian/patches/0001-Add-CAP_WAKE_ALARM-and-CAP_BLOCK_SUSPEND-to-capabili.patch
 
libcap2-2.22/debian/patches/0001-Add-CAP_WAKE_ALARM-and-CAP_BLOCK_SUSPEND-to-capabili.patch
--- 
libcap2-2.22/debian/patches/0001-Add-CAP_WAKE_ALARM-and-CAP_BLOCK_SUSPEND-to-capabili.patch
 1969-12-31 18:00:00.000000000 -0600
+++ 
libcap2-2.22/debian/patches/0001-Add-CAP_WAKE_ALARM-and-CAP_BLOCK_SUSPEND-to-capabili.patch
 2013-01-18 15:34:20.000000000 -0600
@@ -0,0 +1,34 @@
+From 41ec6f9bdde6998518dd3a8afd8fcc286b81bce3 Mon Sep 17 00:00:00 2001
+From: Serge Hallyn <serge.hal...@ubuntu.com>
+Date: Fri, 18 Jan 2013 15:31:09 -0600
+Subject: [PATCH 1/1] Add CAP_WAKE_ALARM and CAP_BLOCK_SUSPEND to capability.h
+
+Signed-off-by: Serge Hallyn <serge.hal...@ubuntu.com>
+---
+ libcap/include/linux/capability.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/libcap/include/linux/capability.h 
b/libcap/include/linux/capability.h
+index 4924f2a..57026be 100644
+--- a/libcap/include/linux/capability.h
++++ b/libcap/include/linux/capability.h
+@@ -360,7 +360,15 @@ struct cpu_vfs_cap_data {
+    CAP_SYS_ADMIN is not acceptable anymore. */
+ #define CAP_SYSLOG           34
+ 
+-#define CAP_LAST_CAP         CAP_SYSLOG
++/* Allow triggering something that will wake the system */
++
++#define CAP_WAKE_ALARM            35
++
++/* Allow preventing system suspends */
++
++#define CAP_BLOCK_SUSPEND    36
++
++#define CAP_LAST_CAP         CAP_BLOCK_SUSPEND
+ 
+ #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
+ 
+-- 
+1.8.0
+
diff -Nru libcap2-2.22/debian/patches/series libcap2-2.22/debian/patches/series
--- libcap2-2.22/debian/patches/series  2012-07-06 11:53:43.000000000 -0500
+++ libcap2-2.22/debian/patches/series  2013-01-18 15:34:31.000000000 -0600
@@ -1,2 +1,3 @@
 0001-fix-Makefiles.patch
 0003-refine-setcap-error-message.patch
+0001-Add-CAP_WAKE_ALARM-and-CAP_BLOCK_SUSPEND-to-capabili.patch


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to