diff options
| -rw-r--r-- | libre/linux-libre-api-headers/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/linux-libre-api-headers/linux-3.14-xattr_header.patch | 76 |
2 files changed, 9 insertions, 87 deletions
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 5efe23584..030c893a2 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 211667 2014-04-23 02:10:08Z allan $ +# $Id: PKGBUILD 221106 2014-09-08 02:45:36Z allan $ # Maintainer (Arch): Allan McRae <allan@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Luke Shumaker <lukeshu@sbcglobal.net> @@ -6,13 +6,13 @@ # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -_pkgbasever=3.14-gnu -_pkgver=3.14.1-gnu +_pkgbasever=3.16-gnu +_pkgver=3.16.2-gnu _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1.2 +pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -21,11 +21,9 @@ provides=( "linux-api-headers=${_archpkgver}") conflicts=('linux-api-headers') replaces=( 'linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" - linux-3.14-xattr_header.patch) -md5sums=('c108ec52eeb2a9b9ddbb8d12496ff25f' - '2b4862b3c76011e66e536f18fbf0fb27' - '22926521588b2e95f3c2a2cb428e7cf9') + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz") +md5sums=('71e2d15b48e14db5a464424878362b42' + '25a33c60c0e06622d468f118e70d6a57') prepare() { cd "${srcdir}/${_srcname}" @@ -36,8 +34,8 @@ prepare() { fi # fix xattr.h dual inclusion issues - # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=ea1a8217 - patch -p1 -i "$srcdir"/linux-3.14-xattr_header.patch + # https://github.com/torvalds/linux/commit/bfcfd44c + sed -i "/__UAPI_DEF_XATTR/s/ifdef/if/" include/uapi/linux/xattr.h } build() { diff --git a/libre/linux-libre-api-headers/linux-3.14-xattr_header.patch b/libre/linux-libre-api-headers/linux-3.14-xattr_header.patch deleted file mode 100644 index 1ea583d86..000000000 --- a/libre/linux-libre-api-headers/linux-3.14-xattr_header.patch +++ /dev/null @@ -1,76 +0,0 @@ -From ea1a8217b06b41b31a2b60b0b83f75c77ef9c873 Mon Sep 17 00:00:00 2001 -From: Serge Hallyn <serge.hallyn@ubuntu.com> -Date: Thu, 3 Apr 2014 14:48:33 -0700 -Subject: xattr: guard against simultaneous glibc header inclusion - -If the glibc xattr.h header is included after the uapi header, -compilation fails due to an enum re-using a #define from the uapi -header. - -Protect against this by guarding the define and enum inclusions against -each other. - -(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html -and https://sourceware.org/glibc/wiki/Synchronizing_Headers -for more information.) - -Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Allan McRae <allan@archlinux.org> -Cc: <stable@vger.kernel.org> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> - -diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h -index 335e8a7..c140620 100644 ---- a/include/uapi/linux/libc-compat.h -+++ b/include/uapi/linux/libc-compat.h -@@ -85,6 +85,12 @@ - - #endif /* _NETINET_IN_H */ - -+/* Definitions for xattr.h */ -+#if defined(_SYS_XATTR_H) -+#define __UAPI_DEF_XATTR 0 -+#else -+#define __UAPI_DEF_XATTR 1 -+#endif - - /* If we did not see any headers from any supported C libraries, - * or we are being included in the kernel, then define everything -@@ -98,6 +104,9 @@ - #define __UAPI_DEF_IPV6_MREQ 1 - #define __UAPI_DEF_IPPROTO_V6 1 - -+/* Definitions for xattr.h */ -+#define __UAPI_DEF_XATTR 1 -+ - #endif /* __GLIBC__ */ - - #endif /* _UAPI_LIBC_COMPAT_H */ -diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h -index 40bbc04..c38355c 100644 ---- a/include/uapi/linux/xattr.h -+++ b/include/uapi/linux/xattr.h -@@ -7,11 +7,18 @@ - Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. - Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com> - */ -+ -+#include <linux/libc-compat.h> -+ - #ifndef _UAPI_LINUX_XATTR_H - #define _UAPI_LINUX_XATTR_H - -+#ifdef __UAPI_DEF_XATTR -+#define __USE_KERNEL_XATTR_DEFS -+ - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ -+#endif - - /* Namespaces */ - #define XATTR_OS2_PREFIX "os2." --- -cgit v0.10.1 - |