pool/syslogd
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 28151 from home:jengelh:branches:Base:System

Browse Source 
Copy from home:jengelh:branches:Base:System/syslogd via accept of submit request 28151 revision 3.
Request was accepted with message:
thanks!

OBS-URL: https://build.opensuse.org/request/show/28151
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=12
This commit is contained in:
Dirk Mueller 2010-01-06 17:06:41 +00:00 committed by Git OBS Bridge
parent 8921250342
commit 2144a0b3f4
25 changed files with 334 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysklogd-1.4.1-clearing.patch
View File

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

8
sysklogd-1.4.1-dgram.patch
View File

@ -1,6 +1,8 @@
--- syslog.c
+++ syslog.c Wed May 23 18:48:13 2001
@@ -211,8 +211,9 @@
Index: syslog.c
===================================================================
--- syslog.c.orig 2001-03-11 20:35:51.000000000 +0100
+++ syslog.c 2009-11-24 18:12:52.145473000 +0100
@@ -211,8 +211,9 @@ openlog(ident, logstat, logfac)
strncpy(SyslogAddr.sa_data, _PATH_LOGNAME,
sizeof(SyslogAddr.sa_data));
if (LogStat & LOG_NDELAY) {

38
sysklogd-1.4.1-dns.patch
View File

@ -1,6 +1,8 @@
--- sysklogd-1.4.1/Makefile.resolve 2003-06-02 14:30:18.000000000 +0200
+++ sysklogd-1.4.1/Makefile 2003-06-02 14:30:18.000000000 +0200
@@ -62,8 +62,8 @@
Index: Makefile
===================================================================
--- Makefile.orig 2009-11-24 18:12:53.675378000 +0100
+++ Makefile 2009-11-24 18:12:53.916293000 +0100
@@ -59,8 +59,8 @@ test: syslog_tst ksym oops_test tsyslogd
install: install_man install_exec
@ -11,8 +13,10 @@
klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o
${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \
--- sysklogd-1.4.1/resolve.c.resolve 2003-06-02 14:30:18.000000000 +0200
+++ sysklogd-1.4.1/resolve.c 2003-06-02 14:30:33.000000000 +0200
Index: resolve.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ resolve.c 2009-11-24 18:12:53.920294000 +0100
@@ -0,0 +1,249 @@
+/*
+ * Resolve a hostname
@ -263,9 +267,11 @@
+ write(fd, &ss, sizeof(ss));
+ exit(0);
+}
--- sysklogd-1.4.1/syslogd.c.resolve 2003-06-02 14:30:18.000000000 +0200
+++ sysklogd-1.4.1/syslogd.c 2003-06-02 14:30:26.000000000 +0200
@@ -633,14 +633,7 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:53.679395000 +0100
+++ syslogd.c 2009-11-24 18:12:53.926309000 +0100
@@ -628,14 +628,7 @@ struct filed {
struct {
char f_hname[MAXHOSTNAMELEN+1];
#ifdef INET6
@ -281,7 +287,7 @@
#else
struct sockaddr_in f_addr;
#endif
@@ -795,7 +788,7 @@
@@ -790,7 +783,7 @@ int decode(char *name, struct code *code
#if defined(__GLIBC__)
#define dprintf mydprintf
#endif /* __GLIBC__ */
@ -290,7 +296,7 @@
static void allocate_log(void);
void sighup_handler();
@@ -804,10 +797,8 @@
@@ -799,10 +792,8 @@ static int create_unix_socket(const char
#endif
#ifdef SYSLOG_INET
static int create_inet_socket();
@ -303,7 +309,7 @@
#endif
int main(argc, argv)
@@ -1342,63 +1333,6 @@
@@ -1337,63 +1328,6 @@ static int create_inet_socket()
return fd;
}
@ -367,7 +373,7 @@
#endif
char **
@@ -1821,7 +1755,7 @@
@@ -1814,7 +1748,7 @@ void fprintlog(f, from, flags, msg)
char line[MAXLINE + 1];
time_t fwd_suspend;
#ifdef INET6
@ -376,7 +382,7 @@
#else
struct hostent *hp;
#endif
@@ -1890,38 +1824,21 @@
@@ -1883,38 +1817,21 @@ void fprintlog(f, from, flags, msg)
*/
case F_FORW_UNKN:
dprintf(" %s\n", f->f_un.f_forw.f_hname);
@ -429,7 +435,7 @@
case F_FORW:
/*
@@ -2553,6 +2470,7 @@
@@ -2544,6 +2461,7 @@ void init()
#endif
#ifdef SYSLOG_INET
@ -437,7 +443,7 @@
if (Forwarding || AcceptRemote) {
if (finet < 0) {
finet = create_inet_socket();
@@ -2569,10 +2487,6 @@
@@ -2560,10 +2478,6 @@ void init()
InetInuse = 0;
}
inetm = finet;
@ -448,7 +454,7 @@
#endif
Initialized = 1;
@@ -2932,7 +2846,7 @@
@@ -2923,7 +2837,7 @@ int decode(name, codetab)
return (-1);
}

9
sysklogd-1.4.1-dontsleep.patch
View File

@ -1,7 +1,8 @@
diff -ru sysklogd-1.4.1.orig/klogd.c sysklogd-1.4.1/klogd.c
--- sysklogd-1.4.1.orig/klogd.c 2001-03-11 20:40:10.000000000 +0100
+++ sysklogd-1.4.1/klogd.c 2007-06-18 13:22:06.978362000 +0200
@@ -414,9 +414,11 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:55.564210000 +0100
+++ klogd.c 2009-11-24 18:12:56.247123000 +0100
@@ -416,9 +416,11 @@ static void Terminate()
{
CloseLogSrc();
Syslog(LOG_INFO, "Kernel log daemon terminating.");

10
sysklogd-1.4.1-fileleak.patch
View File

@ -1,6 +1,8 @@
--- ksym.c
+++ ksym.c Wed May 23 18:54:18 2001
@@ -344,6 +344,7 @@
Index: ksym.c
===================================================================
--- ksym.c.orig 2009-11-24 18:12:52.424467000 +0100
+++ ksym.c 2009-11-24 18:12:52.901406000 +0100
@@ -345,6 +345,7 @@ static char * FindSymbolFile()
if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) {
if (CheckMapVersion(symfile) == 1)
file = symfile;
@ -8,7 +10,7 @@
}
if (sym_file == (FILE *) 0 || file == (char *) 0) {
sprintf (symfile, "%s", *mf);
@@ -352,6 +353,7 @@
@@ -353,6 +354,7 @@ static char * FindSymbolFile()
if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) {
if (CheckMapVersion(symfile) == 1)
file = symfile;

32
sysklogd-1.4.1-forw.patch
View File

@ -1,6 +1,8 @@
--- sysklogd.8
+++ sysklogd.8 Wed May 23 18:59:26 2001
@@ -29,6 +29,7 @@
Index: sysklogd.8
===================================================================
--- sysklogd.8.orig 2001-03-11 20:35:51.000000000 +0100
+++ sysklogd.8 2009-11-24 18:12:52.655464000 +0100
@@ -29,6 +29,7 @@ sysklogd \- Linux system logging utiliti
.RB [ " \-s "
.I domainlist
]
@ -8,21 +10,23 @@
.RB [ " \-v " ]
.LP
.SH DESCRIPTION
@@ -149,6 +150,11 @@
is specified and the host logging resolves to satu.infodrom.north.de
@@ -150,6 +151,11 @@ is specified and the host logging resolv
no domain would be cut, you will have to specify two domains like:
.BR "\-s north.de:infodrom.north.de" .
+.TP
.TP
+.B "\-t"
+Tag forwarded messages with the sending hosts name as seen by the forwarder.
+Useful for relaying syslog from DMZs through the firwall to an internal
+loghost.
.TP
+.TP
.B "\-v"
Print version and exit.
--- syslogd.c
+++ syslogd.c Wed May 23 19:01:21 2001
@@ -417,6 +417,13 @@
.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
@@ -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.
*
@ -36,7 +40,7 @@
* Sun Sep 17 20:45:33 CEST 2000: Martin Schulze <joey@infodrom.ffis.de>
* Fixed some bugs in printline() code that did not escape
* control characters '\177' through '\237' and contained a
@@ -731,6 +738,7 @@
@@ -731,6 +738,7 @@ int MarkInterval = 20 * 60; /* interval
int MarkSeq = 0; /* mark sequence number */
int NoFork = 0; /* don't fork - don't run in daemon mode */
int AcceptRemote = 0; /* receive messages that come via UDP */
@ -44,7 +48,7 @@
char **StripDomains = NULL; /* these domains may be stripped before writing logs */
char **LocalHosts = NULL; /* these hosts are logged with their hostname */
int NoHops = 1; /* Can we bounce syslog messages through an
@@ -829,7 +837,7 @@
@@ -829,7 +837,7 @@ int main(argc, argv)
funix[i] = -1;
}
@ -53,7 +57,7 @@
switch((char)ch) {
case 'a':
if (nfunix < MAXFUNIX)
@@ -874,6 +882,10 @@
@@ -874,6 +882,10 @@ int main(argc, argv)
}
StripDomains = crunch_list(optarg);
break;
@ -64,7 +68,7 @@
case 'v':
printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
exit (0);
@@ -1771,8 +1783,19 @@
@@ -1771,8 +1783,19 @@ void fprintlog(f, from, flags, msg)
dprintf("Not sending message to remote.\n");
else {
f->f_time = now;

78
sysklogd-1.4.1-klogd24.dif
View File

@ -1,6 +1,8 @@
--- klogd.c
+++ klogd.c Tue Sep 9 14:15:47 2003
@@ -879,7 +879,7 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2001-03-11 20:40:10.000000000 +0100
+++ klogd.c 2009-11-24 18:12:53.393383000 +0100
@@ -879,7 +879,7 @@ static void LogLine(char *ptr, int len)
{
auto int sym_space;
@ -9,7 +11,7 @@
auto struct symbol sym;
auto char *symbol;
@@ -904,7 +904,7 @@
@@ -904,7 +904,7 @@ static void LogLine(char *ptr, int len)
break;
}
@ -18,8 +20,10 @@
symbol, sym.offset, sym.size );
space = sym_space + delta;
--- ksym.c
+++ ksym.c Tue Sep 9 14:15:47 2003
Index: ksym.c
===================================================================
--- ksym.c.orig 2009-11-24 18:12:52.901406000 +0100
+++ ksym.c 2009-11-24 18:12:53.397383000 +0100
@@ -122,7 +122,7 @@
/* Variables static to this module. */
struct sym_table
@ -29,7 +33,7 @@
char *name;
};
@@ -151,7 +151,7 @@
@@ -151,7 +151,7 @@ extern int debugging;
/* Function prototypes. */
static char * FindSymbolFile(void);
@ -38,7 +42,7 @@
static void FreeSymbols(void);
static int CheckVersion(char *);
static int CheckMapVersion(char *);
@@ -185,7 +185,7 @@
@@ -185,7 +185,7 @@ extern int InitKsyms(mapfile)
auto int version = 0;
@ -47,7 +51,7 @@
auto FILE *sym_file;
@@ -237,16 +237,24 @@
@@ -237,16 +237,24 @@ extern int InitKsyms(mapfile)
*/
while ( !feof(sym_file) )
{
@ -74,7 +78,7 @@
if ( AddSymbol(address, sym) == 0 )
{
@@ -521,7 +529,7 @@
@@ -521,7 +529,7 @@ static int CheckMapVersion(fname)
{
int version;
FILE *sym_file;
@ -83,7 +87,7 @@
auto char type,
sym[512];
@@ -536,16 +544,24 @@
@@ -536,16 +544,24 @@ static int CheckMapVersion(fname)
version = 0;
while ( !feof(sym_file) && (version == 0) )
{
@ -110,7 +114,7 @@
version = CheckVersion(sym);
}
@@ -583,7 +599,7 @@
@@ -583,7 +599,7 @@ static int CheckMapVersion(fname)
* Purpose: This function is responsible for adding a symbol name
* and its address to the symbol table.
*
@ -119,7 +123,7 @@
*
* Return: int
*
@@ -593,7 +609,7 @@
@@ -593,7 +609,7 @@ static int CheckMapVersion(fname)
static int AddSymbol(address, symbol)
@ -128,7 +132,7 @@
char *symbol;
@@ -639,7 +655,7 @@
@@ -639,7 +655,7 @@ static int AddSymbol(address, symbol)
char * LookupSymbol(value, sym)
@ -137,7 +141,7 @@
struct symbol *sym;
@@ -739,7 +755,7 @@
@@ -739,7 +755,7 @@ extern char * ExpandKadds(line, el)
*symbol;
char num[15];
@ -146,7 +150,7 @@
auto struct symbol sym;
@@ -821,7 +837,7 @@
@@ -821,7 +837,7 @@ extern char * ExpandKadds(line, el)
value = strtol(kp2, (char **) 0, 16);
if ( (symbol = LookupSymbol(value, &sym)) ) {
if (sym.size)
@ -155,7 +159,7 @@
else
elp += sprintf(elp, " (%s)", symbol);
}
@@ -830,7 +846,7 @@
@@ -830,7 +846,7 @@ extern char * ExpandKadds(line, el)
value = strtol(kp3, (char **) 0, 16);
if ( (symbol = LookupSymbol(value, &sym)) ) {
if (sym.size)
@ -164,7 +168,7 @@
else
elp += sprintf(elp, " (%s)", symbol);
}
@@ -841,7 +857,7 @@
@@ -841,7 +857,7 @@ extern char * ExpandKadds(line, el)
value = strtol(kp2, (char **) 0, 16);
if ( (symbol = LookupSymbol(value, &sym)) ) {
if (sym.size)
@ -173,7 +177,7 @@
else
elp += sprintf(elp, " (%s)", symbol);
}
@@ -877,17 +893,24 @@
@@ -877,17 +893,24 @@ extern char * ExpandKadds(line, el)
strcat(elp, symbol);
elp += strlen(symbol);
if ( debugging )
@ -200,8 +204,10 @@
}
strncat(elp, kp, value);
elp += value;
--- ksym_mod.c
+++ ksym_mod.c Tue Sep 9 16:51:08 2003
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
@@ -89,43 +89,101 @@
#include <errno.h>
#include <sys/fcntl.h>
@ -329,7 +335,7 @@
char *name;
};
@@ -136,9 +194,7 @@
@@ -136,9 +194,7 @@ struct Module
char *name;
struct module module;
@ -339,7 +345,7 @@
};
static int num_modules = 0;
@@ -155,8 +211,8 @@
@@ -155,8 +211,8 @@ extern int debugging;
/* Function prototypes. */
static void FreeModules(void);
@ -350,7 +356,7 @@
static int symsort(const void *, const void *);
@@ -344,7 +400,7 @@
@@ -344,7 +400,7 @@ static void FreeModules()
* Purpose: This function is responsible for adding a module to
* the list of currently loaded modules.
*
@ -359,7 +365,7 @@
*
* address:-> The address of the module.
*
@@ -355,7 +411,7 @@
@@ -355,7 +411,7 @@ static void FreeModules()
static int AddModule(address, symbol)
@ -368,7 +374,7 @@
char *symbol;
@@ -403,10 +459,14 @@
@@ -403,10 +459,14 @@ static int AddModule(address, symbol)
Syslog(LOG_WARNING, "Error opening /dev/kmem\n");
return(0);
}
@ -384,7 +390,7 @@
return(0);
}
if ( read(memfd, \
@@ -450,7 +510,7 @@
@@ -450,7 +510,7 @@ static int AddModule(address, symbol)
* Purpose: This function is responsible for adding a symbol name
* and its address to the symbol table.
*
@ -393,7 +399,7 @@
*
* mp:-> A pointer to the module which the symbol is
* to be added to.
@@ -469,7 +529,7 @@
@@ -469,7 +529,7 @@ static int AddSymbol(mp, address, symbol
struct Module *mp;
@ -402,7 +408,7 @@
char *symbol;
@@ -508,7 +568,7 @@
@@ -508,7 +568,7 @@ static int AddSymbol(mp, address, symbol
* Purpose: Find the symbol which is related to the given address from
* a kernel module.
*
@ -411,7 +417,7 @@
*
* value:-> The address to be located.
*
@@ -524,7 +584,7 @@
@@ -524,7 +584,7 @@ static int AddSymbol(mp, address, symbol
extern char * LookupModuleSymbol(value, sym)
@ -420,7 +426,7 @@
struct symbol *sym;
@@ -574,15 +634,9 @@
@@ -574,15 +634,9 @@ extern char * LookupModuleSymbol(value,
* If it is in this range we can at least return the
* name of the module.
*/
@ -437,7 +443,7 @@
{
/*
* A special case needs to be checked for. The above
@@ -601,13 +655,8 @@
@@ -601,13 +655,8 @@ extern char * LookupModuleSymbol(value,
if ( mp->num_syms > 0 )
{
last = &mp->sym_array[mp->num_syms - 1];
@ -452,7 +458,7 @@
sym->offset = value - last->value;
return(last->name);
}
@@ -617,12 +666,8 @@
@@ -617,12 +666,8 @@ extern char * LookupModuleSymbol(value,
* Return the module name and the offset of the
* faulting address in the module.
*/
@ -466,8 +472,10 @@
return(mp->name);
}
}
--- ksyms.h
+++ ksyms.h Tue Sep 9 14:15:47 2003
Index: ksyms.h
===================================================================
--- ksyms.h.orig 1997-06-13 11:35:55.000000000 +0200
+++ ksyms.h 2009-11-24 18:12:53.406377000 +0100
@@ -20,16 +20,19 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

6
sysklogd-1.4.1-ksym.patch
View File

@ -2,8 +2,10 @@
ksym_mod.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/ksym_mod.c
+++ b/ksym_mod.c
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
@@ -91,7 +91,6 @@
#include <sys/stat.h>
#include <stdarg.h>

16
sysklogd-1.4.1-ksyslogsize.diff
View File

@ -1,6 +1,8 @@
--- sysklogd-1.4.1/klogd.c 2004-07-27 13:45:33.000000000 +0200
+++ sysklogd-1.4.1/klogd.c 2004-07-27 13:53:48.985727118 +0200
@@ -299,8 +299,10 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:53.393383000 +0100
+++ klogd.c 2009-11-24 18:12:54.840288000 +0100
@@ -299,8 +299,10 @@ static int use_syscall = 0,
no_fork = 0; /* don't fork - don't run in daemon mode */
static char *symfile = (char *) 0,
@ -12,7 +14,7 @@
static FILE *output_file = (FILE *) 0;
static enum LOGSRC {none, proc, kernel} logsrc;
@@ -937,8 +939,8 @@
@@ -937,8 +939,8 @@ static void LogKernelLine(void)
* which will contain old messages. Then read the kernel log
* messages into this fresh buffer.
*/
@ -23,7 +25,7 @@
{
if ( errno == EINTR )
return;
@@ -962,8 +964,8 @@
@@ -962,8 +964,8 @@ static void LogProcLine(void)
* which will contain old messages. Then read the kernel messages
* from the message pseudo-file into this fresh buffer.
*/
@ -34,7 +36,7 @@
{
if ( errno == EINTR )
return;
@@ -976,6 +978,44 @@
@@ -976,6 +978,44 @@ static void LogProcLine(void)
return;
}
@ -79,7 +81,7 @@
int main(argc, argv)
@@ -1053,6 +1093,8 @@
@@ -1053,6 +1093,8 @@ int main(argc, argv)
console_log_level = *log_level - '0';
}

18
sysklogd-1.4.1-large.patch
View File

@ -1,6 +1,8 @@
--- Makefile
+++ Makefile Tue May 20 13:15:53 2003
@@ -29,7 +29,7 @@
Index: Makefile
===================================================================
--- Makefile.orig 2009-11-24 18:12:53.137377000 +0100
+++ Makefile 2009-11-24 18:12:53.675378000 +0100
@@ -29,7 +29,7 @@ MANDIR = /usr/man
# The following define determines whether the package adheres to the
# file system standard.
@ -9,9 +11,11 @@
# The following define establishes ownership for the man pages.
# Avery tells me that there is a difference between Debian and
--- syslogd.c
+++ syslogd.c Tue May 20 13:12:35 2003
@@ -992,6 +992,7 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:53.143385000 +0100
+++ syslogd.c 2009-11-24 18:12:53.679395000 +0100
@@ -1030,6 +1030,7 @@ int main(argc, argv)
(void) signal(SIGCHLD, reapchild);
(void) signal(SIGALRM, domark);
(void) signal(SIGUSR1, Debug ? debug_switch : SIG_IGN);
@ -19,7 +23,7 @@
(void) alarm(TIMERINTVL);
/* Create a partial message table for all file descriptors. */
@@ -1852,7 +1853,7 @@
@@ -2023,7 +2024,7 @@ void fprintlog(f, from, flags, msg)
errno = e;
logerror(f->f_un.f_fname);
}

10
sysklogd-1.4.1-no_SO_BSDCOMPAT.diff
View File

@ -1,6 +1,8 @@
--- syslogd.c 2003/09/29 08:49:24 1.1
+++ syslogd.c 2003/09/29 08:50:05
@@ -1311,6 +1311,7 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:53.926309000 +0100
+++ syslogd.c 2009-11-24 18:12:54.408310000 +0100
@@ -1305,6 +1305,7 @@ static int create_inet_socket()
close(fd);
return -1;
}
@ -8,7 +10,7 @@
/* We need to enable BSD compatibility. Otherwise an attacker
* could flood our log files by sending us tons of ICMP errors.
*/
@@ -1320,6 +1321,7 @@
@@ -1314,6 +1315,7 @@ static int create_inet_socket()
close(fd);
return -1;
}

18
sysklogd-1.4.1-nofortify.patch
View File

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

11
sysklogd-1.4.1-owl-crunch_list.diff
View File

@ -1,7 +1,8 @@
diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
--- sysklogd-1.4.1.orig/syslogd.c Sun Mar 11 19:40:10 2001
+++ sysklogd-1.4.1/syslogd.c Sun Apr 18 01:42:21 2004
@@ -1254,30 +1254,26 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:54.408310000 +0100
+++ syslogd.c 2009-11-24 18:12:54.611301000 +0100
@@ -1336,30 +1336,26 @@ char **
crunch_list(list)
char *list;
{
@ -40,7 +41,7 @@ diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
}
/*
@@ -1285,30 +1281,28 @@
@@ -1367,30 +1363,28 @@ crunch_list(list)
* characters are different from any delimiters,
* so we don't have to care about this.
*/

10
sysklogd-1.4.1-preserve_percents.patch
View File

@ -1,6 +1,8 @@
--- sysklogd-1.4.1rh/klogd.c.preserve_percents 2002-04-17 10:49:34.000000000 -0400
+++ sysklogd-1.4.1rh/klogd.c 2004-12-02 15:58:17.026614000 -0500
@@ -741,7 +741,7 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:54.840288000 +0100
+++ klogd.c 2009-11-24 18:12:55.564210000 +0100
@@ -740,7 +740,7 @@ static void LogLine(char *ptr, int len)
switch( parse_state )
{
case PARSING_TEXT:
@ -9,7 +11,7 @@
line += delta;
ptr += delta;
space -= delta;
@@ -797,30 +797,9 @@
@@ -796,30 +796,9 @@ static void LogLine(char *ptr, int len)
parse_state = PARSING_SYMSTART; /* at < */
break;
}

10
sysklogd-1.4.1-reopen.patch
View File

@ -9,9 +9,11 @@
#
# Author: mt@suse.de
#
--- syslog.c
+++ syslog.c 2003/08/26 11:34:34
@@ -102,7 +102,7 @@
Index: syslog.c
===================================================================
--- syslog.c.orig 2009-11-24 18:12:52.145473000 +0100
+++ syslog.c 2009-11-24 18:12:54.173290000 +0100
@@ -97,7 +97,7 @@ vsyslog(pri, fmt, ap)
register int cnt;
register char *p;
time_t now;
@ -20,7 +22,7 @@
char tbuf[2048], fmt_cpy[1024], *stdp = (char *) 0;
saved_errno = errno;
@@ -172,7 +172,16 @@
@@ -167,7 +167,16 @@ vsyslog(pri, fmt, ap)
}
/* output the message to the local logger */

12
sysklogd-1.4.1-showpri.patch
View File

@ -1,5 +1,7 @@
--- sysklogd.8.orig 2005-05-23 09:48:29.030220794 -0500
+++ sysklogd.8 2005-05-23 09:48:34.564338699 -0500
Index: sysklogd.8
===================================================================
--- sysklogd.8.orig 2009-11-24 18:12:52.655464000 +0100
+++ sysklogd.8 2009-11-24 18:12:55.314207000 +0100
@@ -31,6 +31,7 @@ sysklogd \- Linux system logging utiliti
]
.RB [ " \-t " ]
@ -37,8 +39,10 @@
.LP
.SH SIGNALS
.B Syslogd
--- syslogd.c 2005-05-23 09:48:29.031197346 -0500
+++ syslogd.c.orig 2005-05-23 09:48:55.354145686 -0500
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:55.083205000 +0100
+++ 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 */
#define ADDDATE 0x004 /* add a date to the message */

14
sysklogd-1.4.1-signal.dif
View File

@ -1,5 +1,7 @@
--- syslogd.c
+++ syslogd.c 2008-03-26 17:45:54.247851855 +0100
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:55.787215000 +0100
+++ syslogd.c 2009-11-24 18:12:56.480126000 +0100
@@ -770,6 +770,9 @@ extern int errno;
int main(int argc, char **argv);
char **crunch_list(char *list);
@ -158,16 +160,16 @@
+{
+ char buf[100];
+ leave++;
+
- int sig;
-
+ dprintf("syslogd: exiting on signal %d\n", sig);
+ (void) snprintf(buf, sizeof(buf), "exiting on signal %d", sig);
+ errno = 0;
+ logmsg(LOG_SYSLOG|LOG_INFO, buf, LocalHostName, ADDDATE);
+ signal(sig, SIG_IGN);
+}
- int sig;
-
+
+void dienow(void)
{
register struct filed *f;

8
sysklogd-1.4.1-sparc.patch
View File

@ -1,5 +1,7 @@
--- ksym.c
+++ ksym.c Wed May 23 18:50:36 2001
Index: ksym.c
===================================================================
--- ksym.c.orig 2000-09-12 23:53:31.000000000 +0200
+++ ksym.c 2009-11-24 18:12:52.424467000 +0100
@@ -112,6 +112,7 @@
#include <stdlib.h>
#include <malloc.h>
@ -8,7 +10,7 @@
#include "klogd.h"
#include "ksyms.h"
@@ -770,6 +771,84 @@
@@ -770,6 +771,84 @@ extern char * ExpandKadds(line, el)
if ( (num_syms == 0) ||
(kp = strstr(line, "[<")) == (char *) 0 )
{

12
sysklogd-1.4.1-sysmap-prior-to-2.5.patch
View File

@ -17,9 +17,11 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
klogd.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
--- sysklogd-1.4.1/klogd.c
+++ sysklogd-1.4.1/klogd.c 2009-08-12 14:19:17.333901686 +0200
@@ -275,6 +275,8 @@
Index: klogd.c
===================================================================
--- klogd.c.orig 2009-11-24 18:12:56.937035000 +0100
+++ klogd.c 2009-11-24 18:12:57.166028000 +0100
@@ -275,6 +275,8 @@ _syscall3(int,ksyslog,int, type, char *,
#define ksyslog klogctl
#endif
@ -28,7 +30,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
#define LOG_BUFFER_SIZE 4096
#define LOG_LINE_LENGTH 1000
@@ -999,6 +1001,23 @@
@@ -999,6 +1001,23 @@ static void SetBufSize(void)
}
}
@ -52,7 +54,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
int main(argc, argv)
@@ -1166,6 +1185,9 @@
@@ -1166,6 +1185,9 @@ int main(argc, argv)
else
openlog("kernel", 0, LOG_KERN);

28
sysklogd-1.4.1-unix_sockets.patch
View File

@ -1,6 +1,8 @@
--- syslog.conf.5
+++ syslog.conf.5 2004-09-16 13:21:07.144284248 -0700
@@ -159,6 +159,16 @@
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
@@ -159,6 +159,16 @@ command before
.BR syslogd (8)
is started.
@ -17,9 +19,11 @@
.SS Terminal and Console
If the file you specified is a tty, special tty-handling is done, same
with
--- syslogd.c
+++ syslogd.c 2004-09-16 13:21:07.150143661 -0700
@@ -638,6 +638,10 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:54.611301000 +0100
+++ syslogd.c 2009-11-24 18:12:55.083205000 +0100
@@ -633,6 +633,10 @@ struct filed {
struct sockaddr_in f_addr;
#endif
} f_forw; /* forwarding address */
@ -30,7 +34,7 @@
char f_fname[MAXFNAME];
} f_un;
char f_prevline[MAXSVLINE]; /* last message logged */
@@ -649,6 +653,8 @@
@@ -644,6 +648,8 @@ struct filed {
int f_repeatcount; /* number of "repeated" msgs */
int f_flags; /* store some additional flags */
};
@ -39,7 +43,7 @@
/*
* Intervals at which we flush out "message repeated" messages,
@@ -679,10 +685,11 @@
@@ -674,10 +680,11 @@ int repeatinterval[] = { 30, 60 }; /* #
#define F_FORW_SUSP 7 /* suspended host forwarding */
#define F_FORW_UNKN 8 /* unknown host forwarding */
#define F_PIPE 9 /* named pipe */
@ -52,7 +56,7 @@
};
struct filed *Files = (struct filed *) 0;
@@ -1949,6 +1956,32 @@
@@ -1941,6 +1948,32 @@ void fprintlog(f, from, flags, msg)
(void) fsync(f->f_file);
break;
@ -85,7 +89,7 @@
case F_USERS:
case F_WALL:
f->f_time = now;
@@ -2357,6 +2390,7 @@
@@ -2347,6 +2380,7 @@ void init()
case F_PIPE:
case F_TTY:
case F_CONSOLE:
@ -93,7 +97,7 @@
(void) close(f->f_file);
break;
}
@@ -2509,7 +2543,11 @@
@@ -2499,7 +2533,11 @@ void init()
case F_PIPE:
case F_TTY:
case F_CONSOLE:
@ -106,7 +110,7 @@
if (f->f_file == -1)
printf(" (unused)");
break;
@@ -2727,8 +2765,37 @@
@@ -2717,8 +2755,37 @@ void cfline(line, f)
switch (*p)
{
case '@':

8
sysklogd-1.4.1-utf8.patch
View File

@ -1,6 +1,8 @@
--- sysklogd-1.4.1/syslogd.c 2004-09-26 11:33:01.771437000 +0900
+++ sysklogd-1.4.1/syslogd.c 2004-09-26 11:41:27.136610056 +0900
@@ -1539,7 +1539,7 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:55.320216000 +0100
+++ syslogd.c 2009-11-24 18:12:55.787215000 +0100
@@ -1538,7 +1538,7 @@ void printline(hname, msg)
else if (c < 040) {
*q++ = '^';
*q++ = c ^ 0100;

80
sysklogd-1.4.1.dif
View File

@ -1,5 +1,7 @@
--- .pkgextract
+++ .pkgextract 2006-02-08 17:29:50.000000000 +0100
Index: .pkgextract
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ .pkgextract 2009-11-24 18:12:57.386029000 +0100
@@ -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 2009-11-24 18:12:53.916293000 +0100
+++ Makefile 2009-11-24 18:12:57.389032000 +0100
@@ -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 2009-11-24 18:12:57.166028000 +0100
+++ klogd.c 2009-11-24 18:12:57.393037000 +0100
@@ -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 2009-11-24 18:12:56.689116000 +0100
+++ pidfile.c 2009-11-24 18:12:57.397029000 +0100
@@ -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 2009-11-24 18:12:53.920294000 +0100
+++ resolve.c 2009-11-24 18:12:57.400034000 +0100
@@ -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 1970-01-01 00:00:00.000000000 +0000
+++ sample-s390.conf 2009-11-24 18:12:57.417029000 +0100
@@ -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 1970-01-01 00:00:00.000000000 +0000
+++ sample.conf 2009-11-24 18:12:57.420029000 +0100
@@ -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 2009-11-24 18:12:56.940031000 +0100
+++ syslog.c 2009-11-24 18:12:57.423029000 +0100
@@ -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 2009-11-24 18:12:56.694123000 +0100
+++ syslogd.c 2009-11-24 18:12:57.428040000 +0100
@@ -466,6 +466,7 @@ static char sccsid[] __attribute__ ((un
#include <sys/types.h>
#endif

71
sysklogd-ipv6.diff
View File

@ -1,5 +1,7 @@
--- CHANGES Sun Mar 11 20:35:51 2001
+++ CHANGES Fri Aug 2 11:28:10 2002
Index: CHANGES
===================================================================
--- CHANGES.orig 2001-03-11 20:35:51.000000000 +0100
+++ CHANGES 2009-11-24 18:12:53.132378000 +0100
@@ -1,3 +1,7 @@
+Version 1.4.1-usagi (2001/03/21)
+ - syslogd IPv6 support
@ -8,9 +10,11 @@
Version 1.4.1
. klogd will set the console log level only if `-c' is given on the
--- Makefile Fri Aug 2 12:11:24 2002
+++ Makefile Fri Aug 2 11:58:42 2002
@@ -6,7 +6,7 @@
Index: Makefile
===================================================================
--- Makefile.orig 1998-10-12 22:25:15.000000000 +0200
+++ Makefile 2009-11-24 18:12:53.137377000 +0100
@@ -3,7 +3,7 @@
CC= gcc
#CFLAGS= -g -DSYSV -Wall
#LDFLAGS= -g
@ -19,9 +23,11 @@
LDFLAGS= -s
# Look where your install program is.
--- syslogd.c Fri Aug 2 12:11:25 2002
+++ syslogd.c Fri Aug 2 12:00:16 2002
@@ -604,6 +604,7 @@
Index: syslogd.c
===================================================================
--- syslogd.c.orig 2009-11-24 18:12:52.661468000 +0100
+++ syslogd.c 2009-11-24 18:12:53.143385000 +0100
@@ -599,6 +599,7 @@ int funix[MAXFUNIX] = { -1, };
* This table contains plain text for h_errno errors used by the
* net subsystem.
*/
@ -29,7 +35,7 @@
const char *sys_h_errlist[] = {
"No problem", /* NETDB_SUCCESS */
"Authoritative answer: host not found", /* HOST_NOT_FOUND */
@@ -612,6 +613,7 @@
@@ -607,6 +608,7 @@ const char *sys_h_errlist[] = {
"Valid name, no data record of requested type", /* NO_DATA */
"no address, look for MX record" /* NO_ADDRESS */
};
@ -37,7 +43,7 @@
/*
* This structure represents the files that will have log
@@ -630,7 +632,18 @@
@@ -625,7 +627,18 @@ struct filed {
char f_uname[MAXUNAMES][UNAMESZ+1];
struct {
char f_hname[MAXHOSTNAMELEN+1];
@ -56,7 +62,7 @@
} f_forw; /* forwarding address */
char f_fname[MAXFNAME];
} f_un;
@@ -737,7 +750,11 @@
@@ -732,7 +745,11 @@ char LocalHostName[MAXHOSTNAMELEN+1]; /*
char *LocalDomain; /* our local domain name */
int InetInuse = 0; /* non-zero if INET sockets are being used */
int finet = -1; /* Internet datagram socket */
@ -68,7 +74,7 @@
int Initialized = 0; /* set when we have initialized ourselves */
int MarkInterval = 20 * 60; /* interval between marks in seconds */
int MarkSeq = 0; /* mark sequence number */
@@ -764,10 +781,10 @@
@@ -759,10 +776,10 @@ void fprintlog(register struct filed *f,
void endtty();
void wallmsg(register struct filed *f, struct iovec *iov);
void reapchild();
@ -81,7 +87,7 @@
void die(int sig);
#ifndef TESTING
void doexit(int sig);
@@ -787,6 +804,10 @@
@@ -782,6 +799,10 @@ static int create_unix_socket(const char
#endif
#ifdef SYSLOG_INET
static int create_inet_socket();
@ -92,7 +98,7 @@
#endif
int main(argc, argv)
@@ -821,7 +842,12 @@
@@ -816,7 +837,12 @@ int main(argc, argv)
#ifndef TESTING
int fd;
#ifdef SYSLOG_INET
@ -105,7 +111,7 @@
char *from;
#endif
pid_t ppid = getpid();
@@ -1142,11 +1168,21 @@
@@ -1137,11 +1163,21 @@ int main(argc, argv)
memset(line, '\0', sizeof(line));
i = recvfrom(finet, line, MAXLINE - 2, 0, \
(struct sockaddr *) &frominet, &len);
@ -128,7 +134,7 @@
/*
* Here we could check if the host is permitted
* to send us syslog messages. We just have to
@@ -1233,17 +1269,50 @@
@@ -1227,17 +1263,50 @@ static int create_unix_socket(const char
static int create_inet_socket()
{
int fd, on = 1;
@ -179,7 +185,7 @@
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
(char *) &on, sizeof(on)) < 0 ) {
logerror("setsockopt(REUSEADDR), suspending inet");
@@ -1259,13 +1328,77 @@
@@ -1253,13 +1322,77 @@ static int create_inet_socket()
close(fd);
return -1;
}
@ -257,7 +263,7 @@
#endif
char **
@@ -1687,8 +1820,12 @@
@@ -1679,8 +1812,12 @@ void fprintlog(f, from, flags, msg)
register int l;
char line[MAXLINE + 1];
time_t fwd_suspend;
@ -270,7 +276,7 @@
dprintf("Called fprintlog, ");
@@ -1742,22 +1879,27 @@
@@ -1734,22 +1871,27 @@ void fprintlog(f, from, flags, msg)
fwd_suspend);
}
break;
@ -300,7 +306,7 @@
dprintf("Retries: %d\n", f->f_prevcount);
if ( --f->f_prevcount < 0 ) {
dprintf("Giving up.\n");
@@ -1768,7 +1910,9 @@
@@ -1760,7 +1902,9 @@ void fprintlog(f, from, flags, msg)
}
else {
dprintf("%s found, resuming.\n", f->f_un.f_forw.f_hname);
@ -310,7 +316,7 @@
f->f_prevcount = 0;
f->f_type = F_FORW;
goto f_forw;
@@ -1791,27 +1935,31 @@
@@ -1783,27 +1927,31 @@ void fprintlog(f, from, flags, msg)
dprintf("Not sending message to remote.\n");
else {
f->f_time = now;
@ -350,7 +356,7 @@
e, strerror(e));
f->f_type = F_FORW_SUSP;
errno = e;
@@ -2035,28 +2183,53 @@
@@ -2025,28 +2173,53 @@ void reapchild()
/*
* Return a printable representation of a host address.
*/
@ -412,7 +418,7 @@
if (isupper(*p))
*p = tolower(*p);
@@ -2064,17 +2237,17 @@
@@ -2054,17 +2227,17 @@ const char *cvthname(f)
* Notice that the string still contains the fqdn, but your
* hostname and domain are separated by a '\0'.
*/
@ -433,7 +439,7 @@
}
count++;
}
@@ -2082,9 +2255,9 @@
@@ -2072,9 +2245,9 @@ const char *cvthname(f)
if (LocalHosts) {
count=0;
while (LocalHosts[count]) {
@ -445,7 +451,7 @@
}
count++;
}
@@ -2092,7 +2265,7 @@
@@ -2082,7 +2255,7 @@ const char *cvthname(f)
}
}
@ -454,7 +460,7 @@
}
void domark()
@@ -2142,7 +2315,7 @@
@@ -2132,7 +2305,7 @@ void debug_switch()
* Print syslogd errors some place.
*/
void logerror(type)
@ -463,7 +469,7 @@
{
char buf[100];
@@ -2236,6 +2409,7 @@
@@ -2226,6 +2399,7 @@ void init()
#else
char cline[BUFSIZ];
#endif
@ -471,7 +477,7 @@
struct servent *sp;
sp = getservbyname("syslog", "udp");
@@ -2246,6 +2420,7 @@
@@ -2236,6 +2410,7 @@ void init()
return;
}
LogPort = sp->s_port;
@ -479,7 +485,7 @@
/*
* Close all open log files and free log descriptor array.
@@ -2394,6 +2569,10 @@
@@ -2384,6 +2559,10 @@ void init()
InetInuse = 0;
}
inetm = finet;
@ -490,7 +496,7 @@
#endif
Initialized = 1;
@@ -2481,7 +2660,7 @@
@@ -2471,7 +2650,7 @@ void cfline(line, f)
int singlpri = 0;
int ignorepri = 0;
int syncfile;
@ -499,7 +505,7 @@
struct hostent *hp;
#endif
char buf[MAXLINE];
@@ -2640,6 +2819,9 @@
@@ -2630,6 +2809,9 @@ void cfline(line, f)
#ifdef SYSLOG_INET
(void) strcpy(f->f_un.f_forw.f_hname, ++p);
dprintf("forwarding host: %s\n", p); /*ASP*/
@ -509,7 +515,7 @@
if ( (hp = gethostbyname(p)) == NULL ) {
f->f_type = F_FORW_UNKN;
f->f_prevcount = INET_RETRY_MAX;
@@ -2654,6 +2836,7 @@
@@ -2644,6 +2826,7 @@ void cfline(line, f)
f->f_un.f_forw.f_addr.sin_port = LogPort;
if ( f->f_type == F_FORW )
memcpy((char *) &f->f_un.f_forw.f_addr.sin_addr, hp->h_addr, hp->h_length);
@ -517,4 +523,3 @@
/*
* Otherwise the host might be unknown due to an
* inaccessible nameserver (perhaps on the same

15
syslogd.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sun Dec 20 17:25:22 CET 2009 - jengelh@medozas.de
- enable parallel build
-------------------------------------------------------------------
Tue Nov 24 17:16:07 UTC 2009 - crrodriguez@opensuse.org
- refresh patches again
-------------------------------------------------------------------
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

24
syslogd.spec
View File

@ -21,13 +21,13 @@
Name: syslogd
%define omc_prefix /usr/share/omc
%define omc_svcdir %{omc_prefix}/svcinfo.d
License: GPL v2 or later
License: GPLv2+
Group: System/Daemons
PreReq: coreutils %fillup_prereq klogd sed
Provides: syslog
AutoReqProv: on
Version: 1.4.1
Release: 710
Release: 711
Summary: The Syslog daemon
Source: sysklogd-1.4.1.tar.bz2
Source1: logrotate.syslog
@ -78,7 +78,7 @@ Authors:
Shane Alderton <shane@scs.apana.org.au>
%package -n klogd
License: GPL v2 or later
License: GPLv2+
PreReq: %insserv_prereq %fillup_prereq
Provides: sysklogd
Provides: syslogd:/sbin/klogd
@ -111,21 +111,21 @@ Authors:
%patch5 -p0 -b .ipv6
%patch6 -p0 -b .klogd24
%patch7 -p0 -b .large
%patch8 -p1 -b .dns
%patch8 -p0 -b .dns
%patch9 -p0 -b .reopen
%patch10 -p0 -b .sobsd
%patch11 -p1 -b .owlcr
%patch12 -p1 -b .klsize
%patch11 -p0 -b .owlcr
%patch12 -p0 -b .klsize
%patch13 -p0 -b .usock
%patch14 -p0 -b .shprio
%patch15 -p1 -b .presperc
%patch16 -p1 -b .utf8
%patch17 -p1 -b .ksym
%patch18 -p1 -b .sleep
%patch15 -p0 -b .presperc
%patch16 -p0 -b .utf8
%patch17 -p0 -b .ksym
%patch18 -p0 -b .sleep
%patch19 -p0 -b .signal
%patch20 -p0 -b .clear
%patch21 -p0 -b .nofortify
%patch22 -p1 -b .sysmap
%patch22 -p0 -b .sysmap
%patch0 -p0
%build
@ -133,7 +133,7 @@ Authors:
mv sample-s390.conf sample.conf
%endif
# honor the increased LOG_BUF_LEN in kernel/printk.c
make LOG_BUFFER_SIZE=-DLOG_BUFFER_SIZE=131072
make %{?_smp_mflags} LOG_BUFFER_SIZE=-DLOG_BUFFER_SIZE=131072
%install
mkdir -p $RPM_BUILD_ROOT/{sbin,etc}