1098 Commits

Author SHA1 Message Date
Rainer Gerhards
e6eb7ede82 Merge branch 'v7-stable' into v8-stable 2014-04-17 10:17:10 +02:00
Rainer Gerhards
7c62158387 build system: do not modify user variable CFLAGS
closes: https://github.com/rsyslog/rsyslog/issues/56
2014-04-16 13:06:53 +02:00
Rainer Gerhards
b19571791a fix build problem with some older gcc versions
For example those in Ubuntu 12.04 and RHEL 5.
2014-04-10 14:03:11 +02:00
Rainer Gerhards
2447f947bb prepare for 8.3.0 release 2014-04-10 11:45:00 +02:00
Rainer Gerhards
76aae92542 Merge branch 'v8-stable' 2014-04-08 15:39:43 +02:00
Rainer Gerhards
a6b6bf306d fix build problems on solaris 2014-04-08 12:11:57 +02:00
Rainer Gerhards
58677f210e Merge branch 'master-mmexternal'
Conflicts:
	Makefile.am
2014-04-02 12:06:16 +02:00
Rainer Gerhards
3065e0fbcd add support for specifying the liblogging-stdlog channel spec
new global parameter "stdlog.channelspec"
2014-04-01 12:41:51 +02:00
Rainer Gerhards
8068f5c759 prepare for v8.2.0 2014-04-01 09:20:12 +02:00
Rainer Gerhards
131e4227c3 remove doc from rsyslog project itself
in the future, doc stems back to the rsyslog-doc project
2014-04-01 09:04:37 +02:00
Thomas D
50c2f40712 Remove "--enable-cached-man-pages" switch and make rst2man optional when required man pages already exist
Fixes #52
2014-04-01 08:19:47 +02:00
Rainer Gerhards
45517db094 Merge branch 'v7-stable' into v8-stable 2014-03-28 12:46:37 +01:00
Thomas D
b7dcd999b4 Check for "rst2man" and "rst2man.py" (Fixes #51)
docutils installs "rst2man.py" per default, so we need to check for both
variants:

 * "rst2man" when using python-docutils from Ubuntu

 * "rst2man.py" when using docutils from upstream
2014-03-28 12:40:29 +01:00
Rainer Gerhards
932e6bf7bd Merge branch 'v7-stable' into v8-stable
Conflicts:
	tools/ompipe.c
2014-03-26 18:01:17 +01:00
Rainer Gerhards
90854f7165 prepare for 7.6.3 release 2014-03-25 21:48:19 +01:00
Rainer Gerhards
8d19530c22 autoconf: remove no longer needed macro 2014-03-24 17:14:16 +01:00
Rainer Gerhards
fc166c12d4 require librelp 1.2.5
prep work for handling new error codes
2014-03-21 16:39:36 +01:00
Rainer Gerhards
959dd14701 Merge branch 'v7-stable' into v8-stable
Conflicts:
	ChangeLog
2014-03-19 16:07:08 +01:00
Clayton Shotwell
86d19e4e63 configure: Allow overriding of libgcrypt-config
Allow the overriding of the libgcrypt-config path if it is not at
a standard location.

Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
2014-03-19 15:57:09 +01:00
Rainer Gerhards
97a077076a prepare for 7.6.2 release 2014-03-17 12:08:05 +01:00
Rainer Gerhards
e0286ff0ab Merge branch 'master' into master-mmexternal 2014-03-16 11:30:36 +01:00
Rainer Gerhards
94c5c60efa Merge branch 'v7-stable' 2014-03-16 10:58:18 +01:00
Rainer Gerhards
c34828ca7f move to new librelp 1.2.4 APIs
This cleans up the approach taken by librelp 1.2.3, which has shown
to be not clean.
2014-03-16 10:51:51 +01:00
Rainer Gerhards
b1490b0522 prepare for 7.6.1 release 2014-03-13 11:57:24 +01:00
Rainer Gerhards
23cfcc139d Merge branch 'v7-stable'
Conflicts:
	configure.ac
	plugins/omrelp/omrelp.c
2014-03-11 13:04:25 +01:00
Rainer Gerhards
31efd8507f add support for "tls-less" librelp
we now require librelp 1.2.3, as we need the new error code definition
See also: https://github.com/rsyslog/librelp/issues/1
2014-03-10 18:33:08 +01:00
Rainer Gerhards
9a25bd3637 mmexternal skeleton was not properly build 2014-03-07 17:23:59 +01:00
Rainer Gerhards
3cde1f8ab4 preparing for 8.1.6 release 2014-02-20 10:35:17 +01:00
Rainer Gerhards
821f0726f7 Merge branch 'v7-stable' 2014-02-17 15:39:14 +01:00
Rainer Gerhards
d63f234822 Merge branch 'fix-rfc3195-configure-check' of https://github.com/mbiebl/rsyslog into v7-stable 2014-02-17 15:36:50 +01:00
Michael Biebl
f13241aa9a Fix rfc3195 configure check
Newer versions of liblogging were restructured and now also contain
other components besides rfc3195. As a result the original liblogging
library was split and the rfc3195 component was renamed to
liblogging-rfc3195 along with its pkg-config file.

Update the configure check accordingly.
Since we require liblogging >= 1.0.1 anyway, don't add a fallback check
for the old pkg-config name.

Fixes #30
2014-02-16 13:40:50 +01:00
Rainer Gerhards
527822ec42 Merge branch 'v7-stable'
Conflicts:
	configure.ac
2014-02-16 11:01:38 +01:00
Michael Biebl
94b6cbfc52 Use automake 'subdir-objects' option
Newer automake versions complain if we use source files in subdirectories:

autoreconf: running: automake --add-missing --copy --force-missing
plugins/omelasticsearch/Makefile.am:4: warning: source file 'cJSON/cjson.c' is in a subdirectory,
plugins/omelasticsearch/Makefile.am:4: but option 'subdir-objects' is disabled
automake: warning: possible forward-incompatibility.
automake: At least a source file is in a subdirectory, but the 'subdir-objects'
automake: automake option hasn't been enabled.  For now, the corresponding output
automake: object file(s) will be placed in the top-level directory.  However,
automake: this behaviour will change in future Automake versions: they will
automake: unconditionally cause object files to be placed in the same subdirectory
automake: of the corresponding sources.
automake: You are advised to start using 'subdir-objects' option throughout your
automake: project, to avoid future incompatibilities.
runtime/Makefile.am:7: warning: source file '../action.c' is in a subdirectory,
runtime/Makefile.am:7: but option 'subdir-objects' is disabled
runtime/Makefile.am:7: warning: source file '../threads.c' is in a subdirectory,
runtime/Makefile.am:7: but option 'subdir-objects' is disabled
runtime/Makefile.am:7: warning: source file '../parse.c' is in a subdirectory,
runtime/Makefile.am:7: but option 'subdir-objects' is disabled
runtime/Makefile.am:7: warning: source file '../outchannel.c' is in a subdirectory,
runtime/Makefile.am:7: but option 'subdir-objects' is disabled
runtime/Makefile.am:7: warning: source file '../template.c' is in a subdirectory,
runtime/Makefile.am:7: but option 'subdir-objects' is disabled
autoreconf: Leaving directory `.'

Explicitly set the 'subdir-objects' option to avoid any future issues.

Fixes #33
2014-02-15 16:57:39 +01:00
Rainer Gerhards
5aaabc83da Merge branch 'v7-stable'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/ompgsql/ompgsql.c
2014-02-12 14:25:32 +01:00
Rainer Gerhards
d41af3405f prepare for 7.6.0 2014-02-12 14:11:23 +01:00
Rainer Gerhards
771bc2fe5f Merge branch 'v7-stable' into v7-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2014-02-12 13:01:21 +01:00
Rainer Gerhards
bd5d77f2bf prepare for 7.4.10 release 2014-02-12 12:55:48 +01:00
Rainer Gerhards
61be102955 adapt to liblogging 1.0.1 2014-02-03 15:05:25 +01:00
Rainer Gerhards
fa91608bce liblogging rename 2014-02-03 14:59:14 +01:00
Rainer Gerhards
554d365f96 prepare for 8.1.5 release 2014-01-23 20:10:54 +01:00
Rainer Gerhards
10994548fb prepare for 7.4.9 release 2014-01-21 18:10:23 +01:00
Rainer Gerhards
931ef2c37c Merge branch 'v7-devel' 2014-01-21 12:08:55 +01:00
Rainer Gerhards
4b5eba722c Merge branch 'v7-stable-stdlog' into v7-devel
Conflicts:
	runtime/glbl.c
	runtime/glbl.h
	tools/syslogd.c
2014-01-21 12:08:42 +01:00
Rainer Gerhards
1424913197 build: require libstdlog 2014-01-21 09:43:43 +01:00
Rainer Gerhards
8856b1c51d Merge branch 'master' into master-imfile-v8 2014-01-13 14:34:55 +01:00
Rainer Gerhards
98b00367c1 prepare for 8.1.4 release 2014-01-10 14:44:22 +01:00
Rainer Gerhards
481f2fb96a prepare for 7.4.8 release 2014-01-08 13:02:43 +01:00
Rainer Gerhards
57cd73046e prepare for 7.5.8 2014-01-08 09:37:31 +01:00
Rainer Gerhards
02da275527 imrelp: support for TCP KEEPALIVE added 2013-12-10 17:01:43 +01:00
Rainer Gerhards
53f4e19761 prepare for 7.4.7 release 2013-12-09 12:15:14 +01:00