[syslog-ng] * New 3.2.5 pre-release tarball

[Jose Pedro Oliveira]

commit 38e51b6bd6a53b0b4c09681e1915c286498bce56
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Tue Oct 25 19:10:47 2011 +0100

     * New 3.2.5 pre-release tarball

 syslog-ng-3.2.5-syslog-ng.service.patch |   12 +++++-------
 syslog-ng.spec                          |   14 +++++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/syslog-ng-3.2.5-syslog-ng.service.patch b/syslog-ng-3.2.5-syslog-ng.service.patch
index d529b3c..d69cab0 100644
--- a/syslog-ng-3.2.5-syslog-ng.service.patch
+++ b/syslog-ng-3.2.5-syslog-ng.service.patch
@@ -1,7 +1,7 @@
-diff -ruN syslog-ng-3.2.4+20111022+0801/contrib/systemd/syslog-ng.service syslog-ng-3.2.4+20111022+0801-modified/contrib/systemd/syslog-ng.service
---- syslog-ng-3.2.4+20111022+0801/contrib/systemd/syslog-ng.service	2011-07-01 15:26:29.000000000 +0100
-+++ syslog-ng-3.2.4+20111022+0801-modified/contrib/systemd/syslog-ng.service	2011-10-23 02:17:50.197093822 +0100
-@@ -3,9 +3,11 @@
+diff -ruN syslog-ng-3.2.4+20111023+0856/contrib/systemd/syslog-ng.service syslog-ng-3.2.4+20111023+0856-modified/contrib/systemd/syslog-ng.service
+--- syslog-ng-3.2.4+20111023+0856/contrib/systemd/syslog-ng.service	2011-10-23 07:48:18.000000000 +0100
++++ syslog-ng-3.2.4+20111023+0856-modified/contrib/systemd/syslog-ng.service	2011-10-25 18:51:10.853824115 +0100
+@@ -3,8 +3,9 @@
  
  [Service]
  Sockets=syslog.socket
@@ -10,7 +10,5 @@ diff -ruN syslog-ng-3.2.4+20111022+0801/contrib/systemd/syslog-ng.service syslog
 -ExecStart=/usr/sbin/syslog-ng -F
 +ExecStart=/sbin/syslog-ng $SYSLOGNG_OPTIONS
  ExecReload=/bin/kill -HUP $MAINPID
-+StandardOutput=null
+ StandardOutput=null
  
- [Install]
- WantedBy=multi-user.target
diff --git a/syslog-ng.spec b/syslog-ng.spec
index e7f9d51..01786b7 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -5,14 +5,14 @@
 
 Name: syslog-ng
 Version: 3.2.4
-Release: 10.20111022%{?dist}
+Release: 11.20111023%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
 License: GPLv2+
 Url: http://www.balabit.com/network-security/syslog-ng
 #Source0: http://www.balabit.com/downloads/files?path=/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
-Source0: http://people.balabit.hu/bazsi/%{name}-%{version}+20111022+0801.tar.gz
+Source0: http://people.balabit.hu/bazsi/%{name}-%{version}+20111023+0856.tar.gz
 Source1: syslog-ng.conf
 #Source2: syslog-ng.service
 Source3: syslog-ng.sysconfig
@@ -81,7 +81,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}+20111022+0801
+%setup -q -n %{name}-%{version}+20111023+0856
 %patch0 -p1
 %patch1 -p1
 
@@ -220,7 +220,6 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog NEWS
 %doc doc/security/*.txt
-%doc doc/examples/syslog-ng.conf.sample
 %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
 
 %dir %{_sysconfdir}/%{name}
@@ -267,6 +266,11 @@ fi
 
 
 %changelog
+* Tue Oct 25 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-11
+- New 3.2.5 pre-release tarball
+  https://lists.balabit.hu/pipermail/syslog-ng/2011-October/017491.html
+- Updated patch syslog-ng-3.2.5-syslog-ng.service.patch
+
 * Sat Oct 22 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-10
 - 3.2.5 pre-release: changelog and tarball from
   https://lists.balabit.hu/pipermail/syslog-ng/2011-October/017462.html
@@ -274,7 +278,7 @@ fi
   syslog-ng-3.2.4-systemd-acquired-fd.patch
   syslog-ng-3.2.4-chain-hostnames-processing.patch
 - New configure option: --with-systemdsystemunitdir
-- Patch the included syslog-ng.service file
+- Patched the included syslog-ng.service file
   syslog-ng-3.2.5-syslog-ng.service.patch
 
 * Mon Oct 10 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-9