[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 sid
in repository glibc.
commit 511f49f617d86e5ee7371fa4f7babf4f6b91e87d
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Dec 12 20:20:46 2017 +0100
debian/patches/git-updates.diff: update from upstream stable branch:
* debian/patches/git-updates.diff: update from upstream stable branch:
- Fix SysV IPC on IA64. Closes: #884194.
---
debian/changelog | 2 ++
debian/patches/git-updates.diff | 36 ++++++++++++++++++++++++++++++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1592f3d..7ee0788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ glibc (2.25-4) UNRELEASED; urgency=medium
"cannot allocate TLS data structures for initial thread". Closes:
#776659.
* debian/glibc-source.filelist: update with the latest mips* symbol files.
+ * debian/patches/git-updates.diff: update from upstream stable branch:
+ - Fix SysV IPC on IA64. Closes: #884194.
[ Samuel Thibault ]
* patches/hurd-i386/local-no-bootstrap-fs-access.diff: Refresh.
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 17a99ed..234ce99 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.25/master from glibc-2.25
diff --git a/ChangeLog b/ChangeLog
-index f140ee67de..f85bf022b9 100644
+index f140ee67de..574ea60130 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,709 @@
+@@ -1,3 +1,714 @@
++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-11-02 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #22332]
@@ -12057,6 +12062,33 @@ index 2c2584956d..8ea4333846 100644
# The main malloc is interposed into the dynamic linker, for
# allocations after the initial link (when dlopen is used).
ld.so: malloc + REL R_386_GLOB_DAT
+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/mips/mips64/n64/globfree64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/globfree64.c
new file mode 100644
index 0000000000..abc35fdd2b
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: