rpms/libcap-ng/F-12 libcap-ng-0.6.3-setpcap.patch, NONE, 1.1 libcap-ng.spec, 1.13, 1.14

[Steve Grubb]

Author: sgrubb

Update of /cvs/pkgs/rpms/libcap-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7097

Modified Files:
	libcap-ng.spec 
Added Files:
	libcap-ng-0.6.3-setpcap.patch 
Log Message:
* Fri Oct 09 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-3
- Apply patch to retain setpcap only if clearing bounding set


libcap-ng-0.6.3-setpcap.patch:
 cap-ng.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libcap-ng-0.6.3-setpcap.patch ---
diff -urp libcap-ng-0.6.2/src/cap-ng.c libcap-ng-0.6.3/src/cap-ng.c
--- libcap-ng-0.6.2/src/cap-ng.c	2009-09-23 17:31:00.000000000 -0400
+++ libcap-ng-0.6.3/src/cap-ng.c	2009-10-09 08:59:01.000000000 -0400
@@ -549,8 +549,9 @@ int capng_change_id(int uid, int gid, ca
 
 	// Check the current capabilities
 #ifdef PR_CAPBSET_DROP
-	// If newer kernel, we need setpcap
-	if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP) == 0)
+	// If newer kernel, we need setpcap to change the bounding set
+	if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP) == 0 && 
+					flag & CAPNG_CLEAR_BOUNDING)
 		capng_update(CAPNG_ADD,
 				CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SETPCAP);
 #endif


Index: libcap-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/F-12/libcap-ng.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libcap-ng.spec	3 Oct 2009 13:10:37 -0000	1.13
+++ libcap-ng.spec	9 Oct 2009 13:14:21 -0000	1.14
@@ -3,12 +3,13 @@
 Summary: An alternate posix capabilities library
 Name: libcap-ng
 Version: 0.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://people.redhat.com/sgrubb/libcap-ng
 Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
 Patch1: libcap-ng-0.6.3-euid.patch
+Patch2: libcap-ng-0.6.3-setpcap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-headers >= 2.6.11 
 BuildRequires: libattr-devel
@@ -51,6 +52,7 @@ lets you set the file system based capab
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --libdir=/%{_lib}
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Fri Oct 09 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-3
+- Apply patch to retain setpcap only if clearing bounding set
+
 * Sat Oct 03 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-2
 - Apply patch correcting pscap and netcap acct detection