debian/changelog

@@ -17,6 +17,11 @@ glibc (2.28-3) UNRELEASED; urgency=medium
   * debian/sysdeps/riscv64.mk: increase TIMEOUTFACTOR to 50 on riscv64.
   * debian/patches/git-updates.diff: update from upstream stable branch:
     - debian/patches/riscv64/submitted-start-cfi.diff: upstreamed.
+  * debian/patches/submitted-sigaction-sa-restorer.diff: fix a regression in
+    sigaction on m68k.  Closes: #915958.
+  * debian/script.in/nsscheck.sh: drop direct support for file-rc and always
+    run invoke-rc.d instead. invoke-rc.d in stretch has support for file-rc.
+    Closes: #916588.
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 15 Dec 2018 22:50:42 +0100

debian/patches/any/submitted-sigaction-sa-restorer.diff

+2018-12-12  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	[BZ #23960]
+	* sysdeps/unix/sysv/linux/kernel_sigaction.h (HAS_SA_RESTORER):
+	Define if SA_RESTORER is defined.
+	(kernel_sigaction): Define sa_restorer if HAS_SA_RESTORER is defined.
+	(SET_SA_RESTORER, RESET_SA_RESTORER): Define iff the macro are not
+	already defined.
+	* sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h (SA_RESTORER,
+	kernel_sigaction, SET_SA_RESTORER, RESET_SA_RESTORER): Remove
+	definitions.
+	(HAS_SA_RESTORER): Define.
+	* sysdeps/unix/sysv/linux/sparc/kernel_sigaction.h (SA_RESTORER,
+	SET_SA_RESTORER, RESET_SA_RESTORER): Remove definition.
+	(HAS_SA_RESTORER): Define.
+	* sysdeps/unix/sysv/linux/nios2/kernel_sigaction.h: Include generic
+	kernel_sigaction after define SET_SA_RESTORER and RESET_SA_RESTORER.
+	* sysdeps/unix/sysv/linux/powerpc/kernel_sigaction.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/kernel_sigaction.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise.
+
+--- a/sysdeps/unix/sysv/linux/kernel_sigaction.h
++++ b/sysdeps/unix/sysv/linux/kernel_sigaction.h
+@@ -1,19 +1,27 @@
+ #ifndef _KERNEL_SIGACTION_H
+ # define _KERNEL_SIGACTION_H
+ 
++#ifdef SA_RESTORER
++# define HAS_SA_RESTORER 1
++#endif
++
+ /* This is the sigaction structure from the Linux 3.2 kernel.  */
+ struct kernel_sigaction
+ {
+   __sighandler_t k_sa_handler;
+   unsigned long sa_flags;
+-#ifdef SA_RESTORER
++#ifdef HAS_SA_RESTORER
+   void (*sa_restorer) (void);
+ #endif
++  /* glibc sigset is larger than kernel expected one, however sigaction
++     passes the kernel expected size on rt_sigaction syscall.  */
+   sigset_t sa_mask;
+ };
+ 
+-#ifndef SA_RESTORER
++#ifndef SET_SA_RESTORER
+ # define SET_SA_RESTORER(kact, act)
++#endif
++#ifndef RESET_SA_RESTORER
+ # define RESET_SA_RESTORER(act, kact)
+ #endif
+ 
+--- a/sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h
++++ b/sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h
+@@ -1,22 +1,4 @@
+-#ifndef _KERNEL_SIGACTION_H
+-# define _KERNEL_SIGACTION_H
+-
+-#include <signal.h>
+-
+-#define SA_RESTORER 0x04000000
+-
+-/* This is the sigaction structure from the Linux 3.2 kernel.  */
+-struct kernel_sigaction
+-{
+-  __sighandler_t k_sa_handler;
+-  sigset_t sa_mask;
+-  unsigned long sa_flags;
+-  void (*sa_restorer) (void);
+-};
+-
+-#define SET_SA_RESTORER(kact, act)			\
+-  (kact)->sa_restorer = (act)->sa_restorer
+-#define RESET_SA_RESTORER(act, kact)			\
+-  (act)->sa_restorer = (kact)->sa_restorer
+-
+-#endif
++/* m68k does not define SA_RESTORER, but does have sa_restorer member
++   on kernel sigaction struct.  */
++#define HAS_SA_RESTORER 1
++#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+--- a/sysdeps/unix/sysv/linux/nios2/kernel_sigaction.h
++++ b/sysdeps/unix/sysv/linux/nios2/kernel_sigaction.h
+@@ -1,8 +1,9 @@
+ /* NIOS2 uses the generic Linux UAPI but defines SA_RESTORER.  */
+ #define SA_RESTORER 0x04000000
+-#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+ 
+ #define SET_SA_RESTORER(kact, act)             \
+   (kact)->sa_restorer = (act)->sa_restorer
+ #define RESET_SA_RESTORER(act, kact)           \
+   (act)->sa_restorer = (kact)->sa_restorer
++
++#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+--- a/sysdeps/unix/sysv/linux/powerpc/kernel_sigaction.h
++++ b/sysdeps/unix/sysv/linux/powerpc/kernel_sigaction.h
+@@ -1,9 +1,10 @@
+ /* powerpc kernel sigaction is similar to generic Linux UAPI one,
+    but the architecture also defines SA_RESTORER.  */
+ #define SA_RESTORER 0x04000000
+-#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+ 
+ #define SET_SA_RESTORER(kact, act)             \
+   (kact)->sa_restorer = (act)->sa_restorer
+ #define RESET_SA_RESTORER(act, kact)           \
+   (act)->sa_restorer = (kact)->sa_restorer
++
++#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+--- a/sysdeps/unix/sysv/linux/s390/kernel_sigaction.h
++++ b/sysdeps/unix/sysv/linux/s390/kernel_sigaction.h
+@@ -30,3 +30,5 @@ struct kernel_sigaction
+   (kact)->sa_restorer = (act)->sa_restorer
+ #define RESET_SA_RESTORER(act, kact)           \
+   (act)->sa_restorer = (kact)->sa_restorer
++
++#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+--- a/sysdeps/unix/sysv/linux/sh/kernel_sigaction.h
++++ b/sysdeps/unix/sysv/linux/sh/kernel_sigaction.h
+@@ -1,8 +1,9 @@
+ /* SH uses the generic Linux UAPI but defines SA_RESTORER.  */
+ #define SA_RESTORER 0x04000000
+-#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+ 
+ #define SET_SA_RESTORER(kact, act)             \
+   (kact)->sa_restorer = (act)->sa_restorer
+ #define RESET_SA_RESTORER(act, kact)           \
+   (act)->sa_restorer = (kact)->sa_restorer
++
++#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+--- a/sysdeps/unix/sysv/linux/sparc/kernel_sigaction.h
++++ b/sysdeps/unix/sysv/linux/sparc/kernel_sigaction.h
+@@ -1,10 +1,5 @@
+ /* SPARC 'struct __new_sigaction' is similar to generic Linux UAPI with
+    a sa_restorer field, even though function is passed as an argument
+    to rt_sigaction syscall.  */
+-#define SA_RESTORER 0x04000000
++#define HAS_SA_RESTORER 1
+ #include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
+-
+-#define SET_SA_RESTORER(kact, act)             \
+-  (kact)->sa_restorer = NULL
+-#define RESET_SA_RESTORER(act, kact)           \
+-  (act)->sa_restorer = (kact)->sa_restorer
+--- a/sysdeps/unix/sysv/linux/x86_64/sigaction.c
++++ b/sysdeps/unix/sysv/linux/x86_64/sigaction.c
+@@ -18,7 +18,6 @@
+ 
+ #include <signal.h>
+ #define SA_RESTORER 0x04000000
+-#include <kernel_sigaction.h>
+ 
+ extern void restore_rt (void) asm ("__restore_rt") attribute_hidden;
+ 
+@@ -29,6 +28,8 @@ extern void restore_rt (void) asm ("__restore_rt") attribute_hidden;
+ #define RESET_SA_RESTORER(act, kact) 			\
+   (act)->sa_restorer = (kact)->sa_restorer
+ 
++#include <kernel_sigaction.h>
++
+ #include <sysdeps/unix/sysv/linux/sigaction.c>
+ 
+ /* NOTE: Please think twice before making any changes to the bits of
+

debian/patches/series

@@ -152,3 +152,4 @@ any/local-libpic.diff
 any/local-bootstrap-headers.diff
 any/submitted-resolv-unaligned.diff
 any/local-cudacc-float128.diff
+any/submitted-sigaction-sa-restorer.diff

debian/script.in/nsscheck.sh

@@ -16,23 +16,11 @@
 		    )
 	    echo
 	    echo "Checking init scripts..."
-	    rl=$(runlevel | sed 's/.*\ //')
 	    for service in $check; do
-	    	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
 		invoke-rc.d ${service} status >/dev/null 2>/dev/null && status=0 || status=$?
 		if [ "$status" = "0" ] || [ "$status" = "2" ] ; then
 		    services="$service $services"
 		elif [ "$status" = "100" ] ; then
 		    echo "WARNING: init script for $service not found."
 		fi
-	    	else
-	    	    if [ -f /usr/share/file-rc/rc ] || [ -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ]; then
-	    	    	idl=$(filerc $rl $service)
-	    	    else
-	    	    	idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -1)
-	    	    fi
-	    	    if [ -n "$idl" ] && [ -x $idl ]; then
-	    	    	services="$service $services"
-	    	    fi
-	    	fi
 	    done