Bug#469380: strace: diff for NMU version 4.5.15-1.2

[Joey Hess]

Package: strace
Version: 4.5.15-1.1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my strace 4.5.15-1.2 NMU. I have uploaded this
NMU to the 10 days delayed queue in case you'd like to superscede it
with a maintainer upload. This NMU should fix all the FTBFS bugs, so
the new version of strace will get into testing.

-- 
see shy jo

diff -u strace-4.5.15/debian/rules strace-4.5.15/debian/rules
--- strace-4.5.15/debian/rules
+++ strace-4.5.15/debian/rules
@@ -61,7 +61,7 @@
 
 	install -d -m 755 -o root -g root debian/tmp
 	# reset the mode to work around a bug in install
-	chown 755 debian/tmp
+	chmod 755 debian/tmp
 	install -d -m 755 -o root -g root debian/tmp/DEBIAN
 
 # Install strace
diff -u strace-4.5.15/debian/changelog strace-4.5.15/debian/changelog
--- strace-4.5.15/debian/changelog
+++ strace-4.5.15/debian/changelog
@@ -1,3 +1,13 @@
+strace (4.5.15-1.2) unstable; urgency=low
+
+  * NMU
+  * Apply patch from Thiemo Seufer to fix FTBFS on mips and mipsel.
+    Closes: #448802
+  * Fix FTBFS on sparc. Closes: #469379
+  * Use chmod, not chown, in debian/rules. Closes: #459255
+
+ -- Joey Hess <[EMAIL PROTECTED]>  Tue, 04 Mar 2008 17:04:45 -0500
+
 strace (4.5.15-1.1) unstable; urgency=low
 
   * Porter NMU.
diff -u strace-4.5.15/signal.c strace-4.5.15/signal.c
--- strace-4.5.15/signal.c
+++ strace-4.5.15/signal.c
@@ -97,6 +97,11 @@
 	struct regs		si_regs;
 	int			si_mask;
 } m_siginfo_t;
+#elif defined (MIPS)
+typedef struct {
+	struct pt_regs		si_regs;
+	int			si_mask;
+} m_siginfo_t;
 #elif defined HAVE_ASM_SIGCONTEXT_H
 #if !defined(IA64) && !defined(X86_64)
 #include <asm/sigcontext.h>
@@ -1426,21 +1431,27 @@
 #else
 #ifdef MIPS
 	long sp;
-	struct sigcontext sc;
+	struct pt_regs regs;
+	m_siginfo_t si;
 
+	if(ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0) {
+		perror("sigreturn: PTRACE_GETREGS ");
+		return 0;
+	}
 	if(entering(tcp)) {
 	  	tcp->u_arg[0] = 0;
-		if (upeek(tcp->pid, REG_SP, &sp) < 0)
-		  	return 0;
-		if (umove(tcp, sp, &sc) < 0)
+		sp = regs.regs[29];
+		if (umove(tcp, sp, &si) < 0)
 		  	return 0;
 		tcp->u_arg[0] = 1;
-		tcp->u_arg[1] = sc.sc_sigset;
+		tcp->u_arg[1] = si.si_mask;
 	} else {
-	  	tcp->u_rval = tcp->u_error = 0;
+		sigset_t sigm;
+		long_to_sigset(tcp->u_arg[1], &sigm);
+		tcp->u_rval = tcp->u_error = 0;
 		if(tcp->u_arg[0] == 0)
-		  	return 0;
-		tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1]);
+			return 0;
+		tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
only in patch2:
unchanged:
--- strace-4.5.15.orig/linux/sparc/syscallent.h
+++ strace-4.5.15/linux/sparc/syscallent.h
@@ -62,7 +62,7 @@
 	{ 1,	TF,	sys_chroot,	"chroot" },		/* 61 */
 	{ 2,	TD,	sys_fstat,	"fstat" },		/* 62 */
 	{ 2,	TD,	sys_fstat64,	"fstat64" },		/* 63 */
-	{ 0,	0,	sys_getpagesize,"getpagesize" },	/* 64 */
+	{ 0,	0,	printargs,      "getpagesize" },	/* 64 */
 	{ 3,	0,	sys_msync,	"msync" },		/* 65 */
 	{ 0,	TP,	sys_vfork,	"vfork" },		/* 66 */
 	{ 5,	TD,	sys_pread,	"pread" },		/* 67 */
only in patch2:
unchanged:
--- strace-4.5.15.orig/linux/sparc/syscall.h
+++ strace-4.5.15/linux/sparc/syscall.h
@@ -29,6 +29,8 @@
  */
 #include "dummy.h"
 
+#include "../syscall.h"
+
 int	sys_restart_syscall();
 int	sys_nosys();
 int	sys_nullsys();

signature.asc
Description: Digital signature