Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | preparing for 7.1.12 release | Rainer Gerhards | 2012-10-18 | 3 | -3/+5 |
| | |||||
* | build: Remove vestiges of the cust1 plugin | Michael Biebl | 2012-10-18 | 1 | -1/+0 |
| | |||||
* | build: Drop unused include path | Michael Biebl | 2012-10-18 | 1 | -1/+1 |
| | |||||
* | build: Drop unused CNF_LIBS variable | Michael Biebl | 2012-10-18 | 2 | -3/+2 |
| | |||||
* | build: Use pkg-config to check for libcurl | Michael Biebl | 2012-10-18 | 1 | -19/+1 |
| | | | | curl has shipped that file since 2004. | ||||
* | build: Use pkg-config to check for libuuid | Michael Biebl | 2012-10-18 | 1 | -16/+1 |
| | | | | | e2fsprogs resp. util-linux(-ng) have shipped that file since at least 2009. | ||||
* | build: Don't call AC_SUBST for variables defined by PKG_CHECK_MODULES | Michael Biebl | 2012-10-18 | 1 | -21/+0 |
| | | | | | | | Newer versions of pkg-config do that already. According to pkg-config upstream this change was made around 2005, so it should be rather safe. This change doesn't affect users building from dist tarballs anyway but only if you are building from a Git checkout. | ||||
* | doc: typo fix | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | |||||
* | doc: add (v5-imported) imklog bugfix to ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -0/+3 |
| | |||||
* | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-17 | 3 | -6/+8 |
|\ | |||||
| * | doc: reflect recent (v5-imported) fix in ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 3 | -5/+7 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | preparing for 5.10.1 | Rainer Gerhards | 2012-10-17 | 3 | -4/+4 |
| | | | |||||
| | * | imklog: use memmove instead of memcpy (solaris) | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | |||||
| | * | imklog: use memmove to remove kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | |||||
| | * | imklog: skip leading spaces in kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 3 | -38/+17 |
|\| | | | | | | | | | | | | | | Conflicts: rsyslog.service.in | ||||
| * | | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 4 | -39/+14 |
| | | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions | ||||
* | | | doc: mention recent patches in ChangeLog | Rainer Gerhards | 2012-10-16 | 1 | -3/+7 |
| | | | |||||
* | | | systemd: Remove obsolete ExecStartPre command | Michael Biebl | 2012-10-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With the introduction of the journal in systemd v38 [1], the systemd-kmsg-syslogd.service service was removed. All major distributions which ship systemd use v44 or later in their current releases, so it seems safe to drop the ExecStartPre command. [1] http://lists.freedesktop.org/archives/systemd-devel/2012-January/004188.html | ||||
* | | | systemd: Drop obsolete compatibility flag | Michael Biebl | 2012-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | In v6 [1], the compatibility mode has been removed and -c is a basically a no-op. So just drop that obsolete command line flag. [1] http://www.rsyslog.com/doc/v6compatibility.html | ||||
* | | | prepare for version 7.1.11 | Rainer Gerhards | 2012-10-16 | 3 | -4/+8 |
| | | | |||||
* | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 2 | -9/+11 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 2 | -8/+10 |
| |\| | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| | * | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 2 | -8/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more). | ||||
| | * | fix problem with cutting first 16 characters from message with bAnnotate on ↵ | Milan Bartos | 2012-10-10 | 1 | -1/+5 |
| | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | ||||
| * | | doc: fix minor small but important typo in ChangeLog | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-11 | 1 | -0/+12 |
|\| | | | | | | | | | | | | | | Conflicts: plugins/mmjsonparse/mmjsonparse.c | ||||
| * | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch. | ||||
* | | | Don't require the trailing space in @cee: cookie | Miloslav Trmač | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | The only mention of @cee: in the Lumberjack pages, https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space, and libumberlog does not in fact generate one. | ||||
* | | | doc: add last patch to ChangeLog | Rainer Gerhards | 2012-10-11 | 1 | -0/+2 |
| | | | |||||
* | | | Fix crash when date properties are used without a template | Miloslav Trmač | 2012-10-11 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 3 | -1/+25 |
| | | | |||||
* | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 3 | -0/+10 |
| | | | |||||
* | | | make omruleset non-default in ./configure | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | as this module's functionality has been superseeded by the "call" statement. Thanks to Michael Biebl for alerting me on the still-old default. | ||||
* | | | preparing for 7.1.10 release | Rainer Gerhards | 2012-10-11 | 2 | -2/+2 |
| | | | |||||
* | | | fix regression introduced by last commit | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | action object was created twice, resulting in memleak | ||||
* | | | bugfixes in regards to action() | Rainer Gerhards | 2012-10-11 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | - bugfix: small memory leak when processing action() statements - bugfix: unknown action() parameters were not reported | ||||
* | | | bugfix: some config processing warning messages were treated as errors | Rainer Gerhards | 2012-10-11 | 2 | -2/+7 |
| | | | |||||
* | | | cosmetic: simplify | Rainer Gerhards | 2012-10-11 | 1 | -3/+1 |
| | | | |||||
* | | | fix double-free | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | add missing prototype | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | |||||
* | | | remove some assert()'s - valgrind does a better job... | Rainer Gerhards | 2012-10-11 | 1 | -4/+0 |
| | | | |||||
* | | | mention recent changes in ChangeLog | Rainer Gerhards | 2012-10-11 | 1 | -1/+6 |
| | | | |||||
* | | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | |||||
* | | | fix small memory leak with string-type templates | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | |||||
* | | | cosmetic cleanup | Rainer Gerhards | 2012-10-09 | 1 | -3/+1 |
| | | | |||||
* | | | prepare for 7.1.9 release | Rainer Gerhards | 2012-10-09 | 3 | -4/+4 |
| | | | |||||
* | | | bugfix: in (non)equal comparisons the position of arrays influenced result | Rainer Gerhards | 2012-10-09 | 2 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | This behaviour is OK for "contains"-type of comparisons (which have quite different semantics), but not for == and <>, which shall be commutative. This has been fixed now, so there is no difference any longer if the constant string array is the left or right hand operand. We solved this via the optimizer, as it keeps the actual script execution code small. | ||||
* | | | re-delete cust1.c plugin dummy file | Rainer Gerhards | 2012-10-04 | 1 | -0/+0 |
| | | | | | | | | | | | | This is no longer needed. |