From e803f395b4347af1835accf98abfaed836a1733b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 26 Jul 2016 12:50:36 +0200 Subject: [PATCH] - up to 3.7.3; builds without tests --- syslog-ng-link.patch | 7 ++++--- syslog-ng-systemd.patch | 10 +++++----- syslog-ng.spec | 28 +++++++++++++++++----------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch index d7d114b..255a281 100644 --- a/syslog-ng-link.patch +++ b/syslog-ng-link.patch @@ -11,14 +11,15 @@ # # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis. --- syslog-ng-3.6.3/syslog-ng-ctl/Makefile.am.orig 2015-06-08 15:44:04.000000000 +0200 +++ syslog-ng-3.6.3/syslog-ng-ctl/Makefile.am 2015-06-14 12:14:41.989973064 +0200 -@@ -10,5 +10,6 @@ +@@ -10,5 +10,6 @@ syslog_ng_ctl_syslog_ng_ctl_SOURCES = EXTRA_DIST += \ syslog-ng-ctl/control-client-unix.c --syslog_ng_ctl_syslog_ng_ctl_LDADD = lib/libsyslog-ng.la $(CRYPTO_LIBS) @BASE_LIBS@ @GLIB_LIBS@ @RESOLV_LIBS@ +-syslog_ng_ctl_syslog_ng_ctl_LDADD = lib/libsyslog-ng.la @BASE_LIBS@ @GLIB_LIBS@ @RESOLV_LIBS@ +- ++syslog_ng_ctl_syslog_ng_ctl_DEPENDENCIES = lib/libsyslog-ng.la +syslog_ng_ctl_syslog_ng_ctl_LDADD = -L${top_builddir}/lib/.libs -lsyslog-ng @SYSLOGNG_DEPS_LIBS@ +syslog_ng_ctl_syslog_ng_ctl_LINK = @SYSLOGNG_LINK@ - syslog_ng_ctl_syslog_ng_ctl_DEPENDENCIES = lib/libsyslog-ng.la lib/libsyslog-ng-crypto.la --- syslog-ng-3.6.3/lib/logproto/tests/Makefile.am.orig 2015-06-08 15:44:04.000000000 +0200 +++ syslog-ng-3.6.3/lib/logproto/tests/Makefile.am 2015-06-14 12:29:25.672597931 +0200 @@ -20,7 +20,7 @@ diff --git a/syslog-ng-systemd.patch b/syslog-ng-systemd.patch index 54c88ec..bbccfac 100644 --- a/syslog-ng-systemd.patch +++ b/syslog-ng-systemd.patch @@ -1,13 +1,13 @@ --- syslog-ng-3.6.2/contrib/systemd/syslog-ng.service~ 2014-12-15 16:48:45.000000000 +0200 +++ syslog-ng-3.6.2/contrib/systemd/syslog-ng.service 2015-06-01 08:06:32.632888085 +0300 -@@ -4,7 +4,9 @@ +@@ -4,7 +4,9 @@ Documentation=man:syslog-ng(8) [Service] Type=notify --ExecStart=/usr/sbin/syslog-ng -F +-ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS +EnvironmentFile=-/etc/sysconfig/syslog-ng +ExecStartPre=-/bin/systemctl stop systemd-kmsg-syslogd.service -+ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf -p /var/run/syslogd.pid --worker-threads=1024 ++ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf -p /var/run/syslogd.pid --worker-threads=1024 $SYSLOGNG_OPTS ExecReload=/bin/kill -HUP $MAINPID - StandardOutput=journal - StandardError=journal + EnvironmentFile=-/etc/default/syslog-ng + EnvironmentFile=-/etc/sysconfig/syslog-ng diff --git a/syslog-ng.spec b/syslog-ng.spec index 7a4cbbc..783547c 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -2,7 +2,7 @@ # - switch to LTS version??? where??? # - relies on libs in /usr which is wrong # (well, for modules bringing additional functionality it's acceptable IMO --q) - +# - package python module # # Conditional build: %bcond_with dynamic # link dynamically with glib, eventlog, pcre (modules are always linked dynamically) @@ -27,22 +27,22 @@ %else %define glib2_ver 1:2.24.0 %endif -%define mver 3.6 +%define mver 3.7 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.6.4 -Release: 3 +Version: 3.7.3 +Release: 1 License: GPL v2+ with OpenSSL exception Group: Daemons -Source0: https://my.balabit.com/downloads/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz -# Source0-md5: e9f401615e92e5eb27396c995c1446ba +Source0: https://github.com/balabit/syslog-ng/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 803d61a713d6d41a973942d417fec999 Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.logrotate Source4: http://www.balabit.com/support/documentation/syslog-ng-ose-%{mver}-guides/en/syslog-ng-ose-v%{mver}-guide-admin/pdf/%{name}-ose-v%{mver}-guide-admin.pdf -# Source4-md5: bb12c18aef655096987911c4a9fe3ffa +# Source4-md5: a236466d3f902d2918edd15b82e42076 Source5: %{name}-simple.conf Patch0: %{name}-datadir.patch Patch1: cap_syslog-vserver-workaround.patch @@ -81,7 +81,9 @@ BuildRequires: rpmbuild(macros) >= 1.623 %{?with_systemd:BuildRequires: systemd-devel >= 1:195} BuildRequires: which %if %{with tests} +BuildRequires: pylint BuildRequires: python +BuildRequires: python-pep8 BuildRequires: tzdata %endif %if %{without dynamic} @@ -475,8 +477,6 @@ exit 0 %attr(755,root,root) %{moduledir}/libaffile.so %attr(755,root,root) %{moduledir}/libafprog.so %attr(755,root,root) %{moduledir}/libafsocket.so -%attr(755,root,root) %{moduledir}/libafsocket-notls.so -%attr(755,root,root) %{moduledir}/libafsocket-tls.so %attr(755,root,root) %{moduledir}/libafstomp.so %attr(755,root,root) %{moduledir}/libafuser.so %attr(755,root,root) %{moduledir}/libbasicfuncs.so @@ -485,13 +485,13 @@ exit 0 %attr(755,root,root) %{moduledir}/libcsvparser.so %attr(755,root,root) %{moduledir}/libdbparser.so %attr(755,root,root) %{moduledir}/libgraphite.so +%attr(755,root,root) %{moduledir}/libkvformat.so %attr(755,root,root) %{moduledir}/liblinux-kmsg-format.so %attr(755,root,root) %{moduledir}/libpacctformat.so %attr(755,root,root) %{moduledir}/libpseudofile.so %if %{with systemd} %attr(755,root,root) %{moduledir}/libsdjournal.so %endif -%attr(755,root,root) %{moduledir}/libsyslog-ng-crypto.so %attr(755,root,root) %{moduledir}/libsyslogformat.so %attr(755,root,root) %{moduledir}/libsystem-source.so %attr(755,root,root) %{_sbindir}/syslog-ng @@ -502,15 +502,21 @@ exit 0 %dir %{_datadir}/syslog-ng/include %dir %{_datadir}/syslog-ng/include/scl +%{_datadir}/syslog-ng/include/scl/cim +%{_datadir}/syslog-ng/include/scl/elasticsearch +%{_datadir}/syslog-ng/include/scl/hdfs %dir %{_datadir}/syslog-ng/include/scl/graphite %{_datadir}/syslog-ng/include/scl/graphite/README %{_datadir}/syslog-ng/include/scl/graphite/plugin.conf +%{_datadir}/syslog-ng/include/scl/kafka +%{_datadir}/syslog-ng/include/scl/mbox %dir %{_datadir}/syslog-ng/include/scl/nodejs %{_datadir}/syslog-ng/include/scl/nodejs/plugin.conf %dir %{_datadir}/syslog-ng/include/scl/pacct %{_datadir}/syslog-ng/include/scl/pacct/plugin.conf %dir %{_datadir}/syslog-ng/include/scl/rewrite %{_datadir}/syslog-ng/include/scl/rewrite/cc-mask.conf +%{_datadir}/syslog-ng/include/scl/solaris %dir %{_datadir}/syslog-ng/include/scl/syslogconf %{_datadir}/syslog-ng/include/scl/syslogconf/README %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk @@ -581,7 +587,7 @@ exit 0 %if %{with geoip} %files module-tfgeoip %defattr(644,root,root,755) -%attr(755,root,root) %{moduledir}/libtfgeoip.so +%attr(755,root,root) %{moduledir}/libgeoip-plugin.so %endif %files libs -- 2.44.0