Accepting request 23792 from home:coolo:branches:openSUSE:Factory:branched
Copy from home:coolo:branches:openSUSE:Factory:branched/syslogd via accept of submit request 23792 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/23792 OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=9
This commit is contained in:
Pavol Rusnak
Git OBS Bridge
parent
59f6a41a62
commit
b4bd1daa32
@ -1,5 +1,7 @@
|
||||
--- .pkgextract
|
||||
+++ .pkgextract 2006-02-08 17:29:50.000000000 +0100
|
||||
Index: .pkgextract
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ .pkgextract
|
||||
@@ -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
|
||||
@ -21,8 +23,10 @@
|
||||
+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
|
||||
--- Makefile
|
||||
+++ Makefile 2006-02-08 17:29:50.000000000 +0100
|
||||
Index: Makefile
|
||||
===================================================================
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -1,14 +1,17 @@
|
||||
# Makefile for syslogd and klogd daemons.
|
||||
|
||||
@ -73,11 +77,13 @@
|
||||
+ ${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
|
||||
--- klogd.c
|
||||
+++ klogd.c 2008-05-30 12:23:07.616318420 +0200
|
||||
@@ -275,15 +275,21 @@ _syscall3(int,ksyslog,int, type, char *,
|
||||
#define ksyslog klogctl
|
||||
#endif
|
||||
Index: klogd.c
|
||||
===================================================================
|
||||
--- klogd.c.orig
|
||||
+++ klogd.c
|
||||
@@ -277,15 +277,21 @@ _syscall3(int,ksyslog,int, type, char *,
|
||||
|
||||
#include <sys/utsname.h>
|
||||
|
||||
-#define LOG_BUFFER_SIZE 4096
|
||||
+#ifndef _PATH_KLOG
|
||||
@ -101,7 +107,7 @@
|
||||
#endif
|
||||
|
||||
#include "fortify.h"
|
||||
@@ -297,6 +303,8 @@ static int kmsg,
|
||||
@@ -299,6 +305,8 @@ static int kmsg,
|
||||
|
||||
static int use_syscall = 0,
|
||||
one_shot = 0,
|
||||
@ -110,7 +116,7 @@
|
||||
symbol_lookup = 1,
|
||||
no_fork = 0; /* don't fork - don't run in daemon mode */
|
||||
|
||||
@@ -872,8 +880,7 @@ static void LogLine(char *ptr, int len)
|
||||
@@ -874,8 +882,7 @@ static void LogLine(char *ptr, int len)
|
||||
value = strtoul(sym_start+1, (char **) 0, 16);
|
||||
*(line-1) = '>'; /* put back delim */
|
||||
|
||||
@ -120,7 +126,7 @@
|
||||
{
|
||||
parse_state = PARSING_TEXT;
|
||||
break;
|
||||
@@ -914,7 +921,7 @@ static void LogLine(char *ptr, int len)
|
||||
@@ -916,7 +923,7 @@ static void LogLine(char *ptr, int len)
|
||||
static void LogKernelLine(void)
|
||||
|
||||
{
|
||||
@ -129,7 +135,7 @@
|
||||
|
||||
/*
|
||||
* Zero-fill the log buffer. This should cure a multitude of
|
||||
@@ -923,6 +930,11 @@ static void LogKernelLine(void)
|
||||
@@ -925,6 +932,11 @@ static void LogKernelLine(void)
|
||||
* messages into this fresh buffer.
|
||||
*/
|
||||
memset(log_buffer, '\0', log_buf_size);
|
||||
@ -141,7 +147,7 @@
|
||||
if ( (rdcnt = ksyslog(2, log_buffer, log_buf_size-1)) < 0 )
|
||||
{
|
||||
if ( errno == EINTR )
|
||||
@@ -1014,10 +1026,15 @@ int main(argc, argv)
|
||||
@@ -1033,10 +1045,15 @@ int main(argc, argv)
|
||||
*output = (char *) 0;
|
||||
|
||||
#ifndef TESTING
|
||||
@ -159,7 +165,7 @@
|
||||
switch((char)ch)
|
||||
{
|
||||
case '2': /* Print lines with symbols twice. */
|
||||
@@ -1048,6 +1065,14 @@ int main(argc, argv)
|
||||
@@ -1067,6 +1084,14 @@ int main(argc, argv)
|
||||
case 'o': /* One-shot mode. */
|
||||
one_shot = 1;
|
||||
break;
|
||||
@ -174,7 +180,7 @@
|
||||
case 'p':
|
||||
SetParanoiaLevel(1); /* Load symbols on oops. */
|
||||
break;
|
||||
@@ -1171,8 +1196,11 @@ int main(argc, argv)
|
||||
@@ -1193,8 +1218,11 @@ int main(argc, argv)
|
||||
if ( one_shot )
|
||||
{
|
||||
if (symbol_lookup) {
|
||||
@ -188,7 +194,7 @@
|
||||
}
|
||||
if ( (logsrc = GetKernelLogSrc()) == kernel )
|
||||
LogKernelLine();
|
||||
@@ -1187,8 +1215,11 @@ int main(argc, argv)
|
||||
@@ -1209,8 +1237,11 @@ int main(argc, argv)
|
||||
#endif
|
||||
logsrc = GetKernelLogSrc();
|
||||
if (symbol_lookup) {
|
||||
@ -202,8 +208,10 @@
|
||||
}
|
||||
|
||||
/* The main loop. */
|
||||
--- pidfile.c
|
||||
+++ pidfile.c 2008-05-30 00:04:24.000000000 +0200
|
||||
Index: pidfile.c
|
||||
===================================================================
|
||||
--- pidfile.c.orig
|
||||
+++ pidfile.c
|
||||
@@ -46,11 +46,11 @@
|
||||
int read_pid (char *pidfile)
|
||||
{
|
||||
@ -244,8 +252,10 @@
|
||||
if (!fprintf(f,"%d\n", pid)) {
|
||||
fprintf(stderr, "Can't write pid , %s.\n", strerror(errno));
|
||||
close(fd);
|
||||
--- resolve.c
|
||||
+++ resolve.c 2006-02-08 17:29:50.000000000 +0100
|
||||
Index: resolve.c
|
||||
===================================================================
|
||||
--- resolve.c.orig
|
||||
+++ resolve.c
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
@ -254,7 +264,7 @@
|
||||
|
||||
#if defined(__GLIBC__)
|
||||
#define dprintf mydprintf
|
||||
@@ -208,7 +209,7 @@ do_query(int fd, int family, const char
|
||||
@@ -208,7 +209,7 @@ do_query(int fd, int family, const char
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
struct addrinfo hints, *res;
|
||||
@ -263,7 +273,7 @@
|
||||
|
||||
memset(&hints, 0, sizeof(hints));
|
||||
hints.ai_socktype = SOCK_DGRAM;
|
||||
@@ -244,6 +245,20 @@ do_query(int fd, int family, const char
|
||||
@@ -244,6 +245,20 @@ do_query(int fd, int family, const char
|
||||
} else {
|
||||
memcpy(&ss, res->ai_addr, res->ai_addrlen);
|
||||
}
|
||||
@ -286,8 +296,10 @@
|
||||
+ dprintf("failed to write: %s\n", strerror(errno));
|
||||
+ exit(1);
|
||||
}
|
||||
--- sample-s390.conf
|
||||
+++ sample-s390.conf 2006-02-08 17:29:50.000000000 +0100
|
||||
Index: sample-s390.conf
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ sample-s390.conf
|
||||
@@ -0,0 +1,60 @@
|
||||
+# /etc/syslog.conf - Configuration file for syslogd(8)
|
||||
+#
|
||||
@ -349,8 +361,10 @@
|
||||
+local2,local3.* -/var/log/localmessages
|
||||
+local4,local5.* -/var/log/localmessages
|
||||
+local6,local7.* -/var/log/localmessages
|
||||
--- sample.conf
|
||||
+++ sample.conf 2006-02-08 17:29:50.000000000 +0100
|
||||
Index: sample.conf
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ sample.conf
|
||||
@@ -0,0 +1,60 @@
|
||||
+# /etc/syslog.conf - Configuration file for syslogd(8)
|
||||
+#
|
||||
@ -412,8 +426,10 @@
|
||||
+local2,local3.* -/var/log/localmessages
|
||||
+local4,local5.* -/var/log/localmessages
|
||||
+local6,local7.* -/var/log/localmessages
|
||||
--- syslog.c
|
||||
+++ syslog.c 2006-02-08 17:29:50.000000000 +0100
|
||||
Index: syslog.c
|
||||
===================================================================
|
||||
--- syslog.c.orig
|
||||
+++ syslog.c
|
||||
@@ -70,7 +70,13 @@ static char sccsid[] = "@(#)syslog.c 5.2
|
||||
#include <paths.h>
|
||||
#include <stdio.h>
|
||||
@ -429,8 +445,10 @@
|
||||
|
||||
#include "fortify.h"
|
||||
|
||||
--- syslogd.c
|
||||
+++ syslogd.c 2008-05-28 12:14:25.000000000 +0200
|
||||
Index: syslogd.c
|
||||
===================================================================
|
||||
--- syslogd.c.orig
|
||||
+++ syslogd.c
|
||||
@@ -466,6 +466,7 @@ static char sccsid[] __attribute__ ((un
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 3 19:09:47 UTC 2009 - coolo@novell.com
|
||||
|
||||
- updated patches to apply with fuzz=0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 9 21:47:47 CEST 2009 - mt@suse.de
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user