[glibc] 01/01: debian/patches/git-updates.diff: update from upstream stable branch.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.26
in repository glibc.
commit a909ab31d4cf9704c80f2b2bb500c9b8802dd49c
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Dec 12 23:46:25 2017 +0100
debian/patches/git-updates.diff: update from upstream stable branch.
---
debian/patches/git-updates.diff | 36 ++++++++++++++++++++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 1d7d929..46091e3 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,15 @@
GIT update of git://sourceware.org/git/glibc.git/release/2.26/master from glibc-2.26
diff --git a/ChangeLog b/ChangeLog
-index 8dbfc7eaff..42224c0a2f 100644
+index 8dbfc7eaff..4fb30a1d8f 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,1000 @@
+@@ -1,3 +1,1005 @@
++2017-12-12 James Clarke <jrtc27@jrtc27.com>
++
++ * sysdeps/unix/sysv/linux/ia64/ipc_priv.h: New file defining
++ __IPC_64 to 0 to avoid IPC_64 being set.
++
+2017-10-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #22052]
@@ -17484,6 +17489,33 @@ index 3e1c6ea35b..87f2f9578d 100644
int
__old_versionsort64 (const struct __old_dirent64 **a,
+diff --git a/sysdeps/unix/sysv/linux/ia64/ipc_priv.h b/sysdeps/unix/sysv/linux/ia64/ipc_priv.h
+new file mode 100644
+index 0000000000..e602eea455
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/ia64/ipc_priv.h
+@@ -0,0 +1,21 @@
++/* Old SysV permission definition for Linux. IA64 version.
++ Copyright (C) 2017 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#include <sys/ipc.h> /* For __key_t */
++
++#define __IPC_64 0x0
diff --git a/sysdeps/unix/sysv/linux/m68k/glob64.c b/sysdeps/unix/sysv/linux/m68k/glob64.c
deleted file mode 100644
index 82a9a296a7..0000000000
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: