rpms
/
syslog-ng
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to syslog-ng 3.8.1

This commit is contained in:
Your Name 2016-09-15 15:33:20 +02:00
parent 048bff0d9e
commit 99d9bf8bcb
7 changed files with 95 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,3 +25,4 @@ syslog-ng_3.1.1.tar.gz
/syslog-ng_3.6.0rc1.tar.gz
/syslog-ng_3.6.1.tar.gz
/syslog-ng_3.6.2.tar.gz
/syslog-ng-3.8.1.tar.gz

2
sources
View File

@ -1 +1 @@
6928e9be3499a2e9ae52ea8aa204b165 syslog-ng_3.6.2.tar.gz
acf14563cf5ce435db8db35486ce66af syslog-ng-3.8.1.tar.gz

12
syslog-ng-3.3.6-tests-functional-sql-test.patch
View File

@ -1,12 +0,0 @@
diff -ruN syslog-ng-3.3.3/tests/functional/globals.py syslog-ng-3.3.3-modified/tests/functional/globals.py
--- syslog-ng-3.3.3/tests/functional/globals.py 2011-09-20 07:39:14.000000000 +0100
+++ syslog-ng-3.3.3-modified/tests/functional/globals.py 2012-01-16 01:39:24.206723249 +0000
@@ -7,7 +7,7 @@
return False
def has_module(module):
- avail_mods = os.popen('../../syslog-ng/syslog-ng -V | grep ^Available-Modules: ', 'r').read()
+ avail_mods = os.popen('../../syslog-ng/syslog-ng -V | grep ^Default-Modules: ', 'r').read()
if avail_mods.find(module) != -1:
return True
return False

12
syslog-ng-3.4.0beta1-tests-functional-control.py.patch
View File

@ -1,12 +0,0 @@
diff -ruN syslog-ng-3.4.0beta1/tests/functional/control.py syslog-ng-3.4.0beta1-modified/tests/functional/control.py
--- syslog-ng-3.4.0beta1/tests/functional/control.py 2012-11-01 08:29:14.000000000 +0000
+++ syslog-ng-3.4.0beta1-modified/tests/functional/control.py 2012-12-20 17:48:08.236401614 +0000
@@ -35,7 +35,7 @@
for (root, dirs, files) in os.walk(os.path.abspath(os.path.join(os.environ['top_builddir'], 'modules'))):
module_path = ':'.join(map(lambda x: root + '/' + x + '/.libs', dirs))
break
- rc = os.execl('../../syslog-ng/syslog-ng', '../../syslog-ng/syslog-ng', '-f', 'test.conf', '--fd-limit', '1024', '-F', verbose_opt, '-p', 'syslog-ng.pid', '-R', 'syslog-ng.persist', '--no-caps', '--enable-core', '--seed', '--module-path', module_path)
+ rc = os.execl('../../syslog-ng/syslog-ng', '../../syslog-ng/syslog-ng', '-f', 'test.conf', '--fd-limit', '1024', '-F', verbose_opt, '-p', '/var/tmp/syslog-ng.pid', '-c', '/var/tmp/syslog-ng.ctl', '-R', '/var/tmp/syslog-ng.persist', '--no-caps', '--enable-core', '--seed', '--module-path', module_path)
sys.exit(rc)
time.sleep(5)
print_user("Syslog-ng started")

11
syslog-ng-3.6.2-syslog-ng.service.patch
View File

@ -1,11 +0,0 @@
--- syslog-ng-3.6.2/contrib/systemd/syslog-ng.service.old 2014-12-16 10:10:50.195264665 +0100
+++ syslog-ng-3.6.2/contrib/systemd/syslog-ng.service 2014-12-16 10:12:03.206266841 +0100
@@ -4,7 +4,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=journal
StandardError=journal

11
syslog-ng-3.7.0beta2-syslog-ng.service.patch Normal file
View File

@ -0,0 +1,11 @@
--- syslog-ng-3.7.0beta2/contrib/systemd/syslog-ng.service.old 2015-08-07 13:18:52.650666865 +0200
+++ syslog-ng-3.7.0beta2/contrib/systemd/syslog-ng.service 2015-08-07 13:20:20.762689543 +0200
@@ -4,7 +4,7 @@
[Service]
Type=notify
-ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS
+ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS -p /var/run/syslogd.pid
ExecReload=/bin/kill -HUP $MAINPID
EnvironmentFile=-/etc/default/syslog-ng
EnvironmentFile=-/etc/sysconfig/syslog-ng

113
syslog-ng.spec
View File

@ -2,20 +2,18 @@
%global ivykis_ver 0.36.1
Name: syslog-ng
Version: 3.6.2
Release: 5%{?dist}
Version: 3.8.1
Release: 1%{?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/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
URL: https://syslog-ng.org/
Source0: https://github.com/balabit/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz
Source1: syslog-ng.conf
Source2: syslog-ng.logrotate
Patch0: syslog-ng-3.6.2-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
Patch0: syslog-ng-3.7.0beta2-syslog-ng.service.patch
BuildRequires: perl-generators
BuildRequires: systemd-units
@ -40,9 +38,18 @@ BuildRequires: GeoIP-devel
BuildRequires: systemd-devel
BuildRequires: hiredis-devel
BuildRequires: riemann-c-client-devel
# BuildRequires: python-devel
BuildRequires: java-devel
BuildRequires: libcurl-devel
# Test suite
BuildRequires: python
BuildRequires: python-unittest2
BuildRequires: python-nose
BuildRequires: python-ply
BuildRequires: python-pep8
BuildRequires: pylint
BuildRequires: python-six
# Test suite: the SQL tests
BuildRequires: libdbi-dbd-sqlite
@ -60,6 +67,7 @@ Obsoletes: syslog-ng-vim < 2.0.8-1
# Fedora 17’s unified filesystem (/usr-move)
Conflicts: filesystem < 3
Obsoletes: syslog-ng-json
%description
syslog-ng is an enhanced log daemon, supporting a wide range of input and
@ -104,15 +112,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description smtp
This module supports sending e-mail alerts through an smtp server.
%package json
Summary: json support for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description json
This module supports writing and parsing JSON logs.
%package java
Summary: Java destination support for syslog-ng
Group: System/Libraries
Requires: %{name} = %{version}
%description java
This package provides java destination support for syslog-ng.
%package geoip
Summary: geoip support for %{name}
@ -140,6 +146,22 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description riemann
This module supports the riemann monitoring server.
%package curl
Summary: curl (HTTP) support for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description curl
This module supports the curl (HTTP) destination.
#%package python
#Summary: Python destination support for syslog-ng
#Group: System/Libraries
#Requires: %{name} = %{version}
#
#%description python
#This package provides python destination support for syslog-ng.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
@ -153,8 +175,6 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
# fix perl path
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@ -173,13 +193,13 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir}/%{name} \
--localstatedir=%{_sharedstatedir}/%{name} \
--datadir=%{_datadir}/%{name} \
--datadir=%{_datadir} \
--with-module-dir=/%{_libdir}/%{name} \
--with-systemdsystemunitdir=%{_unitdir} \
--with-ivykis=system \
--with-libmongo-client=system \
--with-embedded-crypto \
--enable-man-pages \
--enable-manpages \
--enable-ipv6 \
--enable-tcp-wrapper \
--enable-spoof-source \
@ -195,7 +215,12 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
--enable-systemd \
--enable-redis \
--disable-amqp \
--with-librabbitmq-client=no
--with-librabbitmq-client=no \
--disable-python \
--enable-java \
--disable-java-modules \
--enable-riemann
# remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -238,9 +263,8 @@ rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng-test.pc
rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
#%check
# disabled temporarily due to a false positive
#LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} VERBOSE=1 make check
%check
LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} VERBOSE=1 make check
%post
@ -284,7 +308,6 @@ fi
%files
%doc AUTHORS COPYING NEWS.md
%doc doc/security/*.txt
%doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
%dir %{_sysconfdir}/%{name}
@ -300,16 +323,19 @@ fi
%{_sbindir}/syslog-ng-ctl
%{_bindir}/loggen
%{_bindir}/pdbtool
%{_bindir}/dqtool
%{_bindir}/update-patterndb
%{_libdir}/lib%{name}-3.6.so.*
%{_libdir}/lib%{name}-3.8.so.*
%{_libdir}/%{name}/*.so
%exclude %{_libdir}/%{name}/libafsql.so
%exclude %{_libdir}/%{name}/libafmongodb.so
%exclude %{_libdir}/%{name}/libredis.so
%exclude %{_libdir}/%{name}/libafsmtp.so
%exclude %{_libdir}/%{name}/libjson-plugin.so
%exclude %{_libdir}/%{name}/libtfgeoip.so
%exclude %{_libdir}/%{name}/libriemann.so
%exclude %{_libdir}/%{name}/libgeoip-plugin.so
%exclude %{_libdir}/%{name}/libcurl.so
# %exclude %{_libdir}/%{name}/libmod-python.so
%exclude %{_libdir}/%{name}/libmod-java.so
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/syslog-ng.vim
@ -339,23 +365,48 @@ fi
%files smtp
%{_libdir}/%{name}/libafsmtp.so
%files json
%{_libdir}/%{name}/libjson-plugin.so
%files java
%attr(755,root,root) %{_libdir}/syslog-ng/libmod-java.so
%dir %{_libdir}/%{name}/java-modules/
%{_libdir}/%{name}/java-modules/*
%files geoip
%{_libdir}/%{name}/libtfgeoip.so
%{_libdir}/%{name}/libgeoip-plugin.so
%files riemann
%{_libdir}/%{name}/libriemann.so
%files curl
%{_libdir}/%{name}/libcurl.so
#%files python
#%{_libdir}/python2.7/site-packages/syslogng-1.0-py2.7.egg-info
#%dir %{_libdir}/python2.7/site-packages/syslogng/
#%dir %{_libdir}/python2.7/site-packages/syslogng/debuggercli/
#%{_libdir}/python2.7/site-packages/syslogng/*
#%{_libdir}/python2.7/site-packages/syslogng/debuggercli/*
#%{_libdir}/%{name}/libmod-python.so
%files devel
%{_libdir}/libsyslog-ng.so
%{_libdir}/libsyslog-ng-native-connector.a
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/syslog-ng.pc
%{_libdir}/pkgconfig/syslog-ng-native-connector.pc
%{_datadir}/%{name}/tools/
%changelog
* Thu Sep 15 2016 Peter Czanik <peter@czanik.hu> - 3.8.1-1
- update to 3.8.1
- new URL and source URL (moved to GitHub)
- remove/update obsolated patches
- enable java, curl (HTTP) destinations
- python destination added, but disabled
- merge JSON support to core
- added dependencies for "make test" and new features
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild