Accepting request 54338 from home:msmeissn:branches:Base:System

ok

OBS-URL: https://build.opensuse.org/request/show/54338
OBS-URL: https://build.opensuse.org/package/show/Base:System/libcap?expand=0&rev=12
This commit is contained in:
Marcus Meissner 2010-12-02 14:57:01 +00:00 committed by Git OBS Bridge
parent d40cb191ed
commit 5a20fd5cee
5 changed files with 17 additions and 34 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f
size 48451

3
libcap-2.19.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed1693e344054a398e68a7cc840892e3d1a880562743bdf28fd918649aa5a4ce
size 53099

View File

@ -1,28 +0,0 @@
---
libcap/include/sys/capability.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/libcap/include/sys/capability.h
+++ b/libcap/include/sys/capability.h
@@ -26,13 +26,19 @@
* Make sure we can be included from userland by preventing
* capability.h from including other kernel headers
*/
-#define _LINUX_TYPES_H
#define _LINUX_FS_H
#define __LINUX_COMPILER_H
#define __user
-typedef unsigned int __u32;
+/* HACK to fix build of libcap itself */
+#ifndef _LINUX_TYPES_H
+#define _LINUX_TYPES_H
+#include <stdint.h>
+typedef uint32_t __u32;
typedef __u32 __le32;
+typedef uint64_t __u64;
+typedef __u64 __le64;
+#endif /* HACK */
#include <linux/capability.h>

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Dec 2 15:44:59 CET 2010 - meissner@suse.de
- updated to libcap-2.19
* more stuff in capsh.c
* sys/capability.h header clean up and fixes.
-------------------------------------------------------------------
Thu Dec 2 15:32:34 CET 2010 - meissner@suse.de
- fixed build on ppc64 (needs to get linux/types.h included first).
-------------------------------------------------------------------
Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de

View File

@ -23,11 +23,10 @@ License: BSD3c
Group: System/Libraries
AutoReqProv: on
Summary: Library for Capabilities (linux-privs) Support
Version: 2.16
Version: 2.19
Release: 6
Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.bz2
Source2: baselibs.conf
Patch: libcap-u64-typedef-fix.diff
#URL: http://www.kernel.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libattr-devel
@ -92,7 +91,6 @@ libcap.
%prep
%setup -q
%patch -p1
%build
# lib=%{_lib} make %{?_smp_mflags} COPTFLAG="$RPM_OPT_FLAGS"
@ -120,6 +118,7 @@ ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so
%files progs
%defattr(-,root,root)
%{_mandir}/man1/*
%{_mandir}/man8/*
/sbin/*