pool/libcap
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcap?expand=0&rev=12

Browse Source
This commit is contained in:
OBS User unknown 2009-03-24 17:34:55 +00:00 committed by Git OBS Bridge
parent fdb126b0a2
commit 1b540731a8
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libcap-u64-typedef-fix.diff
View File

@ -1,19 +1,28 @@
--- ---
libcap/include/sys/capability.h | 5 ++++- libcap/include/sys/capability.h | 10 ++++++++--
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 8 insertions(+), 2 deletions(-)
--- a/libcap/include/sys/capability.h --- a/libcap/include/sys/capability.h
+++ b/libcap/include/sys/capability.h +++ b/libcap/include/sys/capability.h
@@ -31,8 +31,11 @@ @@ -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 __LINUX_COMPILER_H
#define __user #define __user
-typedef unsigned int __u32; -typedef unsigned int __u32;
+/* HACK to fix build of libcap itself */
+#ifndef _LINUX_TYPES_H
+#define _LINUX_TYPES_H
+#include <stdint.h> +#include <stdint.h>
+typedef uint32_t __u32; +typedef uint32_t __u32;
typedef __u32 __le32; typedef __u32 __le32;
+typedef uint64_t __u64; +typedef uint64_t __u64;
+typedef __u32 __le64; +typedef __u64 __le64;
+#endif /* HACK */
#include <linux/capability.h> #include <linux/capability.h>

6
libcap.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 18 16:25:43 CET 2009 - tiwai@suse.de
- fix a typo in the previous patch (__le64) (bnc#487453)
- don't define __u32 & co if _LINUX_TYPES_H is defined (bnc#487453)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 10 16:39:43 CET 2009 - tiwai@suse.de Tue Mar 10 16:39:43 CET 2009 - tiwai@suse.de

5
libcap.spec
View File

@ -26,7 +26,7 @@ Group: System/Libraries
AutoReqProv: on AutoReqProv: on
Summary: Library for Capabilities (linux-privs) Support Summary: Library for Capabilities (linux-privs) Support
Version: 2.16 Version: 2.16
Release: 2 Release: 3
Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.bz2 Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.bz2
Patch: libcap-u64-typedef-fix.diff Patch: libcap-u64-typedef-fix.diff
#URL: http://www.kernel.org/ #URL: http://www.kernel.org/
@ -126,6 +126,9 @@ ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Wed Mar 18 2009 tiwai@suse.de
- fix a typo in the previous patch (__le64) (bnc#487453)
- don't define __u32 & co if _LINUX_TYPES_H is defined (bnc#487453)
* Tue Mar 10 2009 tiwai@suse.de * Tue Mar 10 2009 tiwai@suse.de
- fix build error on i386 due to missing __u64 definition in - fix build error on i386 due to missing __u64 definition in
sys/capability.h sys/capability.h