summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-stable'Rainer Gerhards2013-03-223-24/+45
|\
| * build-sys: Change the compat library to noinstMichael Biebl2013-03-221-1/+1
| | | | | | | | It's supposed to be a convenience library and should not be installed.
| * Merge branch 'v6-stable' into v7-stableRainer Gerhards2013-03-222-23/+44
| |\
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-222-23/+44
| | |\
| | | * yet another update of the systemd files we need to carry...Rainer Gerhards2013-03-221-21/+42
| | | |
| | | * build-sys: Fix "update-systemd" targetMichael Biebl2013-03-221-2/+2
| | | | | | | | | | | | | | | | The urls have changed.
* | | | fix build on non-Linux systemsMichael Biebl2013-03-221-1/+1
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-03-221-0/+2
|\| | |
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2013-03-221-0/+2
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-221-0/+2
| | |\|
| | | * Fix linking for recent sd-daemon.c updateMartin Pitt2013-03-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent update of sd-daemon.c introduced the usage of mq_getattr(), which is shipped in -lrt (but clock_gettime isn't any more in glibc 2.17). Also check for mq_getattr() in the rt library to fix linking with glibc 2.17. http://bugzilla.adiscon.com/show_bug.cgi?id=428
* | | | mention systemd update in ChangeLogRainer Gerhards2013-03-211-0/+1
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-03-212-37/+137
|\| | |
| * | | mention systemd update in ChangeLogRainer Gerhards2013-03-211-0/+1
| | | |
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2013-03-212-37/+136
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-212-37/+136
| | |\|
| | | * update systemd files to match current systemd sourceRainer Gerhards2013-03-212-37/+136
| | | |
* | | | keep omlibdbi usable with older libdbi without transaction supportRainer Gerhards2013-03-213-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | in that case, omlibdbi gracefully degrades to non-transaction mode but emits a warning message during build, so that one knows an update of libdbi makes sense.
* | | | omlibdbi: support transaction interfaceUlrike Gerhards2013-03-212-6/+36
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-03-210-0/+0
|\| | |
| * | | bugfix: stdout/stderr were not closed on forkingRainer Gerhards2013-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but were closed when running in the forground - this was just reversed of what it should be. This is a regression of a recent change. Conflicts: ChangeLog
* | | | Fix for glob(3)s that lack GLOB_NOMAGICMartin Carpenter2013-03-215-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-03-211-0/+2
|\| | |
| * | | bugfix: imudp scheduling parameters did affect main thread, not imudpRainer Gerhards2013-03-213-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=409 Conflicts: ChangeLog
* | | | bugfix: imudp scheduling parameters did affect main thread, not imudpRainer Gerhards2013-03-213-3/+17
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=409
* | | | imfile: errors persisting state file are now reportedRainer Gerhards2013-03-202-0/+10
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=292
* | | | doc: describe imfile dependency on work directoryRainer Gerhards2013-03-201-1/+3
| | | |
* | | | imuxsock: add ability to NOT create/delete sockets during startup and shutdownRainer Gerhards2013-03-203-3/+36
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=259
* | | | imfile: now detects file change when rsyslog was inactiveRainer Gerhards2013-03-204-25/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previosly, this case could not be detected, so if a file was overwritten or rotated away while rsyslog was stopped, some data was missing. This is now detected and the new file being forwarded right from the beginning. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=228
* | | | slightly improve imfile docRainer Gerhards2013-03-201-9/+8
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-03-203-1/+10
|\| | |
| * | | cleanupRainer Gerhards2013-03-201-1/+1
| | | |
| * | | bugfix: imuxsock rate-limiting could not be configured via legacy confMilan Bartos2013-03-202-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | bugfix: stdout/stderr were not closed on forkingRainer Gerhards2013-03-202-1/+4
| | | | | | | | | | | | | | | | | | | | but were closed when running in the forground - this was just reversed of what it should be. This is a regression of a recent change.
* | | | omstdout: added debug message when writing to stdout failsRainer Gerhards2013-03-201-2/+9
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-03-200-0/+0
|\| | |
| * | | Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stableRainer Gerhards2013-03-202-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | \ \ \ Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2013-03-203-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ Merge branch 'v7-stable'Rainer Gerhards2013-03-204-3/+13
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | bugfix: $mmnormalizeuseramsg paramter was specified with wrong typeRainer Gerhards2013-03-202-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Renzhong Zhang for alerting us of the problem. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=420
| * | | | | add recent bugfix to ChangeLogRainer Gerhards2013-03-201-0/+3
| | | | | |
| * | | | | bugfix: build on non-linux platforms failedRainer Gerhards2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The previous fix for this was incomplete.
* | | | | | Merge branch 'v7-stable' into tmpRainer Gerhards2013-03-204-15/+27
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | doc: mention merged bugfix in ChangeLogRainer Gerhards2013-03-201-0/+3
| | | | |
| * | | | Merge branch 'v6-stable' into tmpRainer Gerhards2013-03-203-15/+17
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-201-13/+15
| | |\|
| | | * bugfix: get rid of potential endless loop in doGetGID()Tomas Heinrich2013-03-201-13/+15
| | | |
| * | | Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stableRainer Gerhards2013-03-200-0/+0
| |\ \ \
| | * | | bugfix: RainerScript getenv() function caused segfault when var was not foundPhilippe Muller2013-03-202-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | bugfix: RainerScript getenv() function caused segfault when var was not foundPhilippe Muller2013-03-202-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This patch is released under ASL 2.0 as of email conversation from 2013-03-20. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>