From 75cf882f36cd6d039b2b819516945041c921a961 Mon Sep 17 00:00:00 2001
From: sgrubb <sgrubb@redhat.com>
Date: Wed, 7 May 2014 10:12:49 -0400
Subject: [PATCH] Add PR_SET_NO_NEW_PRIVS call back to capng_lock

---
 libcap-ng-0.7.5-no-no_new_privs.patch | 14 --------------
 libcap-ng.spec                        |  7 ++++---
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 libcap-ng-0.7.5-no-no_new_privs.patch

diff --git a/libcap-ng-0.7.5-no-no_new_privs.patch b/libcap-ng-0.7.5-no-no_new_privs.patch
deleted file mode 100644
index 43477cc..0000000
--- a/libcap-ng-0.7.5-no-no_new_privs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urp libcap-ng-0.7.5.orig/src/cap-ng.c libcap-ng-0.7.5/src/cap-ng.c
---- libcap-ng-0.7.5.orig/src/cap-ng.c	2014-04-30 21:44:23.000000000 -0400
-+++ libcap-ng-0.7.5/src/cap-ng.c	2014-04-30 22:04:31.225062310 -0400
-@@ -710,10 +710,6 @@ int capng_lock(void)
- 			1 << SECURE_NOROOT_LOCKED |
- 			1 << SECURE_NO_SETUID_FIXUP |
- 			1 << SECURE_NO_SETUID_FIXUP_LOCKED, 0, 0, 0);
--#ifdef PR_SET_NO_NEW_PRIVS
--	if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0))
--		return -1;
--#endif
- 	if (rc)
- 		return -1;
- #endif
diff --git a/libcap-ng.spec b/libcap-ng.spec
index b6ce860..4a244f8 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -3,12 +3,11 @@
 Summary: An alternate posix capabilities library
 Name: libcap-ng
 Version: 0.7.4
-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.7.5-no-no_new_privs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-headers >= 2.6.11 
 
@@ -51,7 +50,6 @@ lets you set the file system based capabilities.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure --libdir=/%{_lib}
@@ -113,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed May 07 2014 Steve Grubb <sgrubb@redhat.com> 0.7.4-3
+- Add PR_SET_NO_NEW_PRIVS call back to capng_lock
+
 * Wed Apr 30 2014 Steve Grubb <sgrubb@redhat.com> 0.7.4-2
 - Remove PR_SET_NO_NEW_PRIVS call in capng_lock