From 1b540731a8ced3c4285a623bcc0081354a27045f860d4460313d037d1433f44a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 24 Mar 2009 17:34:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcap?expand=0&rev=12 --- libcap-u64-typedef-fix.diff | 17 +++++++++++++---- libcap.changes | 6 ++++++ libcap.spec | 5 ++++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/libcap-u64-typedef-fix.diff b/libcap-u64-typedef-fix.diff index 521ab6e..c894afb 100644 --- a/libcap-u64-typedef-fix.diff +++ b/libcap-u64-typedef-fix.diff @@ -1,19 +1,28 @@ --- - libcap/include/sys/capability.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + 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 -@@ -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 __user -typedef unsigned int __u32; ++/* HACK to fix build of libcap itself */ ++#ifndef _LINUX_TYPES_H ++#define _LINUX_TYPES_H +#include +typedef uint32_t __u32; typedef __u32 __le32; +typedef uint64_t __u64; -+typedef __u32 __le64; ++typedef __u64 __le64; ++#endif /* HACK */ #include diff --git a/libcap.changes b/libcap.changes index 14d57da..691f017 100644 --- a/libcap.changes +++ b/libcap.changes @@ -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 diff --git a/libcap.spec b/libcap.spec index d9bd61b..9565a58 100644 --- a/libcap.spec +++ b/libcap.spec @@ -26,7 +26,7 @@ Group: System/Libraries AutoReqProv: on Summary: Library for Capabilities (linux-privs) Support Version: 2.16 -Release: 2 +Release: 3 Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.bz2 Patch: libcap-u64-typedef-fix.diff #URL: http://www.kernel.org/ @@ -126,6 +126,9 @@ ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so %{_mandir}/man3/* %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 - fix build error on i386 due to missing __u64 definition in sys/capability.h