commit 4b94cfadbc4a4aa3b438646d2efb88e74e16b4fe
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Sun Feb 3 14:14:14 2013 +0100
- up to 3.3.6
syslog-ng-systemd.patch | 13 +++++--------
syslog-ng.spec | 10 +++++-----
2 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 48c75ab..f700006 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -24,17 +24,17 @@ Summary: Syslog-ng - new generation of the system logger
Summary(pl.UTF-8): Syslog-ng - systemowy demon logujący nowej generacji
Summary(pt_BR.UTF-8): Daemon de log nova geração
Name: syslog-ng
-Version: 3.3.5
-Release: 3
+Version: 3.3.6
+Release: 1
License: GPL v2+ with OpenSSL exception
Group: Daemons
Source0:
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5: a69e725854301ecda26dbe51f3a10645
+# Source0-md5: c931d33320bd729e25d338285ac1cef5
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.logrotate
Source4:
http://www.balabit.com/support/documentation/%{name}-ose-v3.3-guide-admin-en.pdf
-# Source4-md5: bb23e36a8f44956858f2d622f9d1826d
+# Source4-md5: b61f2db076ce78cd2030b13bc6680f3d
Source5: %{name}-simple.conf
Source6: %{name}.upstart
Patch0: %{name}-datadir.patch
@@ -240,7 +240,7 @@ cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
for i in . lib/ivykis; do
cd $i
%{__libtoolize}
- %{__aclocal} -I m4
+ %{__aclocal} `[ -d m4 ] && echo '-I m4'`
%{__autoconf}
%{__autoheader}
%{__automake}
diff --git a/syslog-ng-systemd.patch b/syslog-ng-systemd.patch
index ac53e07..ce4d663 100644
--- a/syslog-ng-systemd.patch
+++ b/syslog-ng-systemd.patch
@@ -1,18 +1,15 @@
---- syslog-ng-3.3.1/contrib/systemd/syslog-ng.service~ 2011-09-09
09:14:53.000000000 +0200
-+++ syslog-ng-3.3.1/contrib/systemd/syslog-ng.service 2011-11-29
18:24:53.010449488 +0100
-@@ -2,11 +2,13 @@
- Description=System Logger Daemon
+--- syslog-ng-3.3.6/contrib/systemd/syslog-ng.service~ 2012-08-15
10:06:08.000000000 +0200
++++ syslog-ng-3.3.6/contrib/systemd/syslog-ng.service 2013-02-03
14:06:49.380549410 +0100
+@@ -3,8 +3,10 @@
+ Documentation=man:syslog-ng(8)
[Service]
+EnvironmentFile=-/etc/sysconfig/syslog-ng
Sockets=syslog.socket
--ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
-ExecStart=/usr/sbin/syslog-ng -F
+ExecStartPre=-/bin/systemctl stop systemd-kmsg-syslogd.service
+ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf
--worker-threads=1024
ExecReload=/bin/kill -HUP $MAINPID
StandardOutput=null
- [Install]
- WantedBy=multi-user.target
-+Alias=syslog.service
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/4b94cfadbc4a4aa3b438646d2efb88e74e16b4fe
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
