[syslog-ng] * Update to a pre-3.2.5 git version

[Jose Pedro Oliveira]

commit 38ce8d6151f6a137f74da280e622cc478b256e82
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sun Oct 23 03:25:04 2011 +0100

     * Update to a pre-3.2.5 git version

 .gitignore                                       |    1 +
 sources                                          |    2 +-
 syslog-ng-3.2.4-chain-hostnames-processing.patch |   29 ----------------------
 syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch  |   19 --------------
 syslog-ng-3.2.4-systemd-acquired-fd.patch        |   29 ----------------------
 syslog-ng-3.2.5-syslog-ng.service.patch          |   16 ++++++++++++
 syslog-ng.service                                |   12 ---------
 syslog-ng.spec                                   |   28 +++++++++++++--------
 8 files changed, 35 insertions(+), 101 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df63665..be47d31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ syslog-ng_3.1.1.tar.gz
 /syslog-ng-3.2.3-20110424.tar.bz2
 /syslog-ng_3.2.3.tar.gz
 /syslog-ng_3.2.4.tar.gz
+/syslog-ng-3.2.4+20111022+0801.tar.gz
diff --git a/sources b/sources
index 501145d..8641c1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5995f7dad0053a478b60a63f6f754203  syslog-ng_3.2.4.tar.gz
+eaedbca9fcdada1410673aa988dc80c5  syslog-ng-3.2.4+20111022+0801.tar.gz
diff --git a/syslog-ng-3.2.5-syslog-ng.service.patch b/syslog-ng-3.2.5-syslog-ng.service.patch
new file mode 100644
index 0000000..d529b3c
--- /dev/null
+++ b/syslog-ng-3.2.5-syslog-ng.service.patch
@@ -0,0 +1,16 @@
+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 @@
+ 
+ [Service]
+ Sockets=syslog.socket
++EnvironmentFile=-/etc/sysconfig/syslog-ng
+ ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
+-ExecStart=/usr/sbin/syslog-ng -F
++ExecStart=/sbin/syslog-ng $SYSLOGNG_OPTIONS
+ ExecReload=/bin/kill -HUP $MAINPID
++StandardOutput=null
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/syslog-ng.spec b/syslog-ng.spec
index e891bbd..e7f9d51 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -5,21 +5,21 @@
 
 Name: syslog-ng
 Version: 3.2.4
-Release: 9%{?dist}
+Release: 10.20111022%{?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://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
 Source1: syslog-ng.conf
-Source2: syslog-ng.service
+#Source2: syslog-ng.service
 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
-Patch2: syslog-ng-3.2.4-systemd-acquired-fd.patch
+Patch1: syslog-ng-3.2.5-syslog-ng.service.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -81,10 +81,9 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}+20111022+0801
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -106,6 +105,7 @@ developing applications that use %{name}.
     --localstatedir=%{_sharedstatedir}/%{name} \
     --datadir=%{_datadir}/%{name} \
     --with-module-dir=/%{_lib}/%{name} \
+    --with-systemdsystemunitdir=%{_unitdir} \
     --enable-ipv6 \
     --enable-tcp-wrapper \
     --enable-pcre \
@@ -132,10 +132,6 @@ make DESTDIR=%{buildroot} install
 #%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
 %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
 
-# install the service script
-%{__install} -d -m 755 %{buildroot}%{_unitdir}
-%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
-
 %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
 %{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
@@ -271,6 +267,16 @@ fi
 
 
 %changelog
+* 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
+  Patches dropped:
+  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
+  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
 - Patch syslog-ng-3.2.4-systemd-acquired-fd.patch (see bug #742624)