patches/strace/4.5.19/140-undef-CTL_PROC.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch1.12
changeset 2655 3ba359965eb0
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)
yann@1613
     1
diff -durN strace-4.5.19.orig/system.c strace-4.5.19/system.c
yann@1613
     2
--- strace-4.5.19.orig/system.c	2009-06-01 11:59:11.000000000 +0200
yann@1613
     3
+++ strace-4.5.19/system.c	2009-10-28 18:47:18.000000000 +0100
yann@1613
     4
@@ -1654,7 +1654,9 @@
yann@1613
     5
 	{ CTL_KERN, "CTL_KERN" },
yann@1613
     6
 	{ CTL_VM, "CTL_VM" },
yann@1613
     7
 	{ CTL_NET, "CTL_NET" },
yann@1613
     8
+#ifdef CTL_PROC
yann@1613
     9
 	{ CTL_PROC, "CTL_PROC" },
yann@1613
    10
+#endif
yann@1613
    11
 	{ CTL_FS, "CTL_FS" },
yann@1613
    12
 	{ CTL_DEBUG, "CTL_DEBUG" },
yann@1613
    13
 	{ CTL_DEV, "CTL_DEV" },