Commit fef0ca2b authored by Aurelien Jarno's avatar Aurelien Jarno

debian/patches/git-updates.diff: update from upstream stable branch.

parent 64798d91
......@@ -5,6 +5,9 @@ glibc (2.27-4) UNRELEASED; urgency=medium
* hurd-i386/git-timer_create_sigmask.diff: New patch to fix interaction
between SIGCHLD and timer_create. Closes: Bug#894379.
[ Aurelien Jarno ]
* debian/patches/git-updates.diff: update from upstream stable branch.
-- Samuel Thibault <sthibault@debian.org> Thu, 29 Mar 2018 22:33:14 +0200
glibc (2.27-3) unstable; urgency=medium
......
GIT update of https://sourceware.org/git/glibc.git/release/2.27/master from glibc-2.27
diff --git a/ChangeLog b/ChangeLog
index f3fe2716b2..536fcf1c4f 100644
index f3fe2716b2..e81b39dafb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,212 @@
@@ -1,3 +1,222 @@
+2018-04-26 Aurelien Jarno <aurelien@aurel32.net>
+
+ * signal/tst-sigaction.c: New file to test BZ #23069.
+ * signal/Makefile (tests): Fix indentation. Add tst-sigaction.
+
+2018-04-28 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #23069]
+ * sysdeps/unix/sysv/linux/riscv/kernel_sigaction.h: New file.
+
+2018-03-29 Florian Weimer <fweimer@redhat.com>
+
+ * sysdeps/unix/sysv/linux/i386/tst-bz21269.c (do_test): Also
......@@ -217,7 +227,7 @@ index f3fe2716b2..536fcf1c4f 100644
2018-02-01 Dmitry V. Levin <ldv@altlinux.org>
* version.h (RELEASE): Set to "stable".
@@ -710,7 +919,9 @@
@@ -710,7 +929,9 @@
2018-01-18 Arjun Shankar <arjun@redhat.com>
[BZ #22343]
......@@ -11188,6 +11198,81 @@ index 7f191abbbc..8f45848e44 100644
/* This is the beginning of the real test code. The above defines
(among other things) the function rfc3484_sort. */
diff --git a/signal/Makefile b/signal/Makefile
index a9b99a20be..aa63434f47 100644
--- a/signal/Makefile
+++ b/signal/Makefile
@@ -46,7 +46,7 @@ routines := signal raise killpg \
sighold sigrelse sigignore sigset
tests := tst-signal tst-sigset tst-sigsimple tst-raise tst-sigset2 \
- tst-sigwait-eintr \
+ tst-sigwait-eintr tst-sigaction \
include ../Rules
diff --git a/signal/tst-sigaction.c b/signal/tst-sigaction.c
new file mode 100644
index 0000000000..c908e8f6f6
--- /dev/null
+++ b/signal/tst-sigaction.c
@@ -0,0 +1,56 @@
+/* Test sigaction regression for BZ #23069.
+ Copyright (C) 2018 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 <signal.h>
+#include <unistd.h>
+
+#include <support/check.h>
+
+static void
+my_sig_handler (int signum)
+{
+}
+
+static int
+do_test (void)
+{
+ /* Define a simple signal handler */
+ struct sigaction act;
+ act.sa_handler = my_sig_handler;
+ act.sa_flags = 0;
+ sigemptyset (&act.sa_mask);
+
+ /* Set it as SIGUSR1 signal handler */
+ TEST_VERIFY_EXIT (sigaction (SIGUSR1, &act, NULL) == 0);
+
+ /* Get SIGUSR1 signal handler */
+ TEST_VERIFY_EXIT (sigaction (SIGUSR1, NULL, &act) == 0);
+
+ /* Check it is consistent with the defined one */
+ TEST_VERIFY (act.sa_handler == my_sig_handler);
+ TEST_VERIFY (!(act.sa_flags & SA_RESETHAND));
+
+ for (int i = 1; i < _NSIG; i++)
+ {
+ TEST_VERIFY (!sigismember (&act.sa_mask, i));
+ }
+
+ return 0;
+}
+
+#include <support/test-driver.c>
diff --git a/string/test-memmove.c b/string/test-memmove.c
index edc7a4c3bf..64e3651ba4 100644
--- a/string/test-memmove.c
......@@ -12827,6 +12912,19 @@ index 75567b2bad..8317821ab5 100644
/* Set ptrace filter options. */
PTRACE_SETOPTIONS = 0x4200,
#define PT_SETOPTIONS PTRACE_SETOPTIONS
diff --git a/sysdeps/unix/sysv/linux/riscv/kernel_sigaction.h b/sysdeps/unix/sysv/linux/riscv/kernel_sigaction.h
new file mode 100644
index 0000000000..2a62bcc5bc
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/riscv/kernel_sigaction.h
@@ -0,0 +1,7 @@
+/* This is the sigaction structure from the RISC-V Linux 4.15 kernel. */
+
+struct kernel_sigaction {
+ __sighandler_t k_sa_handler;
+ unsigned long sa_flags;
+ sigset_t sa_mask;
+};
diff --git a/sysdeps/unix/sysv/linux/riscv/readelflib.c b/sysdeps/unix/sysv/linux/riscv/readelflib.c
index 6e249ff82f..7e27e0c1d6 100644
--- a/sysdeps/unix/sysv/linux/riscv/readelflib.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment