Dr. Werner Fink 2010-01-19 10:40:12 +00:00 committed by Git OBS Bridge
parent f516f10fcd
commit f5e770e3da
25 changed files with 106 additions and 181 deletions

View File

@ -24,6 +24,11 @@
BINDIR=/sbin
if type -t rc_readonlyroot > /dev/null 2>&1 && rc_readonlyroot ; then
echo "Disabling early syslog on read-only root filesystem."
exit 0
fi
# update $SYSLOG_DAEMON if not up-to-date
test -n "$SYSLOG_DAEMON" && \
test -x "${BINDIR}/$SYSLOG_DAEMON" || {

View File

@ -2,10 +2,8 @@
! Be able to write errors on creating of pid file on
! the current terminal (bug #394787)
!
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:56.247123000 +0100
+++ klogd.c 2009-11-24 18:12:56.685124000 +0100
--- klogd.c
+++ klogd.c 2008-05-28 10:01:46.000000000 +0000
@@ -1098,6 +1098,10 @@ int main(argc, argv)
auto int fl;
int num_fds = getdtablesize();
@ -48,10 +46,8 @@ Index: klogd.c
}
#endif
Index: pidfile.c
===================================================================
--- pidfile.c.orig 1998-02-10 23:37:12.000000000 +0100
+++ pidfile.c 2009-11-24 18:12:56.689116000 +0100
--- pidfile.c
+++ pidfile.c 2008-05-29 21:43:35.280028303 +0000
@@ -23,6 +23,7 @@
* Sat Aug 19 13:24:33 MET DST 1995: Martin Schulze
* First version (v0.2) released
@ -132,10 +128,8 @@ Index: pidfile.c
close(fd);
return 0;
}
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:56.480126000 +0100
+++ syslogd.c 2009-11-24 18:12:56.694123000 +0100
--- syslogd.c
+++ syslogd.c 2008-05-28 10:12:25.000000000 +0000
@@ -22,7 +22,7 @@ char copyright2[] =
#endif /* not lint */

View File

@ -1,7 +1,5 @@
Index: syslog.c
===================================================================
--- syslog.c.orig 2001-03-11 20:35:51.000000000 +0100
+++ syslog.c 2009-11-24 18:12:52.145473000 +0100
--- syslog.c
+++ syslog.c 2001-05-23 18:48:13.000000000 +0000
@@ -211,8 +211,9 @@ openlog(ident, logstat, logfac)
strncpy(SyslogAddr.sa_data, _PATH_LOGNAME,
sizeof(SyslogAddr.sa_data));

View File

@ -1,7 +1,5 @@
Index: Makefile
===================================================================
--- Makefile.orig 2009-11-24 18:12:53.675378000 +0100
+++ Makefile 2009-11-24 18:12:53.916293000 +0100
--- Makefile
+++ Makefile 2003-06-02 12:30:18.000000000 +0000
@@ -59,8 +59,8 @@ test: syslog_tst ksym oops_test tsyslogd
install: install_man install_exec
@ -13,10 +11,8 @@ Index: Makefile
klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o
${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \
Index: resolve.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ resolve.c 2009-11-24 18:12:53.920294000 +0100
--- resolve.c
+++ resolve.c 2003-06-02 12:30:33.000000000 +0000
@@ -0,0 +1,249 @@
+/*
+ * Resolve a hostname
@ -267,10 +263,8 @@ Index: resolve.c
+ write(fd, &ss, sizeof(ss));
+ exit(0);
+}
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:53.679395000 +0100
+++ syslogd.c 2009-11-24 18:12:53.926309000 +0100
--- syslogd.c
+++ syslogd.c 2003-06-02 12:30:26.000000000 +0000
@@ -628,14 +628,7 @@ struct filed {
struct {
char f_hname[MAXHOSTNAMELEN+1];

View File

@ -1,7 +1,5 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:55.564210000 +0100
+++ klogd.c 2009-11-24 18:12:56.247123000 +0100
--- klogd.c
+++ klogd.c 2007-06-18 11:22:06.978362000 +0000
@@ -416,9 +416,11 @@ static void Terminate()
{
CloseLogSrc();

View File

@ -1,7 +1,5 @@
Index: ksym.c
===================================================================
--- ksym.c.orig 2009-11-24 18:12:52.424467000 +0100
+++ ksym.c 2009-11-24 18:12:52.901406000 +0100
--- ksym.c
+++ ksym.c 2001-05-23 18:54:18.000000000 +0000
@@ -345,6 +345,7 @@ static char * FindSymbolFile()
if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) {
if (CheckMapVersion(symfile) == 1)

View File

@ -1,7 +1,5 @@
Index: sysklogd.8
===================================================================
--- sysklogd.8.orig 2001-03-11 20:35:51.000000000 +0100
+++ sysklogd.8 2009-11-24 18:12:52.655464000 +0100
--- sysklogd.8
+++ sysklogd.8 2001-05-23 18:59:26.000000000 +0000
@@ -29,6 +29,7 @@ sysklogd \- Linux system logging utiliti
.RB [ " \-s "
.I domainlist
@ -22,10 +20,8 @@ Index: sysklogd.8
.B "\-v"
Print version and exit.
.LP
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2001-03-11 20:40:10.000000000 +0100
+++ syslogd.c 2009-11-24 18:12:52.661468000 +0100
--- syslogd.c
+++ syslogd.c 2001-05-23 19:01:21.000000000 +0000
@@ -417,6 +417,13 @@ static char sccsid[] = "@(#)syslogd.c 5.
* file is defined in the used libc and should not be hardcoded
* into the syslogd binary referring the system it was compiled on.

View File

@ -1,7 +1,5 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2001-03-11 20:40:10.000000000 +0100
+++ klogd.c 2009-11-24 18:12:53.393383000 +0100
--- klogd.c
+++ klogd.c 2003-09-09 14:15:47.000000000 +0000
@@ -879,7 +879,7 @@ static void LogLine(char *ptr, int len)
{
auto int sym_space;
@ -20,10 +18,8 @@ Index: klogd.c
symbol, sym.offset, sym.size );
space = sym_space + delta;
Index: ksym.c
===================================================================
--- ksym.c.orig 2009-11-24 18:12:52.901406000 +0100
+++ ksym.c 2009-11-24 18:12:53.397383000 +0100
--- ksym.c
+++ ksym.c 2003-09-09 14:15:47.000000000 +0000
@@ -122,7 +122,7 @@
/* Variables static to this module. */
struct sym_table
@ -204,10 +200,8 @@ Index: ksym.c
}
strncat(elp, kp, value);
elp += value;
Index: ksym_mod.c
===================================================================
--- ksym_mod.c.orig 2000-09-12 23:15:28.000000000 +0200
+++ ksym_mod.c 2009-11-24 18:12:53.402379000 +0100
--- ksym_mod.c
+++ ksym_mod.c 2003-09-09 16:51:08.000000000 +0000
@@ -89,43 +89,101 @@
#include <errno.h>
#include <sys/fcntl.h>
@ -472,10 +466,8 @@ Index: ksym_mod.c
return(mp->name);
}
}
Index: ksyms.h
===================================================================
--- ksyms.h.orig 1997-06-13 11:35:55.000000000 +0200
+++ ksyms.h 2009-11-24 18:12:53.406377000 +0100
--- ksyms.h
+++ ksyms.h 2003-09-09 14:15:47.000000000 +0000
@@ -20,16 +20,19 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

View File

@ -2,10 +2,8 @@
ksym_mod.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: ksym_mod.c
===================================================================
--- ksym_mod.c.orig 2009-11-24 18:12:53.402379000 +0100
+++ ksym_mod.c 2009-11-24 18:12:56.016116000 +0100
--- ksym_mod.c
+++ ksym_mod.c 2007-08-09 00:00:00.000000000 +0200
@@ -91,7 +91,6 @@
#include <sys/stat.h>
#include <stdarg.h>

View File

@ -1,7 +1,5 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:53.393383000 +0100
+++ klogd.c 2009-11-24 18:12:54.840288000 +0100
--- klogd.c
+++ klogd.c 2004-07-27 11:53:48.985727118 +0000
@@ -299,8 +299,10 @@ static int use_syscall = 0,
no_fork = 0; /* don't fork - don't run in daemon mode */

View File

@ -1,7 +1,5 @@
Index: Makefile
===================================================================
--- Makefile.orig 2009-11-24 18:12:53.137377000 +0100
+++ Makefile 2009-11-24 18:12:53.675378000 +0100
--- Makefile
+++ Makefile 2003-05-20 13:15:53.000000000 +0000
@@ -29,7 +29,7 @@ MANDIR = /usr/man
# The following define determines whether the package adheres to the
@ -11,10 +9,8 @@ Index: Makefile
# The following define establishes ownership for the man pages.
# Avery tells me that there is a difference between Debian and
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:53.143385000 +0100
+++ syslogd.c 2009-11-24 18:12:53.679395000 +0100
--- syslogd.c
+++ syslogd.c 2003-05-20 13:12:35.000000000 +0000
@@ -1030,6 +1030,7 @@ int main(argc, argv)
(void) signal(SIGCHLD, reapchild);
(void) signal(SIGALRM, domark);

View File

@ -1,7 +1,5 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:53.926309000 +0100
+++ syslogd.c 2009-11-24 18:12:54.408310000 +0100
--- syslogd.c
+++ syslogd.c 2003-09-29 08:50:05.000000000 +0000
@@ -1305,6 +1305,7 @@ static int create_inet_socket()
close(fd);
return -1;

View File

@ -1,7 +1,5 @@
Index: fortify.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ fortify.h 2009-11-24 18:12:56.934029000 +0100
--- fortify.h
+++ fortify.h 2008-05-30 10:18:14.874490898 +0000
@@ -0,0 +1,17 @@
+#if defined(__USE_FORTIFY_LEVEL)
+# undef syslog
@ -20,10 +18,8 @@ Index: fortify.h
+# define closelog priv_closelog
+# define setlogmask priv_setlogmask
+#endif
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:56.685124000 +0100
+++ klogd.c 2009-11-24 18:12:56.937035000 +0100
--- klogd.c
+++ klogd.c 2008-05-30 10:19:59.501151202 +0000
@@ -286,6 +286,8 @@ static char *PidFile = "/etc/klogd.pid";
#endif
#endif
@ -33,10 +29,8 @@ Index: klogd.c
static int kmsg,
change_state = 0,
terminate = 0,
Index: syslog.c
===================================================================
--- syslog.c.orig 2009-11-24 18:12:54.173290000 +0100
+++ syslog.c 2009-11-24 18:12:56.940031000 +0100
--- syslog.c
+++ syslog.c 2008-05-30 10:20:24.799728870 +0000
@@ -72,6 +72,8 @@ static char sccsid[] = "@(#)syslog.c 5.2
#define _PATH_LOGNAME "/dev/log"

View File

@ -1,7 +1,5 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:54.408310000 +0100
+++ syslogd.c 2009-11-24 18:12:54.611301000 +0100
--- syslogd.c
+++ syslogd.c 2004-04-18 01:42:21.000000000 +0000
@@ -1336,30 +1336,26 @@ char **
crunch_list(list)
char *list;

View File

@ -1,7 +1,5 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:54.840288000 +0100
+++ klogd.c 2009-11-24 18:12:55.564210000 +0100
--- klogd.c
+++ klogd.c 2004-12-02 20:58:17.026614000 +0000
@@ -740,7 +740,7 @@ static void LogLine(char *ptr, int len)
switch( parse_state )
{

View File

@ -9,10 +9,8 @@
#
# Author: mt@suse.de
#
Index: syslog.c
===================================================================
--- syslog.c.orig 2009-11-24 18:12:52.145473000 +0100
+++ syslog.c 2009-11-24 18:12:54.173290000 +0100
--- syslog.c
+++ syslog.c 2003-08-26 11:34:34.000000000 +0000
@@ -97,7 +97,7 @@ vsyslog(pri, fmt, ap)
register int cnt;
register char *p;

View File

@ -1,7 +1,5 @@
Index: sysklogd.8
===================================================================
--- sysklogd.8.orig 2009-11-24 18:12:52.655464000 +0100
+++ sysklogd.8 2009-11-24 18:12:55.314207000 +0100
--- sysklogd.8
+++ sysklogd.8 2005-05-23 14:48:34.564338699 +0000
@@ -31,6 +31,7 @@ sysklogd \- Linux system logging utiliti
]
.RB [ " \-t " ]
@ -39,9 +37,7 @@ Index: sysklogd.8
.LP
.SH SIGNALS
.B Syslogd
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:55.083205000 +0100
--- syslogd.c
+++ syslogd.c 2009-11-24 18:12:55.320216000 +0100
@@ -594,6 +594,9 @@ int funix[MAXFUNIX] = { -1, };
#define SYNC_FILE 0x002 /* do fsync on file after printing */

View File

@ -1,7 +1,5 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:55.787215000 +0100
+++ syslogd.c 2009-11-24 18:12:56.480126000 +0100
--- syslogd.c
+++ syslogd.c 2008-03-26 16:45:54.247851855 +0000
@@ -770,6 +770,9 @@ extern int errno;
int main(int argc, char **argv);
char **crunch_list(char *list);

View File

@ -1,7 +1,5 @@
Index: ksym.c
===================================================================
--- ksym.c.orig 2000-09-12 23:53:31.000000000 +0200
+++ ksym.c 2009-11-24 18:12:52.424467000 +0100
--- ksym.c
+++ ksym.c 2001-05-23 18:50:36.000000000 +0000
@@ -112,6 +112,7 @@
#include <stdlib.h>
#include <malloc.h>

View File

@ -17,10 +17,8 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
klogd.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:56.937035000 +0100
+++ klogd.c 2009-11-24 18:12:57.166028000 +0100
--- klogd.c
+++ klogd.c 2009-08-12 12:19:17.333901686 +0000
@@ -275,6 +275,8 @@ _syscall3(int,ksyslog,int, type, char *,
#define ksyslog klogctl
#endif

View File

@ -1,7 +1,5 @@
Index: syslog.conf.5
===================================================================
--- syslog.conf.5.orig 1999-08-21 12:49:14.000000000 +0200
+++ syslog.conf.5 2009-11-24 18:12:55.068205000 +0100
--- syslog.conf.5
+++ syslog.conf.5 2004-09-16 20:21:07.144284248 +0000
@@ -159,6 +159,16 @@ command before
.BR syslogd (8)
is started.
@ -19,10 +17,8 @@ Index: syslog.conf.5
.SS Terminal and Console
If the file you specified is a tty, special tty-handling is done, same
with
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:54.611301000 +0100
+++ syslogd.c 2009-11-24 18:12:55.083205000 +0100
--- syslogd.c
+++ syslogd.c 2004-09-16 20:21:07.150143661 +0000
@@ -633,6 +633,10 @@ struct filed {
struct sockaddr_in f_addr;
#endif

View File

@ -1,7 +1,5 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:55.320216000 +0100
+++ syslogd.c 2009-11-24 18:12:55.787215000 +0100
--- syslogd.c
+++ syslogd.c 2004-09-26 02:41:27.136610056 +0000
@@ -1538,7 +1538,7 @@ void printline(hname, msg)
else if (c < 040) {
*q++ = '^';

View File

@ -1,7 +1,5 @@
Index: .pkgextract
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ .pkgextract 2009-11-24 18:12:57.386029000 +0100
--- .pkgextract
+++ .pkgextract 2006-02-08 16:29:50.000000000 +0000
@@ -0,0 +1,20 @@
+patch -p0 -b --suffix=.dgram -s < ../sysklogd-1.4.1-dgram.patch
+patch -p0 -b --suffix=.sparc -s < ../sysklogd-1.4.1-sparc.patch
@ -23,10 +21,8 @@ Index: .pkgextract
+patch -p1 -b --suffix=.sleep -s < ../sysklogd-1.4.1-dontsleep.patch
+patch -p0 -b --suffix=.signal -s < ../sysklogd-1.4.1-signal.dif
+patch -p0 -b --suffix=.clear -s < ../sysklogd-1.4.1-clearing.patch
Index: Makefile
===================================================================
--- Makefile.orig 2009-11-24 18:12:53.916293000 +0100
+++ Makefile 2009-11-24 18:12:57.389032000 +0100
--- Makefile
+++ Makefile 2006-02-08 16:29:50.000000000 +0000
@@ -1,14 +1,17 @@
# Makefile for syslogd and klogd daemons.
@ -77,10 +73,8 @@ Index: Makefile
+ ${INSTALL} -m 644 syslogd.8 ${DESTDIR}${MANDIR}/man8/syslogd.8
+ ${INSTALL} -m 644 syslog.conf.5 ${DESTDIR}${MANDIR}/man5/syslog.conf.5
+ ${INSTALL} -m 644 klogd.8 ${DESTDIR}${MANDIR}/man8/klogd.8
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:57.166028000 +0100
+++ klogd.c 2009-11-24 18:12:57.393037000 +0100
--- klogd.c
+++ klogd.c 2008-05-30 10:23:07.616318420 +0000
@@ -277,15 +277,21 @@ _syscall3(int,ksyslog,int, type, char *,
#include <sys/utsname.h>
@ -208,10 +202,8 @@ Index: klogd.c
}
/* The main loop. */
Index: pidfile.c
===================================================================
--- pidfile.c.orig 2009-11-24 18:12:56.689116000 +0100
+++ pidfile.c 2009-11-24 18:12:57.397029000 +0100
--- pidfile.c
+++ pidfile.c 2008-05-29 22:04:24.000000000 +0000
@@ -46,11 +46,11 @@
int read_pid (char *pidfile)
{
@ -252,10 +244,8 @@ Index: pidfile.c
if (!fprintf(f,"%d\n", pid)) {
fprintf(stderr, "Can't write pid , %s.\n", strerror(errno));
close(fd);
Index: resolve.c
===================================================================
--- resolve.c.orig 2009-11-24 18:12:53.920294000 +0100
+++ resolve.c 2009-11-24 18:12:57.400034000 +0100
--- resolve.c
+++ resolve.c 2006-02-08 16:29:50.000000000 +0000
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <signal.h>
@ -296,10 +286,8 @@ Index: resolve.c
+ dprintf("failed to write: %s\n", strerror(errno));
+ exit(1);
}
Index: sample-s390.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ sample-s390.conf 2009-11-24 18:12:57.417029000 +0100
+++ sample-s390.conf 2006-02-08 16:29:50.000000000 +0000
@@ -0,0 +1,60 @@
+# /etc/syslog.conf - Configuration file for syslogd(8)
+#
@ -361,10 +349,8 @@ Index: sample-s390.conf
+local2,local3.* -/var/log/localmessages
+local4,local5.* -/var/log/localmessages
+local6,local7.* -/var/log/localmessages
Index: sample.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ sample.conf 2009-11-24 18:12:57.420029000 +0100
+++ sample.conf 2006-02-08 16:29:50.000000000 +0000
@@ -0,0 +1,60 @@
+# /etc/syslog.conf - Configuration file for syslogd(8)
+#
@ -426,10 +412,8 @@ Index: sample.conf
+local2,local3.* -/var/log/localmessages
+local4,local5.* -/var/log/localmessages
+local6,local7.* -/var/log/localmessages
Index: syslog.c
===================================================================
--- syslog.c.orig 2009-11-24 18:12:56.940031000 +0100
+++ syslog.c 2009-11-24 18:12:57.423029000 +0100
--- syslog.c
+++ syslog.c 2006-02-08 16:29:50.000000000 +0000
@@ -70,7 +70,13 @@ static char sccsid[] = "@(#)syslog.c 5.2
#include <paths.h>
#include <stdio.h>
@ -445,10 +429,8 @@ Index: syslog.c
#include "fortify.h"
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:56.694123000 +0100
+++ syslogd.c 2009-11-24 18:12:57.428040000 +0100
--- syslogd.c
+++ syslogd.c 2008-05-28 10:14:25.000000000 +0000
@@ -466,6 +466,7 @@ static char sccsid[] __attribute__ ((un
#include <sys/types.h>
#endif

View File

@ -1,7 +1,5 @@
Index: CHANGES
===================================================================
--- CHANGES.orig 2001-03-11 20:35:51.000000000 +0100
+++ CHANGES 2009-11-24 18:12:53.132378000 +0100
--- CHANGES
+++ CHANGES 2002-08-02 11:28:10.000000000 +0000
@@ -1,3 +1,7 @@
+Version 1.4.1-usagi (2001/03/21)
+ - syslogd IPv6 support
@ -10,10 +8,8 @@ Index: CHANGES
Version 1.4.1
. klogd will set the console log level only if `-c' is given on the
Index: Makefile
===================================================================
--- Makefile.orig 1998-10-12 22:25:15.000000000 +0200
+++ Makefile 2009-11-24 18:12:53.137377000 +0100
--- Makefile
+++ Makefile 2002-08-02 11:58:42.000000000 +0000
@@ -3,7 +3,7 @@
CC= gcc
#CFLAGS= -g -DSYSV -Wall
@ -23,10 +19,8 @@ Index: Makefile
LDFLAGS= -s
# Look where your install program is.
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:52.661468000 +0100
+++ syslogd.c 2009-11-24 18:12:53.143385000 +0100
--- syslogd.c
+++ syslogd.c 2002-08-02 12:00:16.000000000 +0000
@@ -599,6 +599,7 @@ int funix[MAXFUNIX] = { -1, };
* This table contains plain text for h_errno errors used by the
* net subsystem.

View File

@ -1,8 +1,20 @@
-------------------------------------------------------------------
Tue Jan 19 11:31:32 CET 2010 - werner@suse.de
- Forward read-only root file system patch from SLES11-SP1
- Correct time stamps of the patches
-------------------------------------------------------------------
Sun Dec 20 17:25:22 CET 2009 - jengelh@medozas.de
- enable parallel build
-------------------------------------------------------------------
Fri Dec 18 17:59:42 CET 2009 - agruen@suse.de
- Add read-only root filesystem support (fate#307235) using bind
mounts.
-------------------------------------------------------------------
Tue Nov 24 17:16:07 UTC 2009 - crrodriguez@opensuse.org