1098 Commits

Author SHA1 Message Date
0fe7f1aa28 libksi: reverted pull request #536 for libksi 3.4.0.1
As there is currently an issue open for the libkis versioning,
the patch cannot be merged yet as it break compatibility with the
current release library.

For more see: https://github.com/rsyslog/rsyslog/pull/536
2015-11-23 06:28:57 -08:00
ebb9c4a863 Merge branch 'ksi_2015sept' of https://github.com/vii5ard/rsyslog into ksisig-wrongcontainer 2015-11-20 07:28:45 -08:00
Rainer Gerhards
b32f60e0e3 add support for libfastjson as a replacement for json-c 2015-11-20 11:23:23 +01:00
Rainer Gerhards
977dd4072a bump version number for next release 2015-11-05 12:02:14 +01:00
9285b54a12 Merge branch 'master' of https://github.com/PaloAltoNetworks-BD/rsyslog into PaloAltoNetworks-BD-master 2015-11-02 03:37:04 -08:00
107f4be8a5 Merge branch 'custom-librdkafka' of https://github.com/ymattw/rsyslog into ymattw-custom-librdkafka 2015-10-30 08:26:58 -07:00
jtschichold
abda0e10bd Fixed help string for pmpanngfw 2015-10-30 12:16:35 +00:00
jtschichold
9d884bf467 Added pmpanngfw 2015-10-30 11:13:28 +00:00
Henri Lakk
60ed262802 Updated version restrictions on the libksi. 2015-09-21 17:13:50 +03:00
Matthew Wang
1fc761efef Fix $enable_omkafka condition check 2015-08-29 23:32:57 +08:00
Matthew Wang
aea0980064 Make it possible to customize librdkafka location
For example, build librdkafka from source and static link.
2015-08-29 23:15:55 +08:00
Rainer Gerhards
939b83dc29 bump version for next release 2015-09-29 10:09:21 +02:00
Rainer Gerhards
4bd1e79881 prepare for 8.13.0 release 2015-09-22 15:34:27 +02:00
Rainer Gerhards
c4797472bf Merge branch 'tmp_master' of https://github.com/radosroka/rsyslog into autoconf-gnutls 2015-08-25 11:13:23 +02:00
Rainer Gerhards
b0a39520b9 Merge branch 'newlognorm' of https://github.com/rgerhards/rsyslog into master-candidate 2015-08-25 08:46:14 +02:00
Radovan Sroka
588b4ca741 Fix detection of the GnuTLS package
This commit fixes a number of issues that cropped up from these changes:
23c5b3e replace deprecated GnuTLS functions with newer ones if available
88f0651 bugfix: ommysql did not work when gnutls was enabled
ce560b6 build system: Failure action in AC_CHECK_LIB check for

The solution is based on the assumption that the call to AC_CHECK_LIB()
was added purely to satisfy the subsequent calls to AC_CHECK_FUNCS().
23c5b3e had the unintentional result of libgnutls being added to LIBS
and linked to undesired components.
The next commit removed libgnutls from LIBS which made the following
calls to AC_CHECK_FUNCS() nonfunctional.
Another commit made the processing not stop upon detecting a missing
component which, again, makes the calls to AC_CHECK_FUNCS() malfunction.

The solution is to get rid of AC_CHECK_LIB() and temporarily override
LIBS for use by AC_CHECK_FUNCS().
2015-08-11 17:09:15 +02:00
62fa2755fb bump version number 2015-08-10 05:23:28 -07:00
dc84028fdd prepare for rsyslog 8.12.0 release 2015-08-10 05:04:42 -07:00
Radovan Sroka
1d200da82c Fix generating rscryutil.1
In commit 3b13693 commiter uses variable before executing another block of code which sets this variable and any changes in that block won't apply.
This bug appears when user runs "make dist" in the git repo and the generated tarball doesn't contain rscryutil.1.
2015-08-06 16:18:56 +02:00
Rainer Gerhards
776261be49 mmnormalize: liblognorm error messages are now reported
This is possible due to a new API in liblognorm 1.1.2;
Note that the amount of error messages depends on the version of
liblognorm used. Consequently, liblognorm 1.1.2 is now required
to run mmnormalize.
2015-07-28 15:22:05 +02:00
ce560b6323 build system: Failure action in AC_CHECK_LIB check for gnutls_global_init changed
Instead of an failure, only a warning message is generated now.
On Freebsd the function check does not detect the gnutls_global_init
proberly. This caused configure to fail even if gnutls was installed.
2015-07-28 13:03:36 +00:00
Rainer Gerhards
4e8c87c045 Merge branch 'freebsd-rscryutil-manfix' of https://github.com/alorbach/rsyslog-1 into master-candidate 2015-07-28 12:04:14 +02:00
Rainer Gerhards
88f06516b5 bugfix: ommysql did not work when gnutls was enabled
as it turned out, this was due to a check for GnuTLS functions
with the side-effect that
AC_CHECK_LIB, by default, adds the lib to LIBS, if there is no
explicit action, what was the case here. So everything was now
linked against GnuTLS, which in turn made ommysql fail.

Thanks to Thomas D. (whissi) for the analysis of the ommysql/gnutls
problem and Thomas Heinrich for pointing out that AC_CHECK_LIB might
be the culprit.
2015-07-27 16:59:17 +02:00
3b13693430 Tools: Man pages for tools were generated even with --disable-generate-man-pages
Man pages are not generated anymore when "--disable-generate-man-pages" is
configured. Also changed man-page rulepatterns makefile. The method
using $< refering to the prerequisite did not work proberly on FreeBSD.

closes https://github.com/rsyslog/rsyslog/issues/387
2015-07-24 10:21:58 +00:00
4cd2d4ff53 KSI: Limiting libksi version support from 3.2.2.0 up to 3.3.0.0 2015-07-13 05:03:48 -07:00
Rainer Gerhards
74c3813f6e bump version number 2015-07-06 15:17:48 +02:00
Rainer Gerhards
24d459aa40 prepare for 8.11.0 release 2015-06-26 14:27:41 +02:00
Rainer Gerhards
24f13309f3 KSI support: add plumbing 2015-06-26 08:57:34 +02:00
Rainer Gerhards
5a2b40e1ba testbench: proper cleanup 2015-05-22 13:48:32 +02:00
Rainer Gerhards
3bb425dfe7 working on make distcheck work-around 2015-05-20 13:04:31 +02:00
Rainer Gerhards
bdfbfc292d bump version number 2015-05-19 14:36:35 +02:00
Rainer Gerhards
b648ea53d5 prepare for 8.10.0 release 2015-05-19 10:50:17 +02:00
Rainer Gerhards
23d04ecaa2 omhttpfs: some cleanup
removed duplicate json-c configure check
commented out unused code --> less compiler warnings
2015-05-19 09:56:45 +02:00
Rainer Gerhards
b0b5aa0598 Merge branch 'omhttpfs' of https://github.com/sskaje/rsyslog into sskaje-omhttpfs
Conflicts:
	configure.ac
2015-05-18 10:40:28 +02:00
Rainer Gerhards
21674039db use gnutls_certificate_type_set_priority() only if available
The gnutls_certificate_type_set_priority function is deprecated
and not available in recent GnuTLS versions. However, there is no
doc how to properly replace it with gnutls_priority_set_direct.
A lot of folks have simply removed it, when they also called
gnutls_set_default_priority. This is what we now also do. If
this causes problems or someone has an idea of how to replace
the deprecated function in a better way, please let us know!
In any case, we use it as long as it is available and let
not insult us by the deprecation warnings.
2015-05-18 10:33:39 +02:00
Rainer Gerhards
23c5b3e1e6 replace deprecated GnuTLS functions with newer ones if available
closes https://github.com/rsyslog/rsyslog/issues/302
2015-05-18 10:33:39 +02:00
Rainer Gerhards
d848815b5e Merge branch 'master' of https://github.com/cooper6581/rsyslog into master-candidate 2015-05-04 08:17:44 +02:00
Thomas D
5a20fbbef0 Add an option to disable the generation of debug symbols
Not every user is interested in building software with debug symbols.
If the user has set the new "--disable-debug-symbols" option, we won't
set the appropriate compiler flag to generate debug symbols anymore.
2015-05-02 17:04:07 +02:00
Thomas D
5f5eca03a0 configure: We are now checking for rst2man, flex and yacc when building from git source
When you build from git source you always needed rst2man, flex and yacc (or a
replacement like bison). We only added checks to configure.

Due to this clarification configure option "--enable-generate-man-pages" is now
disabled per default but enforced when building from git source.

Link: http://lists.adiscon.net/pipermail/rsyslog/2015-April/thread.html#40318
2015-04-23 00:08:49 +02:00
Dustin Koupal
51b766c33c fixing json formatting when using json-c < 0.10 2015-04-22 18:15:01 +00:00
Bojan Smojver
813fb1c8f3 fix build on Centos5
The patch in 93dbfc3936524f1c1641d8709fb54e1c66d4f723 did not
properly work.
2015-04-08 15:21:57 +02:00
Bojan Smojver
93dbfc3936 fix build on Centos 5 2015-04-08 08:54:09 +02:00
Rainer Gerhards
1d25a46e7f bump version number to start new release cycle 2015-04-08 08:47:13 +02:00
Rainer Gerhards
34299b8d2c prepare for 8.9.0 release 2015-04-07 13:34:41 +02:00
Thomas D
1f4339df5f Add option to disable valgrind usage in testbench 2015-03-25 10:06:39 +01:00
Rainer Gerhards
abf5220320 build system: clarify use of --enable-valgrind option
see also http://lists.adiscon.net/pipermail/rsyslog/2015-March/040058.html
2015-03-25 09:54:10 +01:00
Rainer Gerhards
c57cd80828 bump version number to begin new release cycle 2015-02-24 17:35:41 +01:00
Rainer Gerhards
52fadb6102 prepare for 8.8.0 release 2015-02-24 17:11:50 +01:00
sskaje
534563a545 Merge branch 'master' into omhttpfs 2015-02-03 17:34:57 +08:00
Andrew Stormont
97b5ab5344 fix build problems on illuminos
closes https://github.com/rsyslog/rsyslog/issues/226
2015-02-02 09:54:30 +01:00