Hello community, here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at 2018-12-04 20:53:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslog-ng (Old) and /work/SRC/openSUSE:Factory/.syslog-ng.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslog-ng" Tue Dec 4 20:53:43 2018 rev:97 rq:652108 version:3.18.1 Changes: -------- --- /work/SRC/openSUSE:Factory/syslog-ng/syslog-ng.changes 2018-06-02 12:12:48.730528837 +0200 +++ /work/SRC/openSUSE:Factory/.syslog-ng.new.19453/syslog-ng.changes 2018-12-04 20:53:46.440889983 +0100 @@ -1,0 +2,8 @@ +Mon Nov 12 11:10:21 UTC 2018 - [email protected] + +- update to 3.18.1 +- remove support for SLES11 (sysvinit) +- add support to compile on SLES12+ and Leap 42+ +- tons of clean-up + +------------------------------------------------------------------- Old: ---- syslog-ng-3.14.1.tar.gz New: ---- syslog-ng-3.18.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.eWjJC7/_old 2018-12-04 20:53:47.472888834 +0100 +++ /var/tmp/diff_new_pack.eWjJC7/_new 2018-12-04 20:53:47.476888830 +0100 @@ -22,66 +22,68 @@ %endif Name: syslog-ng + %if %{defined _rundir} %define syslog_ng_rundir %{_rundir}/syslog-ng %else %define syslog_ng_rundir %{_localstatedir}/run/syslog-ng %endif %define syslog_ng_sockets_cfg %{syslog_ng_rundir}/additional-log-sockets.conf -Version: 3.14.1 + +Version: 3.18.1 Release: 0 Summary: The new-generation syslog-daemon License: GPL-2.0 Group: System/Daemons Url: http://syslog-ng.org/ -#Source0: https://github.com/balabit/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz -Source0: syslog-ng-%{version}.tar.gz +Source0: https://github.com/balabit/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz Source1: syslog-ng.sysconfig Source2: syslog-ng.conf.default Source3: syslog-ng.service Source4: syslog-ng-service-prepare -%if 0%{?suse_version} >= 1210 -%bcond_without systemd -%bcond_without dbi +%if 0%{?suse_version} >= 1500 +%global py_ver 3.6 +%else +%global py_ver 3.4 +%endif + +# turn features on and off %bcond_without python -%bcond_with java -%bcond_with mongodb %bcond_without curl -%if 0%{?suse_version} != 1320 +%bcond_without smtp + +%if !0%{?is_opensuse} +%bcond_with redis +%else %bcond_without redis %endif -%endif -%if 0%{?suse_version} >= 1230 -%bcond_with systemv +# missing dependencies on SLES 15 +%if 0%{?sle_version} == 150000 && !0%{?is_opensuse} +%bcond_with dbi +%bcond_with java +%bcond_with geoip %else -%bcond_without systemv +%bcond_without dbi +%bcond_without java +%bcond_without geoip %endif -%define with_smtp %suse_version >= 1210 -%define with_geoip %suse_version >= 1210 +# mongodb & amqp C clients are no more bundled with syslog-ng sources +# and not yet available in openSUSE +# leaving here for future usage +%bcond_with mongodb +%bcond_with amqp -%if %{with systemd} Provides: syslog Provides: sysvinit(syslog) Conflicts: otherproviders(syslog) Requires(pre): %fillup_prereq -%if %{with systemv} -Requires(pre): %insserv_prereq -Requires(pre): syslog-service < 2.0 -Requires(pre): /etc/init.d/syslog -%else Requires(pre): syslog-service >= 2.0 -%endif -%{?systemd_requires} BuildRequires: systemd-devel -%else -Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog -BuildRequires: klogd -%endif -%if 0%{with_smtp} +%if %{with smtp} BuildRequires: libesmtp-devel %endif @@ -92,7 +94,7 @@ %if %{with curl} BuildRequires: libcurl-devel %endif -%if 0%{?with_geoip} +%if %{with geoip} BuildRequires: libGeoIP-devel %if 0%{?leap_version} >= 420200 BuildRequires: libmaxminddb-devel @@ -104,9 +106,6 @@ %if %{with redis} BuildRequires: hiredis-devel -%if 0%{?suse_version} == 1320 -BuildRequires: libhiredis0_10 -%endif %endif BuildRequires: libjson-devel @@ -114,34 +113,30 @@ BuildRequires: libtool BuildRequires: pcre-devel BuildRequires: pkgconfig -BuildRequires: python +BuildRequires: python3 BuildRequires: tcpd-devel %if %{with dbi} BuildRequires: libdbi-devel %endif + %if %{with java} -BuildRequires: java-devel = 1.7 +BuildRequires: java-devel <= 1.8 %endif %if %{with python} -BuildRequires: python-devel +BuildRequires: python3-devel %endif -%if 0%{?suse_version} >= 1210 BuildRequires: libcap-devel BuildRequires: libnet-devel -%else -BuildRequires: libcap -BuildRequires: libnet -%endif %if 0%{?suse_version} >= 1330 Requires(pre): user(news) Requires(pre): group(news) %endif -Requires: libevtlog-3_14-0 +Requires: libevtlog-3_18-0 Obsoletes: syslog-ng-json @@ -165,20 +160,20 @@ * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). -%package -n libevtlog-3_14-0 +%package -n libevtlog-3_18-0 Summary: Syslog-ng event logger library runtime Group: System/Libraries -%description -n libevtlog-3_14-0 -The EventLog library aims to be a replacement of the simple syslog() -API provided on UNIX systems. The major difference between EventLog and -syslog is that EventLog tries to add structure to messages. +%description -n libevtlog-3_18-0 +The EventLog library provides an alternative to the simple syslog() +API provided on UNIX systems. Compared to syslog, EventLog adds +structured messages. EventLog provides an interface to build, format and output an event record. The exact format and output method can be customized by the administrator via a configuration file. -This package provides the runtime part of the library. +This package is now merged into syslog-ng. %if %{with curl} @@ -218,7 +213,7 @@ %endif -%if 0%{?with_smtp} +%if %{with smtp} %package smtp Summary: SMTP output support for syslog-ng @@ -231,7 +226,7 @@ %endif -%if 0%{?with_geoip} +%if %{with geoip} %package geoip Summary: GeoIP support for syslog-ng @@ -298,16 +293,23 @@ sed -i -e 's/tty10/console/g' syslog-ng.conf.default %endif +# fix python +%{__sed} -i 's|^#!/usr/bin/env python|#!/usr/bin/python3|' lib/merge-grammar.py + %build ## ## build #################################################### ## export CFLAGS="%{optflags}" -%if 0%{?with_geoip} + +%if %{with geoip} export GEOIP_LIBS="-lGeoIP" %endif + export AM_YFLAGS=-d + %configure \ + --prefix=%{_prefix} \ --enable-ipv6 \ --enable-manpages \ --enable-tcp-wrapper \ @@ -316,30 +318,31 @@ --localstatedir=%{_localstatedir}/lib/syslog-ng \ --with-pidfile-dir=%{_localstatedir}/run \ --with-module-dir="%{_libdir}/syslog-ng" \ - --with-module-path="%{_libdir}/syslog-ng" \ --with-default-modules="affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat" \ --datadir="%{_datadir}" \ --without-compile-date \ --enable-ssl \ -%if 0%{?with_smtp} +%if %{with smtp} --with-libesmtp=/usr/lib \ %endif -%if %{with systemd} --enable-systemd \ --with-systemd-journal=system \ -%endif %if %{with dbi} --enable-sql \ %endif --enable-json \ --enable-capabilities \ +%if %{with amqp} + --enable-amqp \ +%else --disable-amqp \ +%endif %if %{with mongodb} --enable-mongodb \ %else --disable-mongodb \ %endif -%if 0%{?with_geoip} +%if %{with geoip} --enable-geoip \ %endif %if %{with redis} @@ -353,6 +356,7 @@ --disable-java-modules \ %if %{with python} --enable-python \ + --with-python=%{py_ver} \ %else --disable-python \ %endif @@ -367,24 +371,26 @@ ## ## install ################################################## ## -export RPM_BUILD_ROOT for dir in /sbin \ %{_sysconfdir}/syslog-ng \ %{_localstatedir}/lib/syslog-ng \ %{_localstatedir}/run/syslog-ng \ +%if 0%{?suse_version} >= 1500 %{_fillupdir} ; +%else + %{_localstatedir}/adm/fillup-templates ; +%endif do - test -d ${RPM_BUILD_ROOT}${dir} || \ - install -d -m755 ${RPM_BUILD_ROOT}${dir} + test -d %{buildroot}/${dir} || \ + install -d -m755 %{buildroot}/${dir} done # -make DESTDIR=${RPM_BUILD_ROOT} install +%make_install # -%if %{with systemd} && ! %{with systemv} install -d -m755 %{buildroot}%{_unitdir}/ install -c -m644 syslog-ng.service %{buildroot}%{_unitdir}/ install -c -m755 syslog-ng-service-prepare %{buildroot}%{_sbindir}/ -%endif + # install config.h (bnc#982487) install -p -m644 config.h %{buildroot}%{_includedir}/%{name} @@ -412,17 +418,9 @@ touch %{buildroot}%{syslog_ng_sockets_cfg} chmod 644 %{buildroot}%{syslog_ng_sockets_cfg} -# remove some extra testing related files -rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng-test.pc -rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a - -%if %{with systemd} && ! %{with systemv} - %pre %{service_add_pre syslog-ng.service} -%endif - %post ## ## post install ############################################# @@ -432,23 +430,10 @@ # remove obsolete variables # %{remove_and_set -n syslog SYSLOG_DAEMON SYSLOG_REQUIRES_NETWORK} -%if %{with systemv} -%{fillup_and_insserv -ny syslog syslog} -%endif # # add SYSLOG_NG_* variables if needed # %{fillup_only -ans syslog ng} -%if %{with systemv} -# -# switch SYSLOG_DAEMON to outself -# -if test -f etc/sysconfig/syslog ; then - sed -i \ - -e 's/^SYSLOG_DAEMON=.*/SYSLOG_DAEMON="syslog-ng"/g' \ - etc/sysconfig/syslog -fi -%endif # # create dirs, touch log default files # @@ -486,7 +471,6 @@ # # Enable the syslog-ng systemd service # -%if %{with systemd} && ! %{with systemv} # This macro enables based on a systemctl preset config file only %{service_add_post syslog-ng.service} # But we want to enable a syslog-daemon regardless of the preset; @@ -494,28 +478,13 @@ # We do not check the obsolete SYSLOG_DAEMON variable as we want # to switch when installing it and there is a provider conflict. /usr/bin/systemctl -f enable syslog-ng.service >/dev/null 2>&1 || : -%endif %preun ## ## pre uninstall ############################################ ## -%if %{with systemd} && ! %{with systemv} %{service_del_preun syslog.socket} %{service_del_preun syslog-ng.service} -%else -if test -x /etc/init.d/syslog ; then - %{stop_on_removal syslog} -fi -# -# reset SYSLOG_DAEMON variable on removal -# -if test "$1" = "0" -a -f etc/sysconfig/syslog ; then - sed -i \ - -e 's/^SYSLOG_DAEMON=.*/SYSLOG_DAEMON=""/g' \ - etc/sysconfig/syslog -fi -%endif %postun ## @@ -525,27 +494,14 @@ # update linker caches # /sbin/ldconfig -%if %{with systemd} && ! %{with systemv} # # cleanup init scripts # %{service_del_postun syslog-ng.service} -%else -# -# stop the rsyslogd daemon when it is running -# -if test -x /etc/init.d/syslog ; then - %{restart_on_update syslog} -fi -# -# cleanup init scripts -# -%{insserv_cleanup} -%endif -%post -n libevtlog-3_14-0 -p /sbin/ldconfig +%post -n libevtlog-3_18-0 -p /sbin/ldconfig -%postun -n libevtlog-3_14-0 -p /sbin/ldconfig +%postun -n libevtlog-3_18-0 -p /sbin/ldconfig %files ## @@ -558,9 +514,7 @@ %attr(755,root,root) %{_sbindir}/syslog-ng %attr(755,root,root) %{_sbindir}/syslog-ng-ctl %attr(755,root,root) %{_sbindir}/syslog-ng-debun -%if %{with systemd} && ! %{with systemv} %attr(755,root,root) %{_sbindir}/syslog-ng-service-prepare -%endif %attr(755,root,root) %{_bindir}/loggen %attr(755,root,root) %{_bindir}/pdbtool %attr(755,root,root) %{_bindir}/dqtool @@ -572,6 +526,7 @@ %{_mandir}/man1/dqtool.1* %{_mandir}/man1/syslog-ng-debun.1* %dir %{_libdir}/syslog-ng +%dir %{_libdir}/syslog-ng/loggen %dir %{_datadir}/syslog-ng %dir %{_datadir}/syslog-ng/include %dir %{_datadir}/syslog-ng/include/scl @@ -598,22 +553,29 @@ %dir %{_datadir}/syslog-ng/include/scl/iptables/ %dir %{_datadir}/syslog-ng/include/scl/sudo/ %dir %{_datadir}/syslog-ng/include/scl/graylog2/ +%dir %{_datadir}/syslog-ng/include/scl/linux-audit/ %dir %{_datadir}/syslog-ng/xsd %dir %{_sysconfdir}/syslog-ng %dir %{_sysconfdir}/syslog-ng/conf.d %config(noreplace) %{_sysconfdir}/syslog-ng/syslog-ng.conf %config(noreplace) %{_sysconfdir}/syslog-ng/scl.conf -%if %{with systemd} && ! %{with systemv} %{_unitdir}/syslog-ng.service -%endif %dir %{_localstatedir}/lib/syslog-ng %attr(0755,root,root) %dir %ghost %{syslog_ng_rundir} %attr(0644,root,root) %ghost %{syslog_ng_sockets_cfg} +%if 0%{?suse_version} >= 1500 %{_fillupdir}/sysconfig.syslog-ng +%else +%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-ng +%endif %{_libdir}/libsyslog-ng-*.so.* %{_libdir}/libsecret-storage.so.* +%{_libdir}/libloggen_helper-*.so.* +%{_libdir}/libloggen_plugin-*.so.* %attr(755,root,root) %{_libdir}/syslog-ng/libadd-contextual-data.so -#%attr(755,root,root) %{_libdir}/syslog-ng/libafamqp.so +%if %{with amqp} +%attr(755,root,root) %{_libdir}/syslog-ng/libafamqp.so +%endif %attr(755,root,root) %{_libdir}/syslog-ng/libaffile.so %attr(755,root,root) %{_libdir}/syslog-ng/libafprog.so %attr(755,root,root) %{_libdir}/syslog-ng/libappmodel.so @@ -628,6 +590,7 @@ %attr(755,root,root) %{_libdir}/syslog-ng/libcsvparser.so %attr(755,root,root) %{_libdir}/syslog-ng/libcryptofuncs.so %attr(755,root,root) %{_libdir}/syslog-ng/libdbparser.so +%attr(755,root,root) %{_libdir}/syslog-ng/libexamples.so %attr(755,root,root) %{_libdir}/syslog-ng/libgraphite.so %attr(755,root,root) %{_libdir}/syslog-ng/libjson-plugin.so %attr(755,root,root) %{_libdir}/syslog-ng/libkvformat.so @@ -640,13 +603,14 @@ %attr(755,root,root) %{_libdir}/syslog-ng/libmap-value-pairs.so %attr(755,root,root) %{_libdir}/syslog-ng/libtags-parser.so %attr(755,root,root) %{_libdir}/syslog-ng/libxml.so -%if %{with systemd} && ! %{with systemv} %attr(755,root,root) %{_libdir}/syslog-ng/libsdjournal.so -%endif %attr(755,root,root) %{_libdir}/syslog-ng/libsyslogformat.so %attr(755,root,root) %{_libdir}/syslog-ng/libstardate.so %attr(755,root,root) %{_libdir}/syslog-ng/libsystem-source.so %attr(755,root,root) %{_libdir}/syslog-ng/libsnmptrapd-parser.so +%attr(755,root,root) %{_libdir}/syslog-ng/libhook-commands.so +%attr(755,root,root) %{_libdir}/syslog-ng/loggen/libloggen_socket_plugin.so +%attr(755,root,root) %{_libdir}/syslog-ng/loggen/libloggen_ssl_plugin.so %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/graphite/README %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/graphite/plugin.conf %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/nodejs/plugin.conf @@ -675,15 +639,18 @@ %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/iptables/iptables.conf %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/sudo/sudo.conf %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/graylog2/plugin.conf +%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/linux-audit/linux-audit.conf %attr(644,root,root) %{_datadir}/syslog-ng/xsd/* -%files -n libevtlog-3_14-0 +%files -n libevtlog-3_18-0 %{_libdir}/libevtlog-*.so.* %if %{with curl} %files curl %attr(755,root,root) %{_libdir}/syslog-ng/libhttp.so +%dir %{_datadir}/syslog-ng/include/scl/telegram/ +%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/telegram/telegram.conf %endif @@ -699,12 +666,18 @@ %files devel %defattr(-,root,root) %attr(644,root,root) %{_libdir}/libsyslog-ng.la -%attr(644,root,root) %{_libdir}/syslog-ng/*.la %attr(644,root,root) %{_libdir}/libevtlog.la %attr(644,root,root) %{_libdir}/libsecret-storage.la +%attr(644,root,root) %{_libdir}/libloggen_helper.la +%attr(644,root,root) %{_libdir}/libloggen_plugin.la +%attr(644,root,root) %{_libdir}/syslog-ng/*.la +%attr(755,root,root) %{_libdir}/syslog-ng/loggen/libloggen_socket_plugin.la +%attr(755,root,root) %{_libdir}/syslog-ng/loggen/libloggen_ssl_plugin.la %{_libdir}/libsyslog-ng.so %{_libdir}/libevtlog.so %{_libdir}/libsecret-storage.so +%{_libdir}/libloggen_helper.so +%{_libdir}/libloggen_plugin.so %attr(644,root,root) %{_libdir}/pkgconfig/syslog-ng.pc %dir %{_includedir}/syslog-ng %attr(-,root,root) %{_includedir}/syslog-ng/* @@ -715,18 +688,17 @@ %attr(755,root,root) %{_datadir}/syslog-ng/tools/system-expand.sh %attr(644,root,root) %{_libdir}/libsyslog-ng-native-connector.a %attr(644,root,root) %{_libdir}/pkgconfig/syslog-ng-native-connector.pc -%attr(644,root,root) %{_libdir}/pkgconfig/syslog-ng-add-contextual-data.pc %if %{with python} %files python %attr(755,root,root) %{_libdir}/syslog-ng/libmod-python.so %defattr(-,root,root) -/usr/lib/python2.7/site-packages/syslogng-1.0-py2.7.egg-info -%dir /usr/lib/python2.7/site-packages/syslogng -%dir /usr/lib/python2.7/site-packages/syslogng/debuggercli -/usr/lib/python2.7/site-packages/syslogng/* -/usr/lib/python2.7/site-packages/syslogng/debuggercli/* +/usr/lib/python%{py_ver}/site-packages/syslogng-1.0-py%{py_ver}.egg-info +%dir /usr/lib/python%{py_ver}/site-packages/syslogng +%dir /usr/lib/python%{py_ver}/site-packages/syslogng/debuggercli +/usr/lib/python%{py_ver}/site-packages/syslogng/* +/usr/lib/python%{py_ver}/site-packages/syslogng/debuggercli/* %endif @@ -739,7 +711,7 @@ %endif -%if 0%{?with_smtp} +%if %{with smtp} %files smtp %defattr(-,root,root) @@ -748,7 +720,7 @@ %endif -%if 0%{?with_geoip} +%if %{with geoip} %files geoip %defattr(-,root,root) ++++++ syslog-ng-3.14.1.tar.gz -> syslog-ng-3.18.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/syslog-ng/syslog-ng-3.14.1.tar.gz /work/SRC/openSUSE:Factory/.syslog-ng.new.19453/syslog-ng-3.18.1.tar.gz differ: char 5, line 1 ++++++ syslog-ng.conf.default ++++++ --- /var/tmp/diff_new_pack.eWjJC7/_old 2018-12-04 20:53:47.572888723 +0100 +++ /var/tmp/diff_new_pack.eWjJC7/_new 2018-12-04 20:53:47.572888723 +0100 @@ -1,4 +1,4 @@ -@version:3.14 +@version:3.18 @include "scl.conf" #
