From c582b80bc778df96d3d038376726a937cd9232d5 Mon Sep 17 00:00:00 2001
From: Jose Pedro Oliveira <jpo@di.uminho.pt>
Date: Jun 27 2011 14:37:27 +0000
Subject:  * Patch syslog-ng-3.2.4-chain-hostnames-processing.patch (#713965)

 * Enabled support for capability management (--enable-linux-caps)

---

diff --git a/syslog-ng-3.2.4-chain-hostnames-processing.patch b/syslog-ng-3.2.4-chain-hostnames-processing.patch
new file mode 100644
index 0000000..bb76f24
--- /dev/null
+++ b/syslog-ng-3.2.4-chain-hostnames-processing.patch
@@ -0,0 +1,29 @@
+From: Balazs Scheidler <bazsi@balabit.hu>
+Date: Mon, 27 Jun 2011 07:47:51 +0000 (+0200)
+Subject: fixed chain-hostnames() processing
+X-Git-Url: http://git.balabit.hu/?p=bazsi%2Fsyslog-ng-3.2.git;a=commitdiff_plain;h=2db971fc37471e39f6a8b34595ca23833166831e
+
+fixed chain-hostnames() processing
+
+The marking of local messages was broken, and as a result hostnames generated
+by chain-hostnames(yes) got also broken: instead of <source>@<hostname>
+<hostname>/<hostname> got generated.
+
+Reported-By: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+Signed-off-by: Balazs Scheidler <bazsi@balabit.hu>
+---
+
+diff --git a/lib/logreader.c b/lib/logreader.c
+index 7508abf..400668a 100644
+--- a/lib/logreader.c
++++ b/lib/logreader.c
+@@ -280,6 +280,9 @@ log_reader_handle_line(LogReader *self, const guchar *line, gint length, GSockAd
+   m = log_msg_new((gchar *) line, length,
+                   saddr,
+                   &self->options->parse_options);
++
++  if (self->options->flags & LR_LOCAL)
++    m->flags |= LF_LOCAL;
+   
+   if (!m->saddr && self->peer_addr)
+     {
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 25905de..f158a8a 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -5,7 +5,7 @@
 
 Name: syslog-ng
 Version: 3.2.4
-Release: 4%{?dist}
+Release: 6%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -18,6 +18,7 @@ Source3: syslog-ng.sysconfig
 Source4: syslog-ng.logrotate
 
 Patch0: syslog-ng-3.2.4-disable-ssl-tests.patch
+Patch1: syslog-ng-3.2.4-chain-hostnames-processing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,12 +27,15 @@ BuildRequires: pkgconfig
 BuildRequires: libtool
 BuildRequires: eventlog-devel >= %{evtlog_ver}
 BuildRequires: glib2-devel >= 2.10.1
+BuildRequires: libcap-devel
 BuildRequires: libdbi-devel
 BuildRequires: libnet-devel
 #BuildRequires: openssl-devel
 BuildRequires: pcre-devel >= 6.1
 BuildRequires: tcp_wrappers-devel
 
+# Test suite
+BuildRequires: python
 # For the SQL tests
 BuildRequires: libdbi-dbd-sqlite
 
@@ -78,6 +82,7 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -103,6 +108,7 @@ developing applications that use %{name}.
     --enable-tcp-wrapper \
     --enable-pcre \
     --enable-spoof-source \
+    --enable-linux-caps \
     --enable-sql \
     --disable-ssl \
     --enable-shared \
@@ -152,8 +158,6 @@ for vimver in 72 73 ; do
     cd -
 done
 
-ldconfig -N -n %{buildroot}/%{_lib}
-
 find %{buildroot} -name "*.la" -exec rm -f {} \;
 
 
@@ -265,6 +269,12 @@ fi
 
 
 %changelog
+* Mon Jun 27 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-6
+- Patch syslog-ng-3.2.4-chain-hostnames-processing.patch (#713965)
+
+* Mon Jun 20 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-5
+- Enabled support for capability management (--enable-linux-caps)
+
 * Tue May 17 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-4
 - Enabled SQL support (subpackage syslog-ng-libdbi)