update to syslog-ng 3.6 rc1
This commit is contained in:
parent
91b21affc4
commit
df44319caf
|
@ -1,12 +0,0 @@
|
||||||
diff -ruN syslog-ng-3.5.0beta3/contrib/systemd/syslog-ng.service syslog-ng-3.5.0beta3-modified/contrib/systemd/syslog-ng.service
|
|
||||||
--- syslog-ng-3.5.0beta3/contrib/systemd/syslog-ng.service 2013-09-17 16:43:11.000000000 +0100
|
|
||||||
+++ syslog-ng-3.5.0beta3-modified/contrib/systemd/syslog-ng.service 2013-10-17 15:56:13.085757469 +0100
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
[Service]
|
|
||||||
Type=notify
|
|
||||||
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
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- syslog-ng-3.6.0alpha3/contrib/systemd/syslog-ng.service.old 2014-08-22 11:35:58.270943345 +0200
|
||||||
|
+++ syslog-ng-3.6.0alpha3/contrib/systemd/syslog-ng.service 2014-08-22 11:36:54.706942527 +0200
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=notify
|
||||||
|
-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
|
|
@ -1,4 +1,4 @@
|
||||||
@version:3.5
|
@version:3.6
|
||||||
@include "scl.conf"
|
@include "scl.conf"
|
||||||
|
|
||||||
# syslog-ng configuration file.
|
# syslog-ng configuration file.
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
%global ivykis_ver 0.36.1
|
%global ivykis_ver 0.36.1
|
||||||
|
|
||||||
Name: syslog-ng
|
Name: syslog-ng
|
||||||
Version: 3.5.6
|
Version: 3.6.0rc1
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Next-generation syslog server
|
Summary: Next-generation syslog server
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -13,7 +13,7 @@ Source0: http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{
|
||||||
Source1: syslog-ng.conf
|
Source1: syslog-ng.conf
|
||||||
Source2: syslog-ng.logrotate
|
Source2: syslog-ng.logrotate
|
||||||
|
|
||||||
Patch0: syslog-ng-3.5.0-syslog-ng.service.patch
|
Patch0: syslog-ng-3.6.0-syslog-ng.service.patch
|
||||||
Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
|
Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
|
||||||
Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
|
Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@ BuildRequires: eventlog-devel >= %{evtlog_ver}
|
||||||
BuildRequires: glib2-devel >= 2.10.1
|
BuildRequires: glib2-devel >= 2.10.1
|
||||||
BuildRequires: ivykis-devel >= %{ivykis_ver}
|
BuildRequires: ivykis-devel >= %{ivykis_ver}
|
||||||
BuildRequires: json-c-devel
|
BuildRequires: json-c-devel
|
||||||
#BuildRequires: json-glib-devel
|
|
||||||
BuildRequires: libcap-devel
|
BuildRequires: libcap-devel
|
||||||
BuildRequires: libdbi-devel
|
BuildRequires: libdbi-devel
|
||||||
BuildRequires: libnet-devel
|
BuildRequires: libnet-devel
|
||||||
|
@ -39,7 +38,6 @@ BuildRequires: libmongo-client-devel
|
||||||
BuildRequires: GeoIP-devel
|
BuildRequires: GeoIP-devel
|
||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
BuildRequires: hiredis-devel
|
BuildRequires: hiredis-devel
|
||||||
#BuildRequires: librabbitmq-devel
|
|
||||||
|
|
||||||
# Test suite
|
# Test suite
|
||||||
BuildRequires: python
|
BuildRequires: python
|
||||||
|
@ -175,9 +173,8 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
|
||||||
--enable-man-pages \
|
--enable-man-pages \
|
||||||
--enable-ipv6 \
|
--enable-ipv6 \
|
||||||
--enable-tcp-wrapper \
|
--enable-tcp-wrapper \
|
||||||
--enable-pcre \
|
|
||||||
--enable-spoof-source \
|
--enable-spoof-source \
|
||||||
--enable-linux-caps \
|
--with-linux-caps=auto \
|
||||||
--enable-sql \
|
--enable-sql \
|
||||||
--enable-json \
|
--enable-json \
|
||||||
--enable-ssl \
|
--enable-ssl \
|
||||||
|
@ -233,7 +230,7 @@ rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} make check
|
LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} VERBOSE=1 make check
|
||||||
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
@ -276,7 +273,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc AUTHORS COPYING NEWS
|
%doc AUTHORS COPYING NEWS.md
|
||||||
%doc doc/security/*.txt
|
%doc doc/security/*.txt
|
||||||
%doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
|
%doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
|
||||||
|
|
||||||
|
@ -294,7 +291,7 @@ fi
|
||||||
%{_bindir}/loggen
|
%{_bindir}/loggen
|
||||||
%{_bindir}/pdbtool
|
%{_bindir}/pdbtool
|
||||||
%{_bindir}/update-patterndb
|
%{_bindir}/update-patterndb
|
||||||
%{_libdir}/lib%{name}-%{version}.so
|
%{_libdir}/lib%{name}-3.6.so.*
|
||||||
%{_libdir}/%{name}/*.so
|
%{_libdir}/%{name}/*.so
|
||||||
%exclude %{_libdir}/%{name}/libafsql.so
|
%exclude %{_libdir}/%{name}/libafsql.so
|
||||||
%exclude %{_libdir}/%{name}/libafmongodb.so
|
%exclude %{_libdir}/%{name}/libafmongodb.so
|
||||||
|
@ -346,6 +343,11 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 26 2014 Peter Czanik <czanik@balabit.hu> - 3.6.0rc1-1
|
||||||
|
- update to syslog-ng 3.6.0rc1
|
||||||
|
- removed --enable-pcre, as it's always required
|
||||||
|
- configuration file version bump to 3.6
|
||||||
|
|
||||||
* Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 3.5.6-3
|
* Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 3.5.6-3
|
||||||
- Rebuild for rpm bug 1131960
|
- Rebuild for rpm bug 1131960
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue