Hello community, here is the log from the commit of package icinga2 for openSUSE:Factory checked in at 2018-04-19 15:30:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga2 (Old) and /work/SRC/openSUSE:Factory/.icinga2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga2" Thu Apr 19 15:30:31 2018 rev:6 rq:597478 version:2.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/icinga2/icinga2.changes 2018-03-28 10:30:18.039377688 +0200 +++ /work/SRC/openSUSE:Factory/.icinga2.new/icinga2.changes 2018-04-19 15:30:39.168191771 +0200 @@ -1,0 +2,10 @@ +Tue Apr 17 12:08:37 UTC 2018 - [email protected] + +- fix bsc#1089808 by back porting the upstream patch icinga2-2.8.2-boost.patch + +------------------------------------------------------------------- +Mon Apr 9 18:00:26 CEST 2018 - [email protected] + +- fix _fillupdir usage + +------------------------------------------------------------------- New: ---- icinga2-2.8.2-boost.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga2.spec ++++++ --- /var/tmp/diff_new_pack.g6wGDo/_old 2018-04-19 15:30:40.276146299 +0200 +++ /var/tmp/diff_new_pack.g6wGDo/_new 2018-04-19 15:30:40.284145970 +0200 @@ -22,6 +22,9 @@ %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif +%if ! %{defined _fillupdir} + %define _fillupdir %{_localstatedir}/adm/fillup-templates +%endif %define _libexecdir %{_prefix}/lib/ %define plugindir %{_libdir}/nagios/plugins @@ -86,6 +89,8 @@ Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source1: icinga2-rpmlintrc +# PATCH-FIX-UPSTREAM bsc#1089808 +Patch0: icinga2-2.8.2-boost.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-bin = %{version}-%{release} @@ -292,6 +297,7 @@ %if "%{_vendor}" == "suse" find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \; %endif +%patch0 -p1 %build CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ @@ -387,13 +393,8 @@ %else ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" %endif -%if ( 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1500 mkdir -p "%{buildroot}%{_fillupdir}/" mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_fillupdir}/sysconfig.%{name}" -%else -mkdir -p "%{buildroot}%{_localstatedir}/adm/fillup-templates/" -mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}" -%endif %endif %if 0%{?use_selinux} @@ -641,12 +642,8 @@ %endif %if "%{_vendor}" == "suse" %{_sbindir}/rc%{name} -%if ( 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1500 %{_fillupdir}/sysconfig.%{name} %else -%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} -%endif -%else %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %endif %attr(0750,root,%{icinga_group}) %dir %{_sysconfdir}/%{name} ++++++ icinga2-2.8.2-boost.patch ++++++ diff -Naur icinga2-2.8.2.orig/lib/base/timer.cpp icinga2-2.8.2/lib/base/timer.cpp --- icinga2-2.8.2.orig/lib/base/timer.cpp 2018-03-22 11:26:19.000000000 +0100 +++ icinga2-2.8.2/lib/base/timer.cpp 2018-04-17 13:40:49.144336715 +0200 @@ -266,7 +266,7 @@ if (wait > 0.01) { /* Wait for the next timer. */ - l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000)); + l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(long(wait * 1000))); continue; } diff -Naur icinga2-2.8.2.orig/lib/checker/checkercomponent.cpp icinga2-2.8.2/lib/checker/checkercomponent.cpp --- icinga2-2.8.2.orig/lib/checker/checkercomponent.cpp 2018-03-22 11:26:19.000000000 +0100 +++ icinga2-2.8.2/lib/checker/checkercomponent.cpp 2018-04-17 13:39:31.185746615 +0200 @@ -130,7 +130,7 @@ if (wait > 0) { /* Wait for the next check. */ - m_CV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000)); + m_CV.timed_wait(lock, boost::posix_time::milliseconds(long(wait * 1000))); continue; } diff -Naur icinga2-2.8.2.orig/lib/remote/eventqueue.cpp icinga2-2.8.2/lib/remote/eventqueue.cpp --- icinga2-2.8.2.orig/lib/remote/eventqueue.cpp 2018-03-22 11:26:19.000000000 +0100 +++ icinga2-2.8.2/lib/remote/eventqueue.cpp 2018-04-17 13:40:11.024265543 +0200 @@ -114,7 +114,7 @@ return result; } - if (!m_CV.timed_wait(lock, boost::posix_time::milliseconds(timeout * 1000))) + if (!m_CV.timed_wait(lock, boost::posix_time::milliseconds(long(timeout * 1000)))) return Dictionary::Ptr(); } }
