Merge branch 'beta'

Conflicts:

	ChangeLog
	configure.ac
	rsyslog.conf
	runtime/queue.c

6 files changed, 135 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index 2551b5a7..5757273f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,6 +134,9 @@ Version 3.19.0 (rgerhards), 2008-05-06
 - a lot of cleanup in regard to modularization
 - -c option no longer must be the first option - thanks to varmjofekoj
   for the patch
+Version 3.18.0 (rgerhards), 2008-07-??
+- bugfix in RainerScript: syntax error was not always detected
+---------------------------------------------------------------------------
 Version 3.17.5 (rgerhards), 2008-06-27
 - added doc: howto set up a reliable connection to remote server via
   queued mode (and plain tcp protocol)
@@ -205,6 +208,10 @@ Version 3.17.0 (rgerhards), 2008-04-08
 Plus a number of bugfixes that were applied to v3-stable and beta
 branches (not mentioned here in detail).
 ---------------------------------------------------------------------------
+Version 3.16.3 (rgerhards), 2008-07-11
+- updated information on rsyslog packages
+- bugfix: memory leak in disk-based queue modes
+---------------------------------------------------------------------------
 Version 3.16.2 (rgerhards), 2008-06-25
 - fixed potential segfault due to invalid call to cfsysline
   thanks to varmojfekoj for the patch
@@ -692,6 +699,37 @@ Version 2.0.4 STABLE (rgerhards), 2008-03-27
 - bugfix: internally generated messages had "FROMHOST" property not set
 - bugfix: continue parsing if tag is oversize (discard oversize part) - thanks
   to mclaughlin77@gmail.com for the patch
+- added $HHOUR and $QHOUR system properties - can be used for half- and
+  quarter-hour logfile rotation
+---------------------------------------------------------------------------
+Version 2.0.3 STABLE (rgerhards), 2008-03-12
+- bugfix: setting for $EscapeCopntrolCharactersOnReceive was not 
+  properly initialized
+- bugfix: resolved potential segfault condition on HUP (extremely
+  unlikely to happen in practice), for details see tracker:
+  http://bugzilla.adiscon.com/show_bug.cgi?id=38
+- improved the man pages a bit - thanks to Michael Biebl for the patch
+- bugfix: not properly initialized data could cause several segfaults if
+  there were errors in the config file - thanks to varmojfekoj for the patch
+---------------------------------------------------------------------------
+Version 2.0.2 STABLE (rgerhards), 2008-02-12
+- fixed a bug that could cause invalid string handling via strerror_r
+  varmojfekoj provided the patch - many thanks!
+- added x-info field to rsyslogd startup/shutdown message. Hopefully
+  points users to right location for further info (many don't even know
+  they run rsyslog ;))
+- bugfix: suspended actions were not always properly resumed
+  varmojfekoj provided the patch - many thanks!
+- bugfix: errno could be changed during mark processing, leading to
+  invalid error messages when processing inputs. Thank to varmojfekoj for
+  pointing out this problem.
+- bugfix: trailing ":" of tag was lost while parsing legacy syslog messages
+  without timestamp - thanks to Anders Blomdell for providing a patch!
+- bugfix (doc): misspelled config directive, invalid signal info
+- applied some doc fixes from Michel Biebl and cleaned up some no longer
+  needed files suggested by him
+- cleaned up stringbuf.c to fix an annoyance reported by Anders Blomdell
+- fixed bug that caused invalid treatment of tabs (HT) in rsyslog.conf
 ---------------------------------------------------------------------------
 Version 2.0.1 STABLE (rgerhards), 2008-01-24
 - fixed a bug in integer conversion - but this function was never called,
diff --git a/doc/manual.html b/doc/manual.html
index 644ac77c..c15eead5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -31,8 +31,8 @@ if you do not read the doc, but doing so will definitely improve your experience
 <p><span style="font-weight: bold;"></span><b>Follow
 the links below for the</b><br></p><ul>
 
-<li><a href="rsyslog_conf.html">configuration file
-syntax (rsyslog.conf)</a></li>
+<li><a href="troubleshoot.html">troubleshooting rsyslog problems</a></li>
+<li><a href="rsyslog_conf.html">configuration file syntax (rsyslog.conf)</a></li>
 <li> <a href="property_replacer.html">property
 replacer, an important core component</a></li>
 <li>a commented <a href="sample.conf.html">sample
diff --git a/doc/rscript_abnf.html b/doc/rscript_abnf.html
index 97de7284..278fb59c 100644
--- a/doc/rscript_abnf.html
+++ b/doc/rscript_abnf.html
@@ -34,8 +34,8 @@ table... values('&amp;$facility&amp;','&amp;$severity&amp;...?]<br>&nbsp; &nbsp;
 <p><font size="2">This documentation is part of the
 <a href="http://www.rsyslog.com/">rsyslog</a>
 project.<br>
-Copyright © 2008 by <a href="http://www.gerhards.net/rainer">Rainer
+Copyright &copy; 2008 by <a href="http://www.gerhards.net/rainer">Rainer
 Gerhards</a> and
 <a href="http://www.adiscon.com/">Adiscon</a>.
 Released under the GNU GPL version 3 or higher.</font></p>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/doc/rsyslog_packages.html b/doc/rsyslog_packages.html
index 38c43c93..80ba96c5 100644
--- a/doc/rsyslog_packages.html
+++ b/doc/rsyslog_packages.html
@@ -5,43 +5,72 @@
 <body>
 <h1>rsyslog packages</h1>
 <p><b>Thanks to some volunteers, rsyslog is also available in package form on 
-some distributions.</b> All available packages are listed below. If you would 
+some distributions.</b> All currently known packages are listed below. If I have forgotten
+one or if you would 
 like to maintain a package for a new distribution, please mail me at
 <a href="mailto:rgerhards@adiscon.com">rgerhards@adiscon.com</a>. Any help is *deeply* 
 appreciated. While I create the core daemon, the package maintainers are really 
 filling it with life, making it available to the average user. I am very 
 grateful for that!</p>
-<p>This list has last been updated on 2007-07-06 by
+<p>This list has last been updated on 2008-07-11 by
 <a href="http://www.adiscon.com/en/people/rainer-gerhards.php">Rainer Gerhards</a>. 
 New packages may appear at any time, so be sure to check this page whenever you 
 need a new one.</p>
-<p>Red Hat has recently begun to build RPMs for rsyslog. The URL changes, but a 
-good place to look for them is at
-<a href="http://freshmeat.net/projects/rsyslog/">freshmeat's rsyslog info page</a>. 
-Please note that the Red Hat RPMs do currently <b>not</b> include MySQL 
-functionality. If you need that, you need to compile from the source tarball 
-(which honestly is quite easy).</p>
-<h2>BSD</h2>
-<p>Give <a href="http://www.freshports.org/sysutils/rsyslog/">
-http://www.freshports.org/sysutils/rsyslog/</a> a try.</p>
-
-<h2>CentOS 4.3</h2>
-<a href="http://www.se-community.com/~james/rsyslog/">
-http://www.se-community.com/~james/rsyslog/</a></p>
-<p>Maintained by<b> James Bergamin.</b></p>
-
-<h2>openSUSE</h2>
-<a href="http://download.opensuse.org/repositories/home:/darix/">
-http://download.opensuse.org/repositories/home:/darix/</a></p>
-<p>Maintained by<b> darix</b></p>
-
-<h2>Almost any Linux</h2>
-<p><b>Bennet Todd</b> maintains packages that should work on almost any Linux. 
+<ul>
+<li><b>BSD</b> (maintained by infofarmer)
+	<ul>
+	<li><a href="http://www.freshports.org/sysutils/rsyslog/"> http://www.freshports.org/sysutils/rsyslog/</a>
+	</ul>
+
+<li><b>CentOS 4.3</b> (maintained by James Bergamin)
+	<ul>
+	<li><a href="http://www.se-community.com/~james/rsyslog/">
+http://www.se-community.com/~james/rsyslog/</a>
+	</ul>
+
+<li><b>Debian</b> (maintained by Michael Biebl)
+	<ul>
+	<li><a href="http://packages.debian.org/sid/rsyslog">http://packages.debian.org/sid/rsyslog</a>
+	</ul>
+
+<li><b>Fedora</b>
+	<ul>
+	<li>Starting with Fedora 8, rsyslog is available as part of the core distribution.
+	</ul>
+
+<li><b>openSUSE</b> (maintained by darix)
+	<ul>
+	<li><a href="http://download.opensuse.org/repositories/home:/darix/">http://download.opensuse.org/repositories/home:/darix/</a>
+	</ul>
+
+<li><b>Red Hat Enterprise Linux</b>
+	<ul>
+	<li>Starting with RHEL 5.2, rsyslog is available as part of the core distribution.
+	</ul>
+
+<li><b>Ubuntu</b>
+	<ul>
+	<li>Starting with hardy, rsyslog is available from the universe repository.
+	</ul>
+
+<li>Almost any Linux</h2>
+	<ul>
+	<li>Bennet Todd maintains packages that should work on almost any Linux. 
 He keeps a current i386 tree. There is also a PPC tree, but that one is not paid 
-much attention for (anyhow, it is known to typically work well, too).</p>
-<p>Please visit <a href="http://bent.latency.net/bent/">
+much attention for (anyhow, it is known to typically work well, too).
+Please visit <a href="http://bent.latency.net/bent/">
 http://bent.latency.net/bent/</a>, select the relevant tree and then do a search 
-for rsyslog.</p>
+for rsyslog.
+Please note, however, that as of this writing the versions in this repository
+have been aged a bit. So it may be worth trying to find some other places first.
+	</ul>
+</ul>
+
+<p>Just in case you are interested, the list of distribution is sorted by alphabetic order
+of the distribution name.
 
+<p>If you do not find a suitable package for your distribution, there is no reason
+to panic. It is quite simple to install rsyslog from the source tarball, so you
+should consider that.
 </body>
 </html>
diff --git a/doc/troubleshoot.html b/doc/troubleshoot.html
new file mode 100644
index 00000000..f2e9206b
--- /dev/null
+++ b/doc/troubleshoot.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><title>troubleshooting rsyslog</title></head>
+<body>
+<h2>troubleshooting rsyslog</h2>
+<p><b>Having trouble with <a href="http://www.rsyslog.com">rsyslog</a>?</b>
+This page provides some tips on where to look for help and what to do
+if you need to ask for assistance. This page is continously being expanded.
+<p>Useful troublehshooting ressources are:
+<ul>
+<li>The <a href="http://www.rsyslog.com/doc">rsyslog documentation</a> - note that the online version always covers
+the most recent development version. However, there is a version-specific
+doc set in each tarball. If you installed rsyslog from a package, there usually
+is a rsyslog-doc package, that often needs to be installed separately.
+<li>The <a href="http://wiki.rsyslog.com">rsyslog wiki</a> provides user tips and experiences.
+</ul>
+<p><b>Asking for Help</b>
+<p>If you can't find the answer yourself, you should look at these places for
+community help.
+<ul>
+<li>The <a href="http://kb.monitorware.com/rsyslog-f40.html">rsyslog forum</a>. This is
+the preferred method of obtaining support.
+<li>The <a href="http://lists.adiscon.net/mailman/listinfo/rsyslog">rsyslog mailing list</a>.
+This is a low-volume list which occasional gets traffic spikes.
+The mailing list is probably a good place for complex questions.
+</ul>
+<p>[<a href="manual.html">manual index</a>]
+[<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>
+<p><font size="2">This documentation is part of the
+<a href="http://www.rsyslog.com/">rsyslog</a> project.<br>
+Copyright &copy; 2008 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and
+<a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL 
+version 2 or higher.</font></p>
+</body>
+</html>
+
diff --git a/rsyslog.conf b/rsyslog.conf
index 331a202b..ce7d131a 100644
--- a/rsyslog.conf
+++ b/rsyslog.conf
@@ -1,6 +1,5 @@
-# for help with rsyslog configuration, visit
-#   http://www.rsyslog.com        or the wiki at
-#   http://wiki.rsyslog.com
+# if you experience problems, check
+# http://www.rsyslog.com/troubleshoot for assistance
 
 # rsyslog v3: load input modules
 # If you do not load inputs, nothing happens!
@@ -59,4 +58,3 @@ local7.*                                                /var/log/boot.log
 # UDP Syslog Server:
 #$ModLoad imudp.so  # provides UDP syslog reception
 #$UDPServerRun 514 # start a UDP syslog server at standard port 514
-