r1249 - trunk/glibc-2.3-head/patches/upstream
Author: rmh
Date: 2006-02-24 22:57:31 +0000 (Fri, 24 Feb 2006)
New Revision: 1249
Modified:
trunk/glibc-2.3-head/patches/upstream/path_log.patch
Log:
Backport to 2.3.6 (oops).
Modified: trunk/glibc-2.3-head/patches/upstream/path_log.patch
===================================================================
--- trunk/glibc-2.3-head/patches/upstream/path_log.patch 2006-02-24 15:25:30 UTC (rev 1248)
+++ trunk/glibc-2.3-head/patches/upstream/path_log.patch 2006-02-24 22:57:31 UTC (rev 1249)
@@ -3,19 +3,21 @@
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 @@
+diff -Nur misc/Makefile misc/Makefile
+--- misc/Makefile 2005-07-30 01:26:18.000000000 +0200
++++ misc/Makefile 2006-02-24 23:42:01.000000000 +0100
+@@ -25,7 +25,7 @@
+ headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
+ sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
+ ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \
+- ttyent.h syslog.h sys/syslog.h paths.h sys/reboot.h \
++ ttyent.h syslog.h sys/syslog.h bits/syslog-path.h paths.h sys/reboot.h \
+ sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h \
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
+diff -Nur misc/sys/syslog.h misc/sys/syslog.h
+--- misc/sys/syslog.h 2003-08-30 11:27:50.000000000 +0200
++++ misc/sys/syslog.h 2006-02-24 23:41:39.000000000 +0100
@@ -37,7 +37,7 @@
#include <stdarg.h>
@@ -25,8 +27,9 @@
/*
* priorities/facilities are encoded into a single 32-bit quantity, where the
+diff -Nur sysdeps/generic/bits/syslog-path.h sysdeps/generic/bits/syslog-path.h
--- 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
++++ sysdeps/generic/bits/syslog-path.h 2006-02-24 23:41:39.000000000 +0100
@@ -0,0 +1,29 @@
+/* <bits/syslog-path.h> -- _PATH_LOG definition
+ Copyright (C) 2006 Free Software Foundation, Inc.
Reply to: