[syslog-ng/f18] * Update to 3.3.9

[Jose Pedro Oliveira]

commit 6b6d7219ef5190fff67cfc7315ac58e052872b4b
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sat Apr 20 08:54:24 2013 +0100

     * Update to 3.3.9

 syslog-ng-3.3.6-syslog-ng.service.patch |   12 ------------
 syslog-ng-3.3.9-syslog-ng.service.patch |   12 ++++++++++++
 syslog-ng.spec                          |   10 +++++++---
 3 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/syslog-ng-3.3.9-syslog-ng.service.patch b/syslog-ng-3.3.9-syslog-ng.service.patch
new file mode 100644
index 0000000..e6ba6bc
--- /dev/null
+++ b/syslog-ng-3.3.9-syslog-ng.service.patch
@@ -0,0 +1,12 @@
+diff -ruN syslog-ng-3.3.9/contrib/systemd/syslog-ng.service syslog-ng-3.3.9-modified/contrib/systemd/syslog-ng.service
+--- syslog-ng-3.3.9/contrib/systemd/syslog-ng.service	2013-04-15 14:26:23.000000000 +0100
++++ syslog-ng-3.3.9-modified/contrib/systemd/syslog-ng.service	2013-04-20 07:25:17.961727268 +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
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 0ba7ee6..62448c1 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,8 +2,8 @@
 %global ivykis_ver 0.30.5
 
 Name: syslog-ng
-Version: 3.3.8
-Release: 2%{?dist}
+Version: 3.3.9
+Release: 1%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -13,7 +13,7 @@ Source0: http://www.balabit.com/downloads/files?path=/syslog-ng/sources/%{versio
 Source1: syslog-ng.conf
 Source2: syslog-ng.logrotate
 
-Patch0: syslog-ng-3.3.6-syslog-ng.service.patch
+Patch0: syslog-ng-3.3.9-syslog-ng.service.patch
 Patch1: syslog-ng-3.2.5-tests-functional-control.py.patch
 Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
 
@@ -253,6 +253,10 @@ fi
 
 
 %changelog
+* Sat Apr 20 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.3.9-1
+- Update to 3.3.9
+- Rebased the syslog-ng.service patch (syslog-ng-3.3.9-syslog-ng.service.patch)
+
 * Sat Jan 19 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.3.8-2
 - Corrected bogus dates in the changelog section