From 393a5c58113a16c7c7df5390b074a189f722e4d8 Mon Sep 17 00:00:00 2001
From: Peter Czanik <pczanik@fang.fa.gau.hu>
Date: Fri, 23 May 2014 11:33:52 +0200
Subject: [PATCH] minor configuration changes and moving modules with external
 dependencies into subpackages

---
 syslog-ng.conf |  4 ++--
 syslog-ng.spec | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 5c0dbfb..5919f9a 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,5 @@
 @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));
 };
diff --git a/syslog-ng.spec b/syslog-ng.spec
index e0cb9d0..391f13b 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -3,7 +3,7 @@
 
 Name: syslog-ng
 Version: 3.5.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -96,6 +96,34 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 This module supports the mongodb database via libmongo-client.
 
 
+%package smtp
+Summary: smtp support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description smtp
+This module supports sending e-mail alerts through an smtp server.
+
+
+%package json
+Summary: json support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description json
+This module supports writing and parsing JSON logs.
+
+
+%package geoip
+Summary: geoip support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description geoip
+This template function returns the 2-letter country code of
+any IPv4 address or host.
+
+
 %package redis
 Summary: redis support for %{name}
 Group: Development/Libraries
@@ -267,6 +295,9 @@ fi
 %exclude %{_libdir}/%{name}/libafsql.so
 %exclude %{_libdir}/%{name}/libafmongodb.so
 %exclude %{_libdir}/%{name}/libredis.so
+%exclude %{_libdir}/%{name}/libafsmtp.so
+%exclude %{_libdir}/%{name}/libjson-plugin.so
+%exclude %{_libdir}/%{name}/libtfgeoip.so
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/syslog-ng.vim
@@ -293,6 +324,16 @@ fi
 %files redis
 %{_libdir}/%{name}/libredis.so
 
+%files smtp
+%{_libdir}/%{name}/libafsmtp.so
+
+%files json
+%{_libdir}/%{name}/libjson-plugin.so
+
+%files geoip
+%{_libdir}/%{name}/libtfgeoip.so
+
+
 %files devel
 %{_libdir}/libsyslog-ng.so
 %{_includedir}/%{name}/
@@ -301,6 +342,12 @@ fi
 
 
 %changelog
+* Wed May 23 2014 Peter Czanik <czanik@balabit.hu> - 3.5.4.1-2
+- enable SCL in syslog-ng.conf
+- use system() in syslog-ng.conf
+- move JSON, SMTP and GeoIP support to separate subpackages
+  due to dependencies
+
 * Tue Mar 18 2014 Jose Pedro Oliveira <jose.p.oliveira.oss at gmail.com> - 3.5.4.1-1
 - Update to syslog-ng 3.5.4.1