diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | debian/Makefile | 1 | ||||
| -rwxr-xr-x | debian/rsyslogd | 3 | ||||
| -rw-r--r-- | linux/Makefile | 87 |
4 files changed, 9 insertions, 85 deletions
@@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 0.9.6 (RGer), around 2005-08-01 +Version 0.9.6 (RGer), 2005-08-09 - greatly enhanced documentation. Now available in html format in the "doc" folder - improved MySQL error messages a little - they now show up as log @@ -9,6 +9,7 @@ Version 0.9.6 (RGer), around 2005-08-01 syslog was enabled by the -r command line option. Now, it is "-r [port]", which is consistent with the tcp listener. However, just -r will now return an error message. +- added startup script for Debian --------------------------------------------------------------------------- Version 0.9.5 (RGer), 2005-08-01 - the "semicolon bug" was actually not (fully) solved in 0.9.4. One diff --git a/debian/Makefile b/debian/Makefile new file mode 100644 index 00000000..7ee2460a --- /dev/null +++ b/debian/Makefile @@ -0,0 +1 @@ +include ../linux/Makefile diff --git a/debian/rsyslogd b/debian/rsyslogd index 3218c500..e25f877d 100755 --- a/debian/rsyslogd +++ b/debian/rsyslogd @@ -10,10 +10,9 @@ test -x $binpath || exit 0 # Options for start/restart the daemons # For remote UDP logging use SYSLOGD="-r 0" -# "-t 1470" is a TCP listener on port 1470 (PIX) # For relaying add "-h" to SYSLOGD # -SYSLOGD="-r 0 -h -t 1470" +SYSLOGD="-r 0 -h" create_xconsole() { diff --git a/linux/Makefile b/linux/Makefile index 4b02e131..3a94267c 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,5 +1,8 @@ # Makefile for rsyslog # Copyright (C) 2004, 2005 Rainer Gerhards and Adiscon GmbH +# This is the distro-specifc part of the Makefile. +# This makefile here should be suitable for all flavours +# of linux. # For details, see http://www.rsyslog.com/doc ############################################################# @@ -34,7 +37,6 @@ INSTALL = install BINDIR = /usr/sbin MANDIR = /usr/share/man - # now comes the evaluation of the FEATURE_* settings ifeq ($(strip $(FEATURE_LARGEFILE)), 0) NOLARGEFILE = -DNOLARGEFILE @@ -44,89 +46,10 @@ ifeq ($(strip $(FEATURE_DB)), 1) WITHDB=-DWITHDB endif -CC= gcc -#CFLAGS= -g -DSYSV -Wall -# Add the -DMTRACE macro if you would like to use mtrace() -# to hunt for memory leaks -# next 2 lines are debug settings -#LDFLAGS= -g -Wall -fno-omit-frame-pointer -#CFLAGS= -DSYSV -g -Wall -fno-omit-frame-pointer - -CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -I/usr/local/include $(NOLARGEFILE) $(WITHDB) -LDFLAGS= -s - # Include MySQL client lib if DB is selected ifdef WITHDB LIBS = -lmysqlclient -L/usr/local/lib/mysql endif -# There is one report that under an all ELF system there may be a need to -# explicilty link with libresolv.a. If linking syslogd fails you may wish -# to try uncommenting the following define. -# LIBS = /usr/lib/libresolv.a - -# The following define determines whether the package adheres to the -# file system standard. -FSSTND = -DFSSTND - -# The following define establishes the name of the pid file for the -# rsyslogd daemon. The library include file (paths.h) defines the -# name for the rsyslogd pid to be rsyslog.pid. -SYSLOGD_PIDNAME = -DSYSLOGD_PIDNAME=\"rsyslogd.pid\" - -SYSLOGD_FLAGS= -DSYSLOG_INET -DSYSLOG_UNIXAF ${FSSTND} \ - ${SYSLOGD_PIDNAME} -SYSLOG_FLAGS= -DALLOW_KERNEL_LOGGING -DEB = - -.c.o: - ${CC} ${CFLAGS} -c $*.c - -all: syslogd - -test: syslog_tst tsyslogd - -install: install_man install_exec - -syslogd: syslogd.o pidfile.o template.o stringbuf.o srUtils.o outchannel.o - ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o template.o outchannel.o stringbuf.o srUtils.o ${LIBS} - -syslog_tst: syslog_tst.o - ${CC} ${LDFLAGS} -o syslog_tst syslog_tst.o - -tsyslogd: syslogd.c syslogd.h version.h template.o outchannel.o stringbuf.o srUtils.o - $(CC) $(CFLAGS) -g -DTESTING $(SYSLOGD_FLAGS) -o tsyslogd syslogd.c pidfile.o template.o outchannel.o stringbuf.o srUtils.o $(LIBS) - -srUtils.o: srUtils.c srUtils.h liblogging-stub.h - ${CC} ${CFLAGS} ${SYSLOGD_FLAGS} $(DEB) -c srUtils.c - -stringbuf.o: stringbuf.c stringbuf.h liblogging-stub.h - ${CC} ${CFLAGS} ${SYSLOGD_FLAGS} $(DEB) -c stringbuf.c - -template.o: template.c template.h stringbuf.h liblogging-stub.h - ${CC} ${CFLAGS} ${SYSLOGD_FLAGS} $(DEB) -c template.c - -outchannel.o: outchannel.c outchannel.h stringbuf.h liblogging-stub.h syslogd.h - ${CC} ${CFLAGS} ${SYSLOGD_FLAGS} $(DEB) -c outchannel.c - -syslogd.o: syslogd.c version.h template.h outchannel.h syslogd.h - ${CC} ${CFLAGS} ${SYSLOGD_FLAGS} $(DEB) -c syslogd.c - -syslog.o: syslog.c - ${CC} ${CFLAGS} ${SYSLOG_FLAGS} -c syslog.c - -syslog_tst.o: syslog_tst.c - ${CC} ${CFLAGS} -c syslog_tst.c - -clean: - rm -f *.o *.log *~ *.orig syslogd - -clobber: clean - rm -f syslogd ksym syslog_tst oops_test TAGS tsyslogd tklogd - -install_exec: syslogd - ${INSTALL} -b -s syslogd ${DESTDIR}${BINDIR}/rsyslogd - -install_man: - ${INSTALL} rsyslogd.8 ${DESTDIR}${MANDIR}/man8/rsyslogd.8 - ${INSTALL} rsyslog.conf.5 ${DESTDIR}${MANDIR}/man5/rsyslog.conf.5 +VPATH = .. +include ../Makefile |