Author: rmh Date: 2006-02-24 07:41:29 +0000 (Fri, 24 Feb 2006) New Revision: 1246
Added: trunk/glibc-2.3-head/patches/upstream/path_log.patch trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/syslog-path.h Removed: trunk/glibc-2.3-head/patches/fixes/path_log.patch Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/paths.h Log: Sync path_log.patch with upstream. Deleted: trunk/glibc-2.3-head/patches/fixes/path_log.patch =================================================================== --- trunk/glibc-2.3-head/patches/fixes/path_log.patch 2006-02-23 19:01:20 UTC (rev 1245) +++ trunk/glibc-2.3-head/patches/fixes/path_log.patch 2006-02-24 07:41:29 UTC (rev 1246) @@ -1,41 +0,0 @@ - -Author: rmh -Description: Move _PATH_LOG to sysdeps/[...]/paths.h (this way we can override it) -Status: http://sources.redhat.com/bugzilla/show_bug.cgi?id=2172 - -diff -ur misc/sys/syslog.h misc/sys/syslog.h ---- misc/sys/syslog.h 2006-01-14 13:09:36.000000000 +0100 -+++ misc/sys/syslog.h 2006-01-17 11:29:03.000000000 +0100 -@@ -35,9 +35,7 @@ - #include <features.h> - #define __need___va_list - #include <stdarg.h> -- -- --#define _PATH_LOG "/dev/log" -+#include <paths.h> /* _PATH_LOG */ - - /* - * priorities/facilities are encoded into a single 32-bit quantity, where the -diff -ur sysdeps/generic/paths.h sysdeps/generic/paths.h ---- sysdeps/generic/paths.h 1999-06-08 23:04:36.000000000 +0200 -+++ sysdeps/generic/paths.h 2006-01-17 11:33:43.000000000 +0100 -@@ -47,6 +47,7 @@ - #define _PATH_KMEM "/dev/kmem" - #define _PATH_MAILDIR "/var/mail" - #define _PATH_LASTLOG "/var/log/lastlog" -+#define _PATH_LOG "/dev/log" - #define _PATH_MAN "/usr/man" - #define _PATH_MEM "/dev/mem" - #define _PATH_MNTTAB "/etc/fstab" -diff -ur sysdeps/unix/sysv/linux/paths.h sysdeps/unix/sysv/linux/paths.h ---- sysdeps/unix/sysv/linux/paths.h 2000-11-16 00:06:47.000000000 +0100 -+++ sysdeps/unix/sysv/linux/paths.h 2006-01-17 11:33:58.000000000 +0100 -@@ -47,6 +47,7 @@ - #define _PATH_KLOG "/proc/kmsg" - #define _PATH_KMEM "/dev/kmem" - #define _PATH_LASTLOG "/var/log/lastlog" -+#define _PATH_LOG "/dev/log" - #define _PATH_MAILDIR "/var/mail" - #define _PATH_MAN "/usr/share/man" - #define _PATH_MEM "/dev/mem" Copied: trunk/glibc-2.3-head/patches/upstream/path_log.patch (from rev 1202, trunk/glibc-2.3-head/patches/fixes/path_log.patch) =================================================================== --- trunk/glibc-2.3-head/patches/fixes/path_log.patch 2006-02-15 12:16:53 UTC (rev 1202) +++ trunk/glibc-2.3-head/patches/upstream/path_log.patch 2006-02-24 07:41:29 UTC (rev 1246) @@ -0,0 +1,59 @@ + +Author: rmh +Description: Move _PATH_LOG to bits/syslog-path.h (this way we can override it) +Status: merged (see http://sources.redhat.com/bugzilla/show_bug.cgi?id=2172) + +--- misc/Makefile 2006-01-21 09:17:29.000000000 +0100 ++++ misc/Makefile 2006-02-22 17:44:11.000000000 +0100 +@@ -30,7 +30,7 @@ + sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \ + sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \ + regexp.h bits/select.h bits/mman.h sys/xattr.h \ +- syslog.h sys/syslog.h bits/syslog.h bits/syslog-ldbl.h ++ syslog.h sys/syslog.h bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h + + routines := brk sbrk sstk ioctl \ + readv writev \ +--- misc/sys/syslog.h 2006-01-14 13:09:36.000000000 +0100 ++++ misc/sys/syslog.h 2006-02-22 17:42:57.000000000 +0100 +@@ -37,7 +37,7 @@ + #include <stdarg.h> + + +-#define _PATH_LOG "/dev/log" ++#include <bits/syslog-path.h> + + /* + * priorities/facilities are encoded into a single 32-bit quantity, where the +--- sysdeps/generic/bits/syslog-path.h 1970-01-01 01:00:00.000000000 +0100 ++++ sysdeps/generic/bits/syslog-path.h 2006-02-22 17:42:57.000000000 +0100 +@@ -0,0 +1,29 @@ ++/* <bits/syslog-path.h> -- _PATH_LOG definition ++ Copyright (C) 2006 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, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#ifndef _SYS_SYSLOG_H ++# error "Never include this file directly. Use <sys/syslog.h> instead" ++#endif ++ ++#ifndef _BITS_SYSLOG_PATH_H ++#define _BITS_SYSLOG_PATH_H 1 ++ ++#define _PATH_LOG "/dev/log" ++ ++#endif /* bits/syslog-path.h */ Added: trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/syslog-path.h =================================================================== --- trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/syslog-path.h 2006-02-23 19:01:20 UTC (rev 1245) +++ trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/syslog-path.h 2006-02-24 07:41:29 UTC (rev 1246) @@ -0,0 +1,31 @@ +/* <bits/syslog-path.h> -- _PATH_LOG definition + Copyright (C) 2006 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _SYS_SYSLOG_H +# error "Never include this file directly. Use <sys/syslog.h> instead" +#endif + +#ifndef _BITS_SYSLOG_PATH_H +#define _BITS_SYSLOG_PATH_H 1 + +/* On kFreeBSD, named pipes are not allowed in /dev (devfs), so we pick this + alternate path. */ +#define _PATH_LOG "/var/run/log" + +#endif /* bits/syslog-path.h */ Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/paths.h =================================================================== --- trunk/glibc-2.3-head/sysdeps/kfreebsd/paths.h 2006-02-23 19:01:20 UTC (rev 1245) +++ trunk/glibc-2.3-head/sysdeps/kfreebsd/paths.h 2006-02-24 07:41:29 UTC (rev 1246) @@ -47,7 +47,6 @@ #define _PATH_KMEM "/dev/kmem" #define _PATH_LASTLOG "/var/log/lastlog" /* FIFOs are not permitted in /dev, so we use /var/run/log instead of /dev/log */ -#define _PATH_LOG "/var/run/log" #define _PATH_MAILDIR "/var/mail" #define _PATH_MAN "/usr/share/man" #define _PATH_MEM "/dev/mem" -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
