[arch-commits] Commit in linux-api-headers/trunk (2 files)

[Allan McRae]

    Date: Monday, September 8, 2014 @ 04:45:36
  Author: allan
Revision: 221106

upgpkg: linux-api-headers 3.16.2-1

glibc-2.20 toolchain build, upstream update, adjust xattr patch

Modified:
  linux-api-headers/trunk/PKGBUILD
Deleted:
  linux-api-headers/trunk/linux-3.14-xattr_header.patch

-------------------------------+
 PKGBUILD                      |   18 ++++-----
 linux-3.14-xattr_header.patch |   76 ----------------------------------------
 2 files changed, 8 insertions(+), 86 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-08 01:32:11 UTC (rev 221105)
+++ PKGBUILD	2014-09-08 02:45:36 UTC (rev 221106)
@@ -4,8 +4,8 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-api-headers
-pkgver=3.14.1
-_basever=3.14
+pkgver=3.16.2
+_basever=3.16
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
 arch=('i686' 'x86_64')
@@ -12,16 +12,14 @@
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
 source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
-        http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz
-        linux-3.14-xattr_header.patch)
+        http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz)
         
-        # NOTE: signatures are not automatically verified by makepkg yet
+        # NOTE: signatures are not automatically verified until pacman-4.2
         #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign
         #http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign
 
-md5sums=('b621207b3f6ecbb67db18b13258f8ea8'
-         '2526eb95793ecc1c22d7e1428ef23cdc'
-         '22926521588b2e95f3c2a2cb428e7cf9')
+md5sums=('5c569ed649a0c9711879f333e90c5386'
+         '926e6e2ee0634ce53730701da749b040')
 
 prepare() {
   cd ${srcdir}/linux-${_basever}
@@ -28,8 +26,8 @@
   [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver}
 
   # 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() {

Deleted: linux-3.14-xattr_header.patch
===================================================================
--- linux-3.14-xattr_header.patch	2014-09-08 01:32:11 UTC (rev 221105)
+++ linux-3.14-xattr_header.patch	2014-09-08 02:45:36 UTC (rev 221106)
@@ -1,76 +0,0 @@
-From ea1a8217b06b41b31a2b60b0b83f75c77ef9c873 Mon Sep 17 00:00:00 2001
-From: Serge Hallyn <serge.hallyn at 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 at ubuntu.com>
-Cc: Andrew Morton <akpm at linux-foundation.org>
-Cc: Allan McRae <allan at archlinux.org>
-Cc: <stable at vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds at 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 at 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
-