rsyslog.git
6 years agoMerge branch 'v5-stable-elasticsearch' into v5-devel-tmp
Rainer Gerhards [Tue, 17 Jan 2012 09:48:39 +0000 (10:48 +0100)]
Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp

Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/syslogd.c

6 years agoelasticsearch: move to asl 2.0
Rainer Gerhards [Tue, 17 Jan 2012 09:42:04 +0000 (10:42 +0100)]
elasticsearch: move to asl 2.0

email conversation Nathan/Rainer 2012-01-16&17

6 years agoadd elasticsearch output module
Nathan Scott [Mon, 15 Aug 2011 12:22:13 +0000 (22:22 +1000)]
add elasticsearch output module

Add support for sending events to elasticsearch - a distributed,
RESTful, search engine built on Lucene (www.elasticsearch.org).
The output module is enabled via a configure option, and uses
libcurl to send the messages from rsyslog to elasticsearch.

This patch makes use of the earlier JSON quoting patch to ensure
valid JSON strings are sent to the server.

Signed-off-by: Nathan Scott <nathans@aconex.com>
6 years agoadd JSON escaping option
Nathan Scott [Mon, 15 Aug 2011 12:22:05 +0000 (22:22 +1000)]
add JSON escaping option

Following the path taken by the two SQL formatting options,
which escape single quotes with double quotes (amongst other
things), this patch adds a JSON quoting option.  JSON is the
opposite to the SQL options, requiring double quotes to be
quoted within a string.  This patch provides a formatting
option implementing this requirement, while piggy-backing on
the existing code as much as possible.

Signed-off-by: Nathan Scott <nathans@aconex.com>
6 years agopreparing for 5.8.7 v5.8.7
Rainer Gerhards [Tue, 17 Jan 2012 08:37:45 +0000 (09:37 +0100)]
preparing for 5.8.7

6 years agolicensing update
Rainer Gerhards [Mon, 16 Jan 2012 17:27:45 +0000 (18:27 +0100)]
licensing update

6 years ago$IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0
Rainer Gerhards [Mon, 16 Jan 2012 16:58:57 +0000 (17:58 +0100)]
$IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0

The new default turns off rate limiting. This was chosen as people
experienced problems with rate-limiting activated by default. Now it
needs an explicit opt-in by setting this parameter.
Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to
many unnamed others who already had complained at the time Chris made
the suggestion ;-)

6 years agofix error of not define HAVE_SETSID
Peng Haitao [Fri, 6 Jan 2012 06:48:18 +0000 (14:48 +0800)]
fix error of not define HAVE_SETSID

[add list to the CC list]

When HAVE_SETSID is not defined, rsyslogd will use ioctl() make itself to daemon,
but this can not make rsyslogd process become the process group leader of a new
process group. In RHEL6.1, the status is as follows:
# uname -a
Linux RHEL6U1GA-Intel64-199 2.6.32-131.0.15.el6.x86_64 #1 SMP Tue May 10 15:42:40 EDT 2011 x86_64 x86_64 x86_64 GNU/Linux
# /etc/init.d/rsyslog restart
Shutting down system logger:                               [  OK  ]
Starting system logger:                                    [  OK  ]
# ps axo pgrp,ppid,pid,comm | grep rsyslog
 6290     1  6301 rsyslogd

When we send SIGTERM signal to 6290, rsyslogd will die:( So I think we should
call setpgid() before ioctl().

Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>
6 years agoMerge branch 'v5-stable-newstats' into v5-devel
Rainer Gerhards [Mon, 16 Jan 2012 16:04:10 +0000 (17:04 +0100)]
Merge branch 'v5-stable-newstats' into v5-devel

Conflicts:
plugins/imtcp/imtcp.c

6 years agoMerge branch 'v5-stable' into v5-stable-newstats
Rainer Gerhards [Mon, 16 Jan 2012 15:57:59 +0000 (16:57 +0100)]
Merge branch 'v5-stable' into v5-stable-newstats

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Mon, 16 Jan 2012 15:57:46 +0000 (16:57 +0100)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
tools/syslogd.c

6 years agoFQDN hostname for multihomed host was not always set to the correct name
Tomas Heinrich [Mon, 16 Jan 2012 15:53:18 +0000 (16:53 +0100)]
FQDN hostname for multihomed host was not always set to the correct name

..if multiple aliases existed. Thanks to Tomas Heinreich for the patch.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agoMerge branch 'v5-stable' into v5-stable-newstats
Rainer Gerhards [Mon, 16 Jan 2012 15:25:45 +0000 (16:25 +0100)]
Merge branch 'v5-stable' into v5-stable-newstats

Conflicts:
plugins/impstats/impstats.c

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Mon, 16 Jan 2012 15:14:30 +0000 (16:14 +0100)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
runtime/debug.h
runtime/obj.c
runtime/parser.h
runtime/wti.h

6 years agolicense changes
Rainer Gerhards [Mon, 16 Jan 2012 14:23:01 +0000 (15:23 +0100)]
license changes

6 years agoruntime license change
Rainer Gerhards [Mon, 16 Jan 2012 11:39:01 +0000 (12:39 +0100)]
runtime license change

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Sat, 14 Jan 2012 18:04:46 +0000 (19:04 +0100)]
Merge branch 'v4-stable' into v5-stable

6 years agolicense change
Rainer Gerhards [Sat, 14 Jan 2012 18:01:44 +0000 (19:01 +0100)]
license change

after careful consideration of affected code

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Sat, 14 Jan 2012 17:32:40 +0000 (18:32 +0100)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c

6 years agoomfwd refactor: even more simplification (small one ;))
Rainer Gerhards [Sat, 14 Jan 2012 17:29:33 +0000 (18:29 +0100)]
omfwd refactor: even more simplification (small one ;))

6 years agocosmetic: cleanup of ChangeLog
Rainer Gerhards [Sat, 14 Jan 2012 17:27:24 +0000 (18:27 +0100)]
cosmetic: cleanup of ChangeLog

6 years agoomfwd license change to ASL 2.0
Rainer Gerhards [Sat, 14 Jan 2012 17:25:23 +0000 (18:25 +0100)]
omfwd license change to ASL 2.0

after careful consideration of contributor history. David Lang gave
permission to license under ASL 2.0, other patches have been replaced
by refactored code.

6 years agoomfwd refactor: simplification
Rainer Gerhards [Sat, 14 Jan 2012 17:22:16 +0000 (18:22 +0100)]
omfwd refactor: simplification

at the same time, remove commits
8c3ab2e26f1bae46ff34fc1d0a10a69c4db78127
009738a0ac6ba0dccf403f9e396095f44e4f9ac6

6 years agoomfwd refactor: simplifying code
Rainer Gerhards [Sat, 14 Jan 2012 17:13:26 +0000 (18:13 +0100)]
omfwd refactor: simplifying code

also remove code introduced by commit 6e97513eea1a6e282365eb01d972e0657cb36baa

6 years agomore license analysis & change
Rainer Gerhards [Sat, 14 Jan 2012 17:01:12 +0000 (18:01 +0100)]
more license analysis & change

6 years agorsyslog.conf.5 socket module example sb imuxsock
Jim Hill [Sat, 14 Jan 2012 10:12:38 +0000 (02:12 -0800)]
rsyslog.conf.5 socket module example sb imuxsock

6 years agoMerge branch 'v5-devel' into v5-devel-tmp
Rainer Gerhards [Thu, 12 Jan 2012 03:08:22 +0000 (04:08 +0100)]
Merge branch 'v5-devel' into v5-devel-tmp

6 years agoregression fix: imuxsock-received messages were malformed
Rainer Gerhards [Thu, 12 Jan 2012 03:05:34 +0000 (04:05 +0100)]
regression fix: imuxsock-received messages were malformed

probably caused by a recent merge, was not present in 5.9.4

6 years agomore files moved to ASL 2.0
Rainer Gerhards [Thu, 12 Jan 2012 02:29:19 +0000 (03:29 +0100)]
more files moved to ASL 2.0

6 years agorelicense to ASL 2.0
Rainer Gerhards [Wed, 11 Jan 2012 17:52:53 +0000 (18:52 +0100)]
relicense to ASL 2.0

6 years agosome more files to ASL 2.0
Rainer Gerhards [Wed, 11 Jan 2012 17:49:00 +0000 (18:49 +0100)]
some more files to ASL 2.0

6 years agorelicense parts under ASL 2.0
Rainer Gerhards [Wed, 11 Jan 2012 17:30:33 +0000 (18:30 +0100)]
relicense parts under ASL 2.0

after carful check for copyright holder

6 years agopart of merge, but forgot to add to merge set
Rainer Gerhards [Tue, 10 Jan 2012 17:04:18 +0000 (18:04 +0100)]
part of merge, but forgot to add to merge set

6 years agoMerge branch 'v4-stable-tmp' into v5-devel-tmp
Rainer Gerhards [Tue, 10 Jan 2012 17:04:01 +0000 (18:04 +0100)]
Merge branch 'v4-stable-tmp' into v5-devel-tmp

Conflicts:
dirty.h
tools/syslogd.c

6 years agoMerge branch 'tmp' into v4-stable-tmp
Rainer Gerhards [Tue, 10 Jan 2012 16:18:11 +0000 (17:18 +0100)]
Merge branch 'tmp' into v4-stable-tmp

Conflicts:
dirty.h
doc/rsyslog_conf_global.html
tools/syslogd.c

6 years agoadded $SpaceLFOnReceive config directive
Tomas Heinrich [Tue, 10 Jan 2012 16:14:16 +0000 (17:14 +0100)]
added $SpaceLFOnReceive config directive

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agoMerge branch 'tmp' into v4-stable-tmp
Rainer Gerhards [Tue, 10 Jan 2012 16:08:47 +0000 (17:08 +0100)]
Merge branch 'tmp' into v4-stable-tmp

6 years agoadded canned template for ultra-exact sysklogd file format
Tomas Heinrich [Tue, 10 Jan 2012 16:07:55 +0000 (17:07 +0100)]
added canned template for ultra-exact sysklogd file format

the point is that LF will be translated to SP

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agoMerge branch 'v5-stable' into v5-devel
Rainer Gerhards [Mon, 9 Jan 2012 14:05:32 +0000 (15:05 +0100)]
Merge branch 'v5-stable' into v5-devel

6 years agoMerge branch 'v5-stable' into v5-stable-newstats
Rainer Gerhards [Mon, 9 Jan 2012 14:05:22 +0000 (15:05 +0100)]
Merge branch 'v5-stable' into v5-stable-newstats

6 years agobugfix: instabilities when using RFC5424 header fields
Kaiwang Chen [Mon, 9 Jan 2012 13:32:52 +0000 (14:32 +0100)]
bugfix: instabilities when using RFC5424 header fields

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agoMerge v5-stable-newstats & manual ChangeLog update
Rainer Gerhards [Mon, 9 Jan 2012 12:47:54 +0000 (13:47 +0100)]
Merge v5-stable-newstats & manual ChangeLog update

6 years agoMerge branch 'v5-stable-newstats' into v5-devel
Rainer Gerhards [Mon, 9 Jan 2012 12:47:18 +0000 (13:47 +0100)]
Merge branch 'v5-stable-newstats' into v5-devel

Conflicts:
configure.ac

6 years agopush version number
Rainer Gerhards [Mon, 9 Jan 2012 11:39:02 +0000 (12:39 +0100)]
push version number

6 years agoimudp: added per-listner stats settings & more refactoring
Rainer Gerhards [Mon, 9 Jan 2012 10:55:57 +0000 (11:55 +0100)]
imudp: added per-listner stats settings & more refactoring

6 years agoimudp refactor: field renaming (new names more more sense)
Rainer Gerhards [Mon, 9 Jan 2012 08:43:01 +0000 (09:43 +0100)]
imudp refactor: field renaming (new names more more sense)

6 years agoimudp refactor: regression fix
Rainer Gerhards [Mon, 9 Jan 2012 08:36:15 +0000 (09:36 +0100)]
imudp refactor: regression fix

6 years agoimudp refactor: fixed socket leak
Rainer Gerhards [Mon, 9 Jan 2012 08:01:44 +0000 (09:01 +0100)]
imudp refactor: fixed socket leak

6 years agonit fixed (testing aid removed)
Rainer Gerhards [Sun, 8 Jan 2012 16:42:55 +0000 (17:42 +0100)]
nit fixed (testing aid removed)

6 years agocleanup of imudp to use better lstn data structure (part I)
Rainer Gerhards [Sun, 8 Jan 2012 16:41:08 +0000 (17:41 +0100)]
cleanup of imudp to use better lstn data structure (part I)

6 years agoprepared milestone (version push)
Rainer Gerhards [Wed, 21 Dec 2011 13:48:54 +0000 (14:48 +0100)]
prepared milestone (version push)

6 years agoMerge branch 'v5-stable-newstats' into v5-devel
Rainer Gerhards [Tue, 20 Dec 2011 17:35:20 +0000 (18:35 +0100)]
Merge branch 'v5-stable-newstats' into v5-devel

Conflicts:
plugins/imuxsock/imuxsock.c

6 years agoMerge branch 'v5-stable' into v5-stable-newstats
Rainer Gerhards [Tue, 20 Dec 2011 17:24:02 +0000 (18:24 +0100)]
Merge branch 'v5-stable' into v5-stable-newstats

Conflicts:
ChangeLog

6 years agobugfix: stats counter were not properly initialized on creation
Rainer Gerhards [Tue, 20 Dec 2011 17:22:58 +0000 (18:22 +0100)]
bugfix: stats counter were not properly initialized on creation

6 years agoimtcp: added stats counters
Rainer Gerhards [Tue, 20 Dec 2011 17:19:14 +0000 (18:19 +0100)]
imtcp: added stats counters

also adds counters to other users of tcpsrv.c method, but these do not
work if default submit method is overwritten (currently only the case
for imdiag, what we don't consider a problem)

6 years agobugfix: stats counter were not properly initialized on creation
Rainer Gerhards [Tue, 20 Dec 2011 17:17:45 +0000 (18:17 +0100)]
bugfix: stats counter were not properly initialized on creation

6 years agobugfix: imuxsock did truncate part of received message if it did not contain a proper...
Rainer Gerhards [Tue, 20 Dec 2011 15:39:39 +0000 (16:39 +0100)]
bugfix: imuxsock did truncate part of received message if it did not contain a proper date.

The truncation occured because we removed that part of the messages
that was expected to be the date.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295

6 years agoMerge branch 'v5-stable-newstats' into v5-devel
Rainer Gerhards [Mon, 19 Dec 2011 16:12:33 +0000 (17:12 +0100)]
Merge branch 'v5-stable-newstats' into v5-devel

6 years agoimudp: stats added
Rainer Gerhards [Mon, 19 Dec 2011 16:08:06 +0000 (17:08 +0100)]
imudp: stats added

6 years agoMerge branch 'v5-stable-newstats' into v5-devel
Rainer Gerhards [Mon, 19 Dec 2011 13:24:09 +0000 (14:24 +0100)]
Merge branch 'v5-stable-newstats' into v5-devel

Conflicts:
configure.ac

6 years agobetter performance for action stats & cleanup: removing debug prints
Rainer Gerhards [Mon, 19 Dec 2011 13:16:32 +0000 (14:16 +0100)]
better performance for action stats & cleanup: removing debug prints

6 years agoflagged special branch version
Rainer Gerhards [Mon, 19 Dec 2011 11:46:13 +0000 (12:46 +0100)]
flagged special branch version

6 years agoMerge branch 'v5-stable-newstats' into v5-devel
Rainer Gerhards [Mon, 19 Dec 2011 11:39:09 +0000 (12:39 +0100)]
Merge branch 'v5-stable-newstats' into v5-devel

6 years agoadditional counter for lost messages due to failed actions added
Rainer Gerhards [Mon, 19 Dec 2011 11:34:19 +0000 (12:34 +0100)]
additional counter for lost messages due to failed actions added

6 years agoMerge branch 'v5-stable-newstats' into v5-devel
Rainer Gerhards [Mon, 19 Dec 2011 10:20:59 +0000 (11:20 +0100)]
Merge branch 'v5-stable-newstats' into v5-devel

Conflicts:
ChangeLog
action.c

6 years agoadded instrumentation
Rainer Gerhards [Mon, 19 Dec 2011 10:16:07 +0000 (11:16 +0100)]
added instrumentation

6 years agofixing memory leak in new stats code (delete statsobj)
Rainer Gerhards [Fri, 16 Dec 2011 17:54:59 +0000 (18:54 +0100)]
fixing memory leak in new stats code (delete statsobj)

6 years agoexperimental: added first stats counter to action object
Rainer Gerhards [Fri, 16 Dec 2011 17:51:49 +0000 (18:51 +0100)]
experimental: added first stats counter to action object

6 years agomore work on queue statistics counter
Rainer Gerhards [Fri, 16 Dec 2011 14:12:24 +0000 (15:12 +0100)]
more work on queue statistics counter

6 years agonew stats counter "discarded" for queue object
Rainer Gerhards [Fri, 16 Dec 2011 13:42:37 +0000 (14:42 +0100)]
new stats counter "discarded" for queue object

Tells how many messages have been discarded due to queue full condition.

6 years agoenhanced module loader to not rely on PATH_MAX
Rainer Gerhards [Fri, 16 Dec 2011 11:14:48 +0000 (12:14 +0100)]
enhanced module loader to not rely on PATH_MAX

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Fri, 16 Dec 2011 10:05:16 +0000 (11:05 +0100)]
Merge branch 'v4-stable' into v5-stable

6 years agobugfix: potential fatal abort in omgssapi
Tomas Heinrich [Fri, 16 Dec 2011 09:54:40 +0000 (10:54 +0100)]
bugfix: potential fatal abort in omgssapi

6 years agoadded doc for omprog
Rainer Gerhards [Fri, 16 Dec 2011 09:31:17 +0000 (10:31 +0100)]
added doc for omprog

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 1 Dec 2011 10:30:10 +0000 (11:30 +0100)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
action.c

6 years agoMerge branch 'v3-stable' into v4-stable
Rainer Gerhards [Thu, 1 Dec 2011 10:26:24 +0000 (11:26 +0100)]
Merge branch 'v3-stable' into v4-stable

6 years agobugfix: action resume interval incorrectly handled, thus took longer to resume
Tomas Heinrich [Thu, 1 Dec 2011 10:25:47 +0000 (11:25 +0100)]
bugfix: action resume interval incorrectly handled, thus took longer to resume

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agobugfix: cosmetic: proper constant used instead of number in open call
Tomas Heinrich [Thu, 1 Dec 2011 10:18:49 +0000 (11:18 +0100)]
bugfix: cosmetic: proper constant used instead of number in open call

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agopreparing for 5.9.4 v5.9.4
Rainer Gerhards [Tue, 29 Nov 2011 15:55:26 +0000 (16:55 +0100)]
preparing for 5.9.4

6 years agoimuxsock: added capability to "annotate" messages with "trusted information",
Rainer Gerhards [Tue, 29 Nov 2011 11:36:36 +0000 (12:36 +0100)]
imuxsock: added capability to "annotate" messages with "trusted information",

which contains some properties obtained from the system and as such
sure to not be faked. This is inspired by the similiar idea introduced
in systemd.

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 3 Nov 2011 09:13:44 +0000 (10:13 +0100)]
Merge branch 'v4-stable' into v5-stable

6 years agodoc bugfix: typo in imgssapi doc
Rainer Gerhards [Thu, 3 Nov 2011 09:13:11 +0000 (10:13 +0100)]
doc bugfix: typo in imgssapi doc

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Tue, 25 Oct 2011 12:59:55 +0000 (14:59 +0200)]
Merge branch 'v4-stable' into v5-stable

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 27 Oct 2011 07:39:45 +0000 (09:39 +0200)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
ChangeLog

6 years agobugfix: potential abort after reading invalid X.509 certificate
Tomas Heinrich [Thu, 27 Oct 2011 07:37:27 +0000 (09:37 +0200)]
bugfix: potential abort after reading invalid X.509 certificate

closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agodoc: imfile: clarified that empty lines are not processed
Rainer Gerhards [Tue, 25 Oct 2011 12:59:29 +0000 (14:59 +0200)]
doc: imfile: clarified that empty lines are not processed

6 years agoone further change to support gnutls without libgcrypt
Rainer Gerhards [Fri, 21 Oct 2011 13:29:51 +0000 (15:29 +0200)]
one further change to support gnutls without libgcrypt

6 years agoMerge branch 'v5-stable' into v5-devel
Rainer Gerhards [Fri, 21 Oct 2011 12:42:32 +0000 (14:42 +0200)]
Merge branch 'v5-stable' into v5-devel

Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h

6 years agopreparing for 5.8.6 release v5.8.6
Rainer Gerhards [Fri, 21 Oct 2011 12:23:13 +0000 (14:23 +0200)]
preparing for 5.8.6 release

6 years agobugfix: missing whitespace after property-based filter was not detected
Rainer Gerhards [Fri, 21 Oct 2011 12:05:59 +0000 (14:05 +0200)]
bugfix: missing whitespace after property-based filter was not detected

6 years agoMerge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable
Rainer Gerhards [Fri, 21 Oct 2011 09:42:24 +0000 (11:42 +0200)]
Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable

6 years agominor: slightly improved error reporting when dynafile open fails
Rainer Gerhards [Thu, 20 Oct 2011 12:26:51 +0000 (14:26 +0200)]
minor: slightly improved error reporting when dynafile open fails

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 20 Oct 2011 10:08:38 +0000 (12:08 +0200)]
Merge branch 'v4-stable' into v5-stable

6 years agodoc bugfix: pri-text neees to be fixed in an article as well
Rainer Gerhards [Thu, 20 Oct 2011 10:08:03 +0000 (12:08 +0200)]
doc bugfix: pri-text neees to be fixed in an article as well

6 years agodoc bug: property pri-text was incorrectly described
Rainer Gerhards [Thu, 20 Oct 2011 10:05:57 +0000 (12:05 +0200)]
doc bug: property pri-text was incorrectly described

6 years agobugfix: $OMFileFlushInterval period was doubled - now using correct value
Rainer Gerhards [Tue, 18 Oct 2011 11:43:34 +0000 (13:43 +0200)]
bugfix: $OMFileFlushInterval period was doubled - now using correct value

6 years agoremoved dependency on gcrypt for recently-enough GnuTLS
Rainer Gerhards [Mon, 17 Oct 2011 13:49:20 +0000 (15:49 +0200)]
removed dependency on gcrypt for recently-enough GnuTLS

see: http://bugzilla.adiscon.com/show_bug.cgi?id=289

6 years agoMerge branch 'v5-stable' into v5-devel
Rainer Gerhards [Mon, 17 Oct 2011 13:26:11 +0000 (15:26 +0200)]
Merge branch 'v5-stable' into v5-devel

Conflicts:
ChangeLog

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Mon, 17 Oct 2011 12:44:13 +0000 (14:44 +0200)]
Merge branch 'v4-stable' into v5-stable

6 years agodoc: clarified that imklog does not support Solaris
Rainer Gerhards [Mon, 17 Oct 2011 12:43:43 +0000 (14:43 +0200)]
doc: clarified that imklog does not support Solaris