rpms/syslog-ng
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 3.5.4.1

Browse Source 
Signed-off-by: Peter Czanik <pczanik@fang.fa.gau.hu>
This commit is contained in:
Peter Czanik 2014-07-16 13:25:51 +02:00
parent 677615adb0
commit 29cd63341e
6 changed files with 57 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ syslog-ng_3.1.1.tar.gz
/syslog-ng_3.4.5.tar.gz
/syslog-ng_3.4.6.tar.gz
/syslog-ng_3.4.7.tar.gz
/syslog-ng_3.5.4.1.tar.gz

2
sources
View File

@ -1 +1 @@
eed6df3a8728bbc4c607c3b44aeaa405 syslog-ng_3.4.7.tar.gz
ff3bf223ebafbaa92b69a2d5b729f368 syslog-ng_3.5.4.1.tar.gz

12
syslog-ng-3.4.3-syslog-ng.service.patch
View File

@ -1,12 +0,0 @@
diff -ruN syslog-ng-3.4.3/contrib/systemd/syslog-ng.service syslog-ng-3.4.3-modified/contrib/systemd/syslog-ng.service
--- syslog-ng-3.4.3/contrib/systemd/syslog-ng.service 2013-08-13 10:25:18.000000000 +0100
+++ syslog-ng-3.4.3-modified/contrib/systemd/syslog-ng.service 2013-08-13 22:21:10.780304735 +0100
@@ -4,7 +4,7 @@
[Service]
Sockets=syslog.socket
-ExecStart=/usr/sbin/syslog-ng -F
+ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid
ExecReload=/bin/kill -HUP $MAINPID
StandardOutput=null
Restart=on-failure

12
syslog-ng-3.5.0-syslog-ng.service.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN syslog-ng-3.5.0beta3/contrib/systemd/syslog-ng.service syslog-ng-3.5.0beta3-modified/contrib/systemd/syslog-ng.service
--- syslog-ng-3.5.0beta3/contrib/systemd/syslog-ng.service 2013-09-17 16:43:11.000000000 +0100
+++ syslog-ng-3.5.0beta3-modified/contrib/systemd/syslog-ng.service 2013-10-17 15:56:13.085757469 +0100
@@ -5,7 +5,7 @@
[Service]
Type=notify
Sockets=syslog.socket
-ExecStart=/usr/sbin/syslog-ng -F
+ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid
ExecReload=/bin/kill -HUP $MAINPID
StandardOutput=null
Restart=on-failure

6
syslog-ng.conf
View File

@ -1,4 +1,5 @@
@version:3.3
@version:3.5
@include "scl.conf"
# syslog-ng configuration file.
#
@ -22,8 +23,7 @@ options {
};
source s_sys {
file ("/proc/kmsg" program_override("kernel") flags(kernel));
unix-dgram ("/dev/log");
system();
internal();
# udp(ip(0.0.0.0) port(514));
};

86
syslog-ng.spec
View File

@ -2,19 +2,18 @@
%global ivykis_ver 0.36.1
Name: syslog-ng
Version: 3.4.7
Version: 3.5.4.1
Release: 1%{?dist}
Summary: Next-generation syslog server
Group: System Environment/Daemons
License: GPLv2+
Url: http://www.balabit.com/network-security/syslog-ng
URL: http://www.balabit.com/network-security/syslog-ng
Source0: http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
Source1: syslog-ng.conf
Source2: syslog-ng.logrotate
Patch0: syslog-ng-3.4.3-syslog-ng.service.patch
Patch0: syslog-ng-3.5.0-syslog-ng.service.patch
Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
@ -25,24 +24,16 @@ BuildRequires: bison, flex
BuildRequires: eventlog-devel >= %{evtlog_ver}
BuildRequires: glib2-devel >= 2.10.1
BuildRequires: ivykis-devel >= %{ivykis_ver}
BuildRequires: json-c-devel
#BuildRequires: json-glib-devel
BuildRequires: libcap-devel
BuildRequires: libdbi-devel
BuildRequires: libnet-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel >= 6.1
BuildRequires: tcp_wrappers-devel
BuildRequires: libuuid-devel
BuildRequires: libesmtp-devel
BuildRequires: libmongo-client-devel
BuildRequires: GeoIP-devel
#BuildRequires: librabbitmq-devel
BuildRequires: systemd-devel
BuildRequires: hiredis-devel
# Test suite
BuildRequires: python
# Test suite: the SQL tests
BuildRequires: libdbi-dbd-sqlite
Requires: logrotate
Requires: ivykis >= %{ivykis_ver}
@ -60,31 +51,29 @@ Conflicts: filesystem < 3
%description
syslog-ng, as the name shows, is a syslogd replacement, but with new
functionality for the new generation. The original syslogd allows
messages only to be sorted based on priority/facility pairs; syslog-ng
adds the possibility to filter based on message contents using regular
expressions. The new configuration scheme is intuitive and powerful.
Forwarding logs over TCP and remembering all forwarding hops makes it
ideal for firewalled environments.
syslog-ng is an enhanced log daemon, supporting a wide range of input and
output methods: syslog, unstructured text, message queues, databases (SQL
and NoSQL alike) and more.
Key features:
* receive and send RFC3164 and RFC5424 style syslog messages
* work with any kind of unstructured data
* receive and send JSON formatted messages
* classify and structure logs with builtin parsers (csv-parser(),
db-parser(), ...)
* normalize, crunch and process logs as they flow through the system
* hand on messages for further processing using message queues (like
AMQP), files or databases (like PostgreSQL or MongoDB).
%package libdbi
Summary: libdbi support for %{name}
%package redis
Summary: redis support for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description libdbi
This module supports a large number of database systems via libdbi.
%package mongodb
Summary: mongodb support for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description mongodb
This module supports the mongodb database via libmongo-client.
%description redis
This module supports the redis key-value store via hiredis.
%package devel
@ -126,20 +115,22 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
--with-ivykis=system \
--with-libmongo-client=system \
--with-embedded-crypto \
--enable-man-pages \
--enable-ipv6 \
--enable-tcp-wrapper \
--enable-pcre \
--enable-spoof-source \
--disable-spoof-source \
--enable-linux-caps \
--enable-sql \
--enable-json \
--disable-sql \
--disable-json \
--enable-ssl \
--enable-smtp \
--enable-geoip \
--disable-smtp \
--disable-geoip \
--enable-shared \
--disable-static \
--enable-dynamic-linking \
--enable-systemd \
--enable-redis \
--disable-amqp \
--with-librabbitmq-client=no
@ -244,8 +235,7 @@ fi
%{_bindir}/update-patterndb
%{_libdir}/lib%{name}-%{version}.so
%{_libdir}/%{name}/*.so
%exclude %{_libdir}/%{name}/libafsql.so
%exclude %{_libdir}/%{name}/libafmongodb.so
%exclude %{_libdir}/%{name}/libredis.so
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/syslog-ng.vim
@ -263,11 +253,8 @@ fi
%{_mandir}/man5/syslog-ng.conf.5*
%{_mandir}/man8/syslog-ng.8*
%files libdbi
%{_libdir}/%{name}/libafsql.so
%files mongodb
%{_libdir}/%{name}/libafmongodb.so
%files redis
%{_libdir}/%{name}/libredis.so
%files devel
%{_libdir}/libsyslog-ng.so
@ -277,6 +264,13 @@ fi
%changelog
* Mon Jun 2 2014 Peter Czanik <czanik@balabit.hu> - 3.5.4.1-1
- Update to syslog-ng 3.5.4.1
- enable SCL in syslog-ng.conf
- use system() in syslog-ng.conf
- add redis support to separate subpackage
due to dependencies
* Wed Dec 25 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.7-1
- Update to syslog-ng 3.4.7