rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,333 Commits 67 Branches 505 Tags
Commit Graph

907 Commits

Author SHA1 Message Date
Rainer Gerhards
67c3139e8b Merge branch 'v8-stable' 2014-10-01 14:10:35 +02:00
Rainer Gerhards
6c5b6a2ec2 remove --enable-zlib configure option, we always require it 
It's hard to envision a system without zlib, so we turn this off
closes https://github.com/rsyslog/rsyslog/issues/76
 2014-10-29 18:37:13 +01:00
Rainer Gerhards
c8ff97b850 Merge branch 'v8-stable' 2014-10-27 12:37:02 +01:00
Rainer Gerhards
915ca50842 Merge branch 'v7-stable' into v8-stable 2014-10-27 12:36:52 +01:00
Alex Fisher
062387a283 bugfix: error: json_tokener_errors undeclared when overriding PKGCONFIG 
If PKGCONFIG settings for json-c were overriden, presence of
json_tokener_errors was not properly detected.
closes https://github.com/rsyslog/rsyslog/issues/143
 2014-10-27 12:35:34 +01:00
Rainer Gerhards
60f8294db2 add configure option to explicitely turn on elasticsearch tests 
Otherwise make check et al fail on systems that don't have an
ES test environment. Follows the same way this is done for MySQL.
 2014-10-24 12:09:44 +02:00
Rainer Gerhards
88b1dc4fe0 add configure option to explicitely turn on elasticsearch tests 
Otherwise make check et al fail on systems that don't have an
ES test environment. Follows the same way this is done for MySQL.
 2014-10-24 12:06:30 +02:00
Rainer Gerhards
c374cce103 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	ChangeLog
	configure.ac
 2014-10-02 08:13:49 +02:00
Rainer Gerhards
910636cf3c prepare for 7.6.7 2014-10-02 07:53:55 +02:00
Rainer Gerhards
5d377915f3 build system: automatically set c99 mode 2014-10-01 14:10:14 +02:00
Rainer Gerhards
3c250f3079 use json_object_object_get_ex() when available 
... because the previous call is now deprecated
 2014-09-30 16:55:40 +02:00
Rainer Gerhards
b9427fa9a2 Merge branch 'v8-stable' 
Conflicts:
	ChangeLog
	configure.ac
 2014-09-30 12:14:36 +02:00
Rainer Gerhards
5a1313b27f Merge branch 'v7-stable-prifix' into v8-stable-prifix 
Conflicts:
	ChangeLog
	configure.ac
	grammar/rainerscript.h
 2014-09-24 18:30:36 +02:00
Rainer Gerhards
2284eea340 Merge branch 'v8-stable' into v8-stable-prifix 
Conflicts:
	runtime/syslogd-types.h
 2014-09-24 18:25:26 +02:00
Rainer Gerhards
c48dc42868 prepare for 7.6.6 release 2014-09-24 17:17:12 +02:00
Rainer Gerhards
dd754638d2 Merge branch 'v7-stable' into v7-stable-prifix 2014-09-24 17:06:55 +02:00
Rainer Gerhards
1a9fcb9ec8 Merge branch 'v7-stable' into v8-stable 2014-09-23 10:40:48 +02:00
Andreas Stieger
f122b4d08b fix build with json-c 0.12 if it provides a compatibility json.pc 
json-c on openSUSE provides a compatibility pkg-config for "json".
The autoconf check find it first, assuming it does not provide
the function json_tokener_error_desc. Check for availability of
function using AC_CHECK_FUNCS instead to define the corresponding
HAVE_JSON_TOKENER_ERROR_DESC macro.
 2014-09-23 10:15:59 +02:00
Andreas Stieger
0d2789ed94 fix build with json-c 0.12 if it provides a compatibility json.pc 
json-c on openSUSE provides a compatibility pkg-config for "json".
The autoconf check find it first, assuming it does not provide
the function json_tokener_error_desc. Check for availability of
function using AC_CHECK_FUNCS instead to define the corresponding
HAVE_JSON_TOKENER_ERROR_DESC macro.
 2014-09-22 21:00:55 +01:00
Rainer Gerhards
0852285e44 Merge branch 'v7-stable' into tmp 
Conflicts:
	runtime/syslogd-types.h
 2014-09-18 08:47:31 +02:00
Rainer Gerhards
cbcfdbbba7 prepare for 7.6.5 release 2014-09-17 12:02:57 +02:00
Rainer Gerhards
b11bf2745c Merge branch 'v7-stable-prifix' into v8-stable-prifix 
WARNING: does not compile, will be fixed with next commit

Conflicts:
	configure.ac
	tools/rsyslogd.c
 2014-09-16 14:59:14 +02:00
Rainer Gerhards
1ac20ffe97 Merge branch 'v5-stable-prifix' into v7-stable-prifix 
Conflicts:
	plugins/imklog/imklog.c
	plugins/imtemplate/imtemplate.c
	plugins/imuxsock/imuxsock.c
	runtime/msg.c
	runtime/rsyslog.h
	runtime/rule.c
	runtime/syslogd-types.h
	tools/syslogd.c
 2014-09-16 14:48:29 +02:00
Rainer Gerhards
df4e90f602 Merge branch 'v5.8.13-prifix' into v5-stable-prifix 
Conflicts:
	plugins/imklog/imklog.c
	plugins/imklog/ksym.c
	runtime/rule.c
 2014-09-16 12:43:29 +02:00
Rainer Gerhards
750824186d Merge branch 'v5.8.6-prifix' into v5.8.13-prifix 2014-09-15 17:22:59 +02:00
Rainer Gerhards
cd6937f35b do not accept out of bounds PRI values 
further reference: CVE-2014-3634
 2014-09-15 15:10:40 +02:00
Rainer Gerhards
aabdd047c9 prepare for 7.6.4 2014-09-11 13:29:37 +02:00
Rainer Gerhards
5665452373 kick off 8.5 branch 2014-08-18 12:38:25 +02:00
Rainer Gerhards
500531adaf begin new 8.4 stable branch 2014-08-18 12:14:57 +02:00
Rainer Gerhards
f45e0124ed prepare for 8.3.5 release 2014-08-18 10:49:20 +02:00
Rainer Gerhards
0886354ac5 bugfix: mmjsonparse did not build with json-c < 0.10 
This was a regression introduced some time in the past in order to
support API changes in json-c. Now we check for the version and use
proper code.

Conflicts:

	ChangeLog
 2014-07-15 15:32:27 +02:00
Rainer Gerhards
a9c6a6ec4a bugfix: mmjsonparse did not build with json-c < 0.10 
This was a regression introduced some time in the past in order to
support API changes in json-c. Now we check for the version and use
proper code.
 2014-07-15 15:28:27 +02:00
Rainer Gerhards
bae2cf3cce Merge branch 'v8-stable' 2014-07-14 11:39:27 +02:00
Rainer Gerhards
a45ea8a144 testbench: make more reliable shutdown 
so far, we checked only the main queue size to become zero, ignoring
the sizes of action queues. For some tests, this caused racieness and
unreliability. Now, we check all queues. This should make matters
much more stable.
 2014-07-11 17:23:21 +02:00
Rainer Gerhards
244ca62e33 Merge branch 'v8-stable' 2014-07-11 15:32:54 +02:00
Rainer Gerhards
bb48b34db0 Merge branch 'v7-stable' into v8-stable 2014-07-11 15:32:45 +02:00
Rainer Gerhards
c3db2ef98d add --enable-generate-man-pages configure switch (default: enabled) 
This forces generation of man pages, even if cached ones exists. This
"fixes" a typical release tarball nit. While it is hackish, the
benefit is clear given the history of failed tarball releases since
we changed the cached man page handling. It was just too easy to get
that wrong.
 2014-07-11 15:32:10 +02:00
Rainer Gerhards
d5de1f4a67 prepare for 8.3.4 2014-07-11 15:19:23 +02:00
Rainer Gerhards
9bb5db3455 timezone() object: prep work 2014-07-08 16:42:09 +02:00
Rainer Gerhards
f5e50fdc44 Merge remote-tracking branch 'github/master' 2014-07-08 16:18:34 +02:00
Rainer Gerhards
ff2ec4001f Merge branch 'v8-stable-newparsers' 2014-07-08 16:17:15 +02:00
Rainer Gerhards
548962d519 pmciscoios: skeleton & first rough implementation approach (yet incomplete) 2014-07-04 00:36:16 +02:00
Rainer Gerhards
de7c6cf695 prepare for 8.3.3 release 2014-07-03 13:54:22 +02:00
Rainer Gerhards
bb91dfcb3d make testbench run serial on new automake 2.69 2014-07-03 12:31:41 +02:00
Rainer Gerhards
c8854aefad prepare for 8.2.2 release 2014-06-02 12:42:29 +02:00
Rainer Gerhards
b123b8749d Merge branch 'v8-stable' 2014-05-21 08:59:08 +02:00
Rainer Gerhards
c0e1da919e make omhdfs check for different locations of header files 
fedora seems to package them to a different location as
(some) others
 2014-05-21 08:54:57 +02:00
Rainer Gerhards
4f723bde4e Merge branch 'v8-stable' 2014-05-05 12:34:04 +02:00
Rainer Gerhards
e180d359c9 Merge branch 'v7-stable' into v8-stable 2014-05-05 12:33:56 +02:00
Rainer Gerhards
ce9b272317 imdiag: clarify state 
see also: https://github.com/rsyslog/rsyslog/issues/71
 2014-05-05 12:32:52 +02:00