diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rwxr-xr-x | debian/rules | 8 | ||||
| -rw-r--r-- | doc/install.html | 12 | ||||
| -rw-r--r-- | doc/replaceinit.html | 4 | ||||
| -rw-r--r-- | doc/runsv.8.html | 4 | ||||
| -rw-r--r-- | doc/svlogd.8.html | 58 | ||||
| -rw-r--r-- | doc/upgrade.html | 7 | ||||
| -rw-r--r-- | man/svlogd.8 | 9 | ||||
| -rw-r--r-- | package/CHANGES | 10 | ||||
| -rw-r--r-- | package/README | 2 | ||||
| -rwxr-xr-x | package/compile | 6 | ||||
| -rwxr-xr-x | package/install-man | 4 | ||||
| -rwxr-xr-x | package/upgrade | 8 | ||||
| -rw-r--r-- | package/versions | 1 |
17 files changed, 99 insertions, 49 deletions
diff --git a/Makefile b/Makefile index e5d0de1..74922a5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DESTDIR= -PACKAGE=runit-0.12.1 +PACKAGE=runit-0.13.0 DIRS=doc man etc package src MANPAGES=runit.8 runit-init.8 runsvdir.8 runsv.8 svwaitdown.8 svwaitup.8 \ utmpset.8 runsvchdir.8 runsvstat.8 runsvctrl.8 svlogd.8 chpst.8 diff --git a/debian/changelog b/debian/changelog index bfcd5a4..7b2ca19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +runit (0.13.1-1) unstable; urgency=low + + * new upstream version: svlogd.8 documents -tt option (closes: #213011); + fixes typos in runsv.8 (closes: #223076). + * debian/control: Build-Depends: dietlibc, now also on s390. + * debian/rules: use dietlibc on s390. + + -- Gerrit Pape <pape@smarden.org> Mon, 12 Jan 2004 16:07:06 +0100 + runit (0.12.1-2) unstable; urgency=low * debian/control: no longer Build-Depends: debhelper; Standards-Version: diff --git a/debian/control b/debian/control index c7fb4fc..a8ba058 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: runit Section: admin Priority: optional Maintainer: Gerrit Pape <pape@smarden.org> -Build-Depends: dietlibc-dev (>> 0.24-0) [alpha arm hppa i386 ia64 mips mipsel powerpc sparc] +Build-Depends: dietlibc-dev (>> 0.24-0) [alpha arm hppa i386 ia64 mips mipsel powerpc s390 sparc] Standards-Version: 3.6.1.0 Package: runit diff --git a/debian/copyright b/debian/copyright index f2bfa62..a4dc5f7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream Author: Gerrit Pape <pape@smarden.org> Copyright: -Copyright (c) 2001-2003, Gerrit Pape +Copyright (c) 2001-2004, Gerrit Pape All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/debian/rules b/debian/rules index d6f4825..3b3c02c 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,7 @@ ifneq ($(DEB_HOST_ARCH),ia64) ifneq ($(DEB_HOST_ARCH),mips) ifneq ($(DEB_HOST_ARCH),mipsel) ifneq ($(DEB_HOST_ARCH),powerpc) +ifneq ($(DEB_HOST_ARCH),s390) ifneq ($(DEB_HOST_ARCH),sparc) CC =gcc endif @@ -26,6 +27,7 @@ endif endif endif endif +endif ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS +=-g @@ -38,11 +40,11 @@ DIR =`pwd`/debian/runit build: deb-checkdir build-stamp build-stamp: - tar xfzp runit-0.12.1.tar.gz + tar xfzp runit-0.13.0.tar.gz -gcc -v ( \ - cd admin/runit-0.12.1/src && \ - ln -s runit-0.12.1 runit && mv runit ../.. && \ + cd admin/runit-0.13.0/src && \ + ln -s runit-0.13.0 runit && mv runit ../.. && \ echo "$(CC) $(CFLAGS)" >conf-cc && \ echo "$(CC) $(LDFLAGS)" >conf-ld && \ $(MAKE); \ diff --git a/doc/install.html b/doc/install.html index 3598615..83063cf 100644 --- a/doc/install.html +++ b/doc/install.html @@ -17,14 +17,14 @@ If you don't have a <tt>/package</tt> directory, create it now: # chmod 1755 /package </pre> Download -<a href="runit-0.12.1.tar.gz">runit-0.12.1.tar.gz</a> into <tt>/package</tt> +<a href="runit-0.13.0.tar.gz">runit-0.13.0.tar.gz</a> into <tt>/package</tt> and unpack the archive <pre> # cd /package - # gunzip runit-0.12.1.tar - # tar -xpf runit-0.12.1.tar - # rm runit-0.12.1.tar - # cd admin/runit-0.12.1 + # gunzip runit-0.13.0.tar + # tar -xpf runit-0.13.0.tar + # rm runit-0.13.0.tar + # cd admin/runit-0.13.0 </pre> On MacOSX, do <pre> @@ -43,7 +43,7 @@ hierarchy, do: </pre> To report success: <pre> - # mail pape-runit-0.12.1@smarden.org <compile/sysdeps + # mail pape-runit-0.13.0@smarden.org <compile/sysdeps </pre> Refer to <a href="replaceinit.html">replacing init</a> for replacing <i>init</i> with <i>runit</i>, or to diff --git a/doc/replaceinit.html b/doc/replaceinit.html index 3d3c3ce..70114ad 100644 --- a/doc/replaceinit.html +++ b/doc/replaceinit.html @@ -114,7 +114,7 @@ default Unix process no 1 <i>runit</i>. </pre> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.12.1@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.13.0@smarden.org </pre> <hr> @@ -200,7 +200,7 @@ Use <b>init 6</b> to reboot and <b>init 0</b> to halt a system that runs <p> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.12.1@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.13.0@smarden.org </pre> <h3>Step 5: Service migration</h3> The goal is to migrate all services from <i>/etc/rc.*</i> scheme to the diff --git a/doc/runsv.8.html b/doc/runsv.8.html index 046f49b..f7960ce 100644 --- a/doc/runsv.8.html +++ b/doc/runsv.8.html @@ -16,7 +16,7 @@ service <h2><a name='sect2'>Description</a></h2> <i>service</i> must be a directory. <p> <b>runsv</b> -switches to the directory <i>service</i> and starts ./run. if ./run exits and ./finish +switches to the directory <i>service</i> and starts ./run. If ./run exits and ./finish exists, <b>runsv</b> starts ./finish. If ./finish doesn’t exist or ./finish exits, <b>runsv</b> restarts ./run. <p> If ./run or ./finish exit immediately, <b>runsv</b> waits a @@ -28,7 +28,7 @@ below) can be used to start the service and to give other commands to <b>runsv</ If the directory <i>service</i>/log exists, <b>runsv</b> creates a pipe, redirects <i>service</i>/run’s and <i>service</i>/finish’s standard output to the pipe, switches to the directory <i>service</i>/log and starts ./run (and ./finish) exactly as described above for -the <i>service</i> directory. The standard input of the log service a redirected +the <i>service</i> directory. The standard input of the log service is redirected to read from the pipe. <p> <b>runsv</b> maintains status information in a binary format compatible to <i><b>supervise</b>(8)</i> in <i>service</i>/supervise/status and <i>service</i>/log/supervise/status, diff --git a/doc/svlogd.8.html b/doc/svlogd.8.html index 6dd2df5..0b5d2cd 100644 --- a/doc/svlogd.8.html +++ b/doc/svlogd.8.html @@ -11,7 +11,7 @@ <h2><a name='sect0'>Name</a></h2> svlogd - runit’s service logging daemon <h2><a name='sect1'>Synopsis</a></h2> -<b>svlogd</b> [-tv] [-r <i>c]</i> [-R +<b>svlogd</b> [-ttv] [-r <i>c]</i> [-R <i>xyz]</i> [-l <i>n]</i> [-b <i>n]</i> <i>logs</i> <h2><a name='sect2'>Description</a></h2> <i>logs</i> consists of one or more arguments, @@ -87,10 +87,25 @@ in <i>log</i> after log file rotation, it deletes the oldest one. Default is 10. <dd>tells <b>svlogd</b> to feed each recent log file through <i>processor</i> (see above) on log file rotation. By default log files are not processed. </dd> + +<dt>u<i>a.b.c.d[:port]</i> </dt> +<dd>tells <b>svlogd</b> to transmit the first <i>len</i> characters of selected +log messages to the IP address <i>a.b.c.d</i>, port number <i>port</i>. If <i>port</i> isn’t set, +the default port for syslog is used (514). <i>len</i> can be set through the -l +option, see below. If <b>svlogd</b> has trouble sending udp packets, it writes +error messages to the log directory. Attention: logging through udp is unreliable, +and should be used in private networks only. </dd> + +<dt>U<i>a.b.c.d[:port]</i> </dt> +<dd>is the same as +the <i>u</i> line above, but the log messages are no longer written to the log +directory, but transmitted through udp only. Error messages from <b>svlogd</b> +concerning sending udp packages still go to the log directory. </dd> </dl> <p> -If a line starts with a <i>-</i>, <i>+</i>, <i>e</i>, or <i>E</i>, <b>svlogd</b> matches the first <i>len</i> characters -of each log message against <i>pattern</i> and acts accordingly: +If a line +starts with a <i>-</i>, <i>+</i>, <i>e</i>, or <i>E</i>, <b>svlogd</b> matches the first <i>len</i> characters of +each log message against <i>pattern</i> and acts accordingly: <dl> <dt>-<i>pattern</i> </dt> @@ -130,33 +145,38 @@ matches any string. precise timestamp (see <i><b>tai64n</b>(8)</i>) when writing to <i>log</i> or to standard error. </dd> +<dt><b>-tt</b> </dt> +<dd>timestamp. Prefix each selected line with a human readable, sortable +timestamp of the form YYYY-MM-DD_HH:MM:SS.xxxxx when writing to <i>log</i> or to +standard error. </dd> + <dt><b>-r <i>c</b> </i></dt> -<dd>replace. <i>c</i> must be a single character. Replace non-printable characters -in log messages with <i>c</i>. Characters are replaced before pattern matching -is applied. </dd> +<dd>replace. <i>c</i> must be a single character. Replace non-printable +characters in log messages with <i>c</i>. Characters are replaced before pattern +matching is applied. </dd> <dt><b>-R <i>xyz</b> </i></dt> -<dd>replace charset. Additionally to non-printable characters, -replace all characters found in <i>xyz</i> with <i>c</i> (default ‘‘_’’). </dd> +<dd>replace charset. Additionally to non-printable +characters, replace all characters found in <i>xyz</i> with <i>c</i> (default ‘‘_’’). </dd> -<dt><b>-l <i>len</b> </i></dt> -<dd>line length. -Pattern matching applies to the first <i>len</i> characters of a log message only. -Default is 1000. </dd> +<dt><b>-l <i>len</b> +</i></dt> +<dd>line length. Pattern matching applies to the first <i>len</i> characters of a log +message only. Default is 1000. </dd> <dt><b>-b <i>buflen</b> </i></dt> -<dd>buffer size. Set the size of the buffer <b>svlogd</b> -uses when reading from standard input and writing to <i>logs</i> to <i>buflen</i>. Default -is 1024. <i>buflen</i> must be greater than <i>len</i>. </dd> +<dd>buffer size. Set the size of the buffer +<b>svlogd</b> uses when reading from standard input and writing to <i>logs</i> to <i>buflen</i>. +Default is 1024. <i>buflen</i> must be greater than <i>len</i>. </dd> <dt><b>-v</b> </dt> -<dd>verbose. Print verbose messages -to standard error. </dd> +<dd>verbose. Print verbose +messages to standard error. </dd> </dl> <h2><a name='sect9'>Signals</a></h2> -If <b>svlogd</b> is sent a HUP signal, it closes and -reopens all <i>logs</i>, and updates their configuration according to <i>log/config</i>. +If <b>svlogd</b> is sent a HUP signal, it closes +and reopens all <i>logs</i>, and updates their configuration according to <i>log/config</i>. If <b>svlogd</b> has trouble opening a log directory, it prints a warning, and discards this log directory. If <b>svlogd</b> is unable to open all log directories given at the command line, it exits with an error. <p> diff --git a/doc/upgrade.html b/doc/upgrade.html index 6f9e175..1d7270f 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -10,6 +10,13 @@ <h1>runit - upgrading from previous versions</h1> <hr> +<h3>0.12.0 or 0.12.1 to 0.13.0</h3> +runit's service logging daemon <a href="svlogd.8.html">svlogd</a> now can +be configured to transmit selected log messages through UDP. +For reliable network logging through TCP with support for authenticaten, +authorization, and encryption, and also on how to use the new feature to +configure syslog compatible remote UDP system logging, see the +<a href="http://smarden.org/socklog/">socklog</a> package. <h3>0.11.x to 0.12.0 or 0.12.1</h3> With this version runit supports running under sysvinit on the Solaris platform. diff --git a/man/svlogd.8 b/man/svlogd.8 index b170fe5..a3e9e54 100644 --- a/man/svlogd.8 +++ b/man/svlogd.8 @@ -3,7 +3,7 @@ svlogd \- runit's service logging daemon .SH SYNOPSIS .B svlogd -[\-tv] [\-r +[\-ttv] [\-r .I c\fR] [\-R .I xyz\fR] [\-l .I n\fR] [\-b @@ -292,6 +292,13 @@ when writing to .I log or to standard error. .TP +.B \-tt +timestamp. +Prefix each selected line with a human readable, sortable timestamp of the +form YYYY-MM-DD_HH:MM:SS.xxxxx when writing to +.I log +or to standard error. +.TP .B \-r \fIc replace. .I c diff --git a/package/CHANGES b/package/CHANGES index c0ee395..26dd7be 100644 --- a/package/CHANGES +++ b/package/CHANGES @@ -1,9 +1,13 @@ runit 0.13.0 - * doc/runscripts.html: use html named entities (thx Taj Khattra); add more - contributed run scripts (thx Thomas Schwinge). +Mon, 12 Jan 2004 14:39:38 +0000 + * doc/runscripts.html: use html named entities (thx Taj Khattra); add + more contributed run scripts (thx Marek Bartnikowski, Thomas Schwinge). * svlogd.c: support sending log entries to remote host through udp, configurable through u and U lines in log dir config file; minor. - * man/svlogd.8: adapt. + * man/svlogd.8: adapt; document -tt option. + * package/compile, package/install-man, package/upgrade: exit 1 on + sub-shell failures. + * man/runsv.8: fix typos (thx Christian Hammers). runit 0.12.1 Tue, 18 Nov 2003 15:42:44 +0000 diff --git a/package/README b/package/README index 5f5180f..21820a4 100644 --- a/package/README +++ b/package/README @@ -1,3 +1,3 @@ -Copyright 2001-2003 +Copyright 2001-2004 G. Pape http://smarden.org/runit/ diff --git a/package/compile b/package/compile index 2169ab9..89dc466 100755 --- a/package/compile +++ b/package/compile @@ -1,8 +1,8 @@ #!/bin/sh -e umask 022 -test -d package || ( echo 'Wrong working directory.'; exit 1 ) -test -d src || ( echo 'Wrong working directory.'; exit 1 ) +test -d package || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 +test -d src || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 here=`env - PATH=$PATH pwd` @@ -17,7 +17,7 @@ do done echo 'Compiling everything in ./compile...' -( cd compile; exec make ) +( cd compile; exec make ) || exit 1 echo 'Copying commands into ./command...' for i in `cat package/commands` diff --git a/package/install-man b/package/install-man index 2e4f630..f5294b8 100755 --- a/package/install-man +++ b/package/install-man @@ -1,8 +1,8 @@ #!/bin/sh -e umask 022 -test -d package || ( echo 'Wrong working directory.'; exit 1 ) -test -d man || ( echo 'Wrong working directory.'; exit 1 ) +test -d package || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 +test -d man || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 here=`env - PATH=$PATH pwd` parent=`dirname $here` diff --git a/package/upgrade b/package/upgrade index ff35a7e..2893918 100755 --- a/package/upgrade +++ b/package/upgrade @@ -1,15 +1,15 @@ #!/bin/sh -e umask 022 -test -d package || ( echo 'Wrong working directory.'; exit 1 ) -test -d src || ( echo 'Wrong working directory.'; exit 1 ) +test -d package || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 +test -d src || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 here=`env - PATH=$PATH pwd` parent=`dirname $here` -echo 'Creating symlink runit -> runit-0.12.1...' +echo 'Creating symlink runit -> runit-0.13.0...' rm -f runit -ln -s runit-0.12.1 runit +ln -s runit-0.13.0 runit mv -f runit .. echo 'Making command links in /command...' diff --git a/package/versions b/package/versions index 54aff4b..91346a8 100644 --- a/package/versions +++ b/package/versions @@ -21,3 +21,4 @@ 0.11.2 0.12.0 0.12.1 +0.13.0 |