From 3a5a606b28b8e46617864fcafbefb9f20ac4aaa0 Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@fedoraproject.org>
Date: Thu, 6 May 2010 14:10:15 +0000
Subject: [PATCH] - New upstream release fixing multi-threading issue

---
 .cvsignore                 |  1 +
 libcap-ng-0.6.4-file.patch | 16 ----------------
 libcap-ng.spec             |  9 +++++----
 sources                    |  2 +-
 4 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 libcap-ng-0.6.4-file.patch

diff --git a/.cvsignore b/.cvsignore
index 1878cd1..43a1c8d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ libcap-ng-0.6.tar.gz
 libcap-ng-0.6.1.tar.gz
 libcap-ng-0.6.2.tar.gz
 libcap-ng-0.6.3.tar.gz
+libcap-ng-0.6.4.tar.gz
diff --git a/libcap-ng-0.6.4-file.patch b/libcap-ng-0.6.4-file.patch
deleted file mode 100644
index 4f22441..0000000
--- a/libcap-ng-0.6.4-file.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urp libcap-ng-0.6.4.orig/src/cap-ng.c libcap-ng-0.6.4/src/cap-ng.c
---- libcap-ng-0.6.4.orig/src/cap-ng.c	2010-04-27 18:10:54.000000000 -0400
-+++ libcap-ng-0.6.4/src/cap-ng.c	2010-04-27 18:43:27.000000000 -0400
-@@ -287,8 +287,10 @@ static int load_data(const struct vfs_ca
- 	m.data.v3[0].inheritable = FIXUP(filedata->data[0].inheritable);
- 	m.data.v3[1].inheritable = FIXUP(filedata->data[1].inheritable);
- 	if (magic & VFS_CAP_FLAGS_EFFECTIVE) {
--		m.data.v3[0].effective = 0xFFFFFFFFU;
--		m.data.v3[1].effective = 0xFFFFFFFFU;
-+		m.data.v3[0].effective =
-+			m.data.v3[0].permitted | m.data.v3[0].inheritable;
-+		m.data.v3[1].effective =
-+			m.data.v3[1].permitted | m.data.v3[1].inheritable;
- 	} else {
- 		m.data.v3[0].effective = 0;
- 		m.data.v3[1].effective = 0;
diff --git a/libcap-ng.spec b/libcap-ng.spec
index 8e14c49..17cb0bd 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -2,13 +2,12 @@
 
 Summary: An alternate posix capabilities library
 Name: libcap-ng
-Version: 0.6.3
-Release: 2%{?dist}
+Version: 0.6.4
+Release: 1%{?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.4-file.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-headers >= 2.6.11 
 BuildRequires: libattr-devel
@@ -51,7 +50,6 @@ lets you set the file system based capabilities.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure --libdir=/%{_lib}
@@ -110,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Thu May 06 2010 Steve Grubb <sgrubb@redhat.com> 0.6.4-1
+- New upstream release fixing multi-threading issue
+
 * Wed Apr 28 2010 Steve Grubb <sgrubb@redhat.com> 0.6.3-2
 - filecap shows full capabilities if a file has any
 
diff --git a/sources b/sources
index 58b3888..8faa341 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86a6aa9fbc6689b7e92580713f706cbd  libcap-ng-0.6.3.tar.gz
+ae817cd585ca11db257330b392003ed6  libcap-ng-0.6.4.tar.gz