patches/glibc/ports-2.12.1/650-syslog.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@2437
     1
diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
yann@2437
     2
--- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
yann@2437
     3
+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
yann@2437
     4
@@ -152,7 +152,7 @@
yann@2437
     5
 #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
yann@2437
     6
 	/* Check for invalid bits. */
yann@2437
     7
 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
yann@2437
     8
-		syslog(INTERNALLOG,
yann@2437
     9
+		__syslog(INTERNALLOG,
yann@2437
    10
 		    "syslog: unknown facility/priority: %x", pri);
yann@2437
    11
 		pri &= LOG_PRIMASK|LOG_FACMASK;
yann@2437
    12
 	}