Update to syslog-ng 3.4.3

This commit is contained in:
Jose Pedro Oliveira 2013-08-15 16:08:21 +01:00
parent fe5f5c69c4
commit 218a030008
5 changed files with 21 additions and 17 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ syslog-ng_3.1.1.tar.gz
/syslog-ng_3.3.8.tar.gz
/syslog-ng_3.4.0rc2.tar.gz
/syslog-ng_3.4.1.tar.gz
/syslog-ng_3.4.3.tar.gz

View File

@ -1 +1 @@
6d6c244abe6188a640740bac7dc01642 syslog-ng_3.4.1.tar.gz
80b873a11b3e02706bc3f2430b9be068 syslog-ng_3.4.3.tar.gz

View File

@ -1,12 +0,0 @@
diff -ruN syslog-ng-3.3.5-orig/contrib/systemd/syslog-ng.service syslog-ng-3.3.5/contrib/systemd/syslog-ng.service
--- syslog-ng-3.3.5-orig/contrib/systemd/syslog-ng.service 2012-06-27 01:15:11.000000000 +0100
+++ syslog-ng-3.3.5/contrib/systemd/syslog-ng.service 2012-06-28 01:16:02.587991449 +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

View File

@ -0,0 +1,12 @@
diff -ruN syslog-ng-3.4.3/contrib/systemd/syslog-ng.service syslog-ng-3.4.3-modified/contrib/systemd/syslog-ng.service
--- syslog-ng-3.4.3/contrib/systemd/syslog-ng.service 2013-08-13 10:25:18.000000000 +0100
+++ syslog-ng-3.4.3-modified/contrib/systemd/syslog-ng.service 2013-08-13 22:21:10.780304735 +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

View File

@ -2,8 +2,8 @@
%global ivykis_ver 0.36.1
Name: syslog-ng
Version: 3.4.1
Release: 2%{?dist}
Version: 3.4.3
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.4.3-syslog-ng.service.patch
Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
@ -223,7 +223,7 @@ fi
%files
%doc AUTHORS COPYING ChangeLog NEWS
%doc AUTHORS COPYING NEWS
%doc doc/security/*.txt
%doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
@ -276,6 +276,9 @@ fi
%changelog
* Tue Aug 13 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.3-1
- Update to syslog-ng 3.4.3
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild