Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2017-02-20 13:15:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2017-01-10 10:50:43.562105706 +0100 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2017-02-20 13:15:08.396079328 +0100 @@ -1,0 +2,8 @@ +Fri Feb 3 10:06:10 UTC 2017 - [email protected] + +- remove dedicated systemd scripts and use the default init scripts again because of issues + with the implementation. Ido2db crashed when the icinga service was restarted (bnc#1023400) +- remove obsolete icinga-fix-systemd-services.patch +- remove RHEL readme + +------------------------------------------------------------------- Old: ---- icinga-exec-start-pre icinga-fix-systemd-services.patch icinga_sysvinit_compat ido2db-exec-start-pre ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.VcnZCf/_old 2017-02-20 13:15:10.183827978 +0100 +++ /var/tmp/diff_new_pack.VcnZCf/_new 2017-02-20 13:15:10.187827415 +0100 @@ -15,13 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%if 0%{?suse_version} >= 1230 -%define using_systemd 1 -%else -%define using_sysvinit 1 -%endif - Name: icinga Version: 1.14.0 Release: 0 @@ -47,12 +40,8 @@ Source15: mini_epn.8 Source16: log2ido.8 Source17: icinga-favicon.ico -Source18: icinga-exec-start-pre -Source19: ido2db-exec-start-pre # PATCH-FIX-OPENSUSE icinga-workaround-131-apache-conf-issue.patch Patch0: icinga-workaround-131-apache-conf-issue.patch -# PATCH-FIX-OPENSUSE icinga-fix-systemd-services.patch -Patch1: icinga-fix-systemd-services.patch # PATCH-FIX-UPSTREAM icinga-1.11.7-fix-bashisms.patch [email protected] Patch2: icinga-1.11.7-fix-bashisms.patch Provides: monitoring_daemon @@ -61,9 +50,6 @@ %if 0%{?suse_version} >= 1110 BuildRequires: fdupes %endif -%if 0%{?suse_version} > 1310 -BuildRequires: util-linux-systemd -%endif BuildRequires: freetype2-devel BuildRequires: gd-devel > 1.8 BuildRequires: iputils @@ -78,10 +64,6 @@ BuildRequires: openssl BuildRequires: pcre-devel BuildRequires: zlib-devel -%if 0%{?using_systemd} -BuildRequires: systemd -Source100: icinga_sysvinit_compat -%endif Requires: net-tools Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq @@ -97,9 +79,6 @@ %{perl_requires} %endif %{?libperl_requires} -%if 0%{?using_systemd} -%{?systemd_requires} -%endif Requires: mailx Recommends: monitoring-tools Recommends: %{name}-plugins-eventhandlers @@ -285,7 +264,6 @@ %if 0%{?suse_version} == 1310 %patch0 -p1 %endif -%patch1 -p1 %patch2 -p1 %build @@ -354,11 +332,7 @@ %install make \ install-unstripped \ -%if 0%{?using_systemd} - install-systemd \ -%else install-init \ -%endif install-commandmode \ install-idoutils \ install-config \ @@ -409,6 +383,8 @@ # remove unnecessary files from www log directory rm "%{buildroot}/%{icinga_cgi_logdir}/"{.htaccess,index.htm} +# remove unnecessary documentation +rm README.RHEL # remove setuid from %%{icinga_cmd_filedir} chmod -s "%{buildroot}%{icinga_cmd_filedir}" @@ -436,21 +412,13 @@ # REST of special SUSE stuff here, if needed.... # init-scripts # remove the default init script as SUSE uses an adapted one -%if 0%{?using_systemd} -install -D -m0755 %{SOURCE100} %{buildroot}%{_sbindir}/rc%{name} -ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcido2db -install -D -m0755 %{SOURCE18} "%{buildroot}%{icinga_libdir}/icinga-exec-start-pre" -install -D -m0755 %{SOURCE19} "%{buildroot}%{icinga_libdir}/ido2db-exec-start-pre" -# remove systemd sysconfig file because we use our own -rm "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" -%else ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" ln -sf ../../%{_initrddir}/ido2db "%{buildroot}%{_sbindir}/rcido2db" install -D -m0755 %{SOURCE1} "%{buildroot}%{_initrddir}/%{name}" install -D -m0755 %{SOURCE2} "%{buildroot}%{_initrddir}/ido2db" -%endif # sysconfig script install -D -m 0644 %{SOURCE3} "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}" + # install cronjob (gzip' the logfiles) install -D -m 0640 %{SOURCE4} "%{buildroot}%{_sysconfdir}/cron.weekly/%{name}" %if 0%{?suse_version} >= 1110 @@ -477,9 +445,6 @@ install -m644 %{SOURCE17} "%{buildroot}/%{icinga_datadir}/favicon.ico" %pre -%if 0%{?using_systemd} -%service_add_pre %{name}.service -%endif # add icinga user and groups groupadd -r %{icinga_group} 2>/dev/null || : groupadd -r %{icinga_command_group} 2>/dev/null || : @@ -506,27 +471,14 @@ fi fi -%if 0%{?using_systemd} -%service_add_post %{name}.service -%fillup_only -%else %{fillup_and_insserv %{name}} -%endif %preun -%if 0%{?using_systemd} -%service_del_preun %{name}.service -%else %stop_on_removal %{name} -%endif %postun -%if 0%{?using_systemd} -%service_del_postun %{name}.service -%else %restart_on_update %{name} %{insserv_cleanup} -%endif %post www # If apache is installed, and we can find the apache user, set a shell var @@ -554,30 +506,18 @@ then # this is the initial installation: enable icinga test -x %{_sbindir}/a2enflag && %{_sbindir}/a2enflag ICINGA >/dev/null - %if 0%{?using_systemd} - %{_bindir}/systemctl try-restart apache2 - %else %restart_on_update apache2 - %endif fi %postun www if [ "$1" = "0" ]; then # deinstallation of the package - remove the apache flag test -x %{_sbindir}/a2disflag && %{_sbindir}/a2disflag ICINGA >/dev/null - %if 0%{?using_systemd} - %{_bindir}/systemctl try-restart apache2 - %else %restart_on_update apache2 - %endif fi %post idoutils -%if 0%{?using_systemd} -%service_add_post ido2db.service -%else %{fillup_and_insserv ido2db} -%endif if [ ${1:-0} -gt 1 ] then @@ -587,25 +527,12 @@ %{logmsg} "icinga-idoutils installed: Don't forget to install/upgrade your db schema, check /usr/share/doc/packages/icinga-idoutils/README.SUSE.idoutils" -%if 0%{?using_systemd} -%pre idoutils -%service_add_pre ido2db.service -%endif - %preun idoutils -%if 0%{?using_systemd} -%service_del_preun ido2db.service -%else %stop_on_removal ido2db -%endif %postun idoutils -%if 0%{?using_systemd} -%service_del_postun ido2db.service -%else %restart_on_update ido2db %insserv_cleanup -%endif %files %defattr(-,root,root) @@ -613,15 +540,8 @@ %{_mandir}/man8/icinga*.8* %{_sbindir}/%{name} %attr(0755,root,%{icinga_group}) %{_sbindir}/icingastats -%if 0%{?using_systemd} -%attr(0755,root,root) %{_sbindir}/rc%{name} -%{icinga_libdir}/icinga-exec-start-pre -%exclude %{icinga_libdir}/ido2db-exec-start-pre -%{_unitdir}/icinga.service -%else %{_sbindir}/rc%{name} %{_initrddir}/%{name} -%endif %{icinga_datadir}/p1.pl %{_localstatedir}/adm/fillup-templates/sysconfig.%{name} %attr(0755,root,root) %config %{_sysconfdir}/cron.weekly/%{name} @@ -710,12 +630,7 @@ %config(noreplace) %{icinga_sysconfdir}/modules/pnp4nagios.cfg %config(noreplace) %{icinga_sysconfdir}/objects/ido2db_check_proc.cfg %{_sbindir}/rcido2db -%if 0%{?using_systemd} -%{_unitdir}/ido2db.service -%{icinga_libdir}/ido2db-exec-start-pre -%else %{_initrddir}/ido2db -%endif %{_sbindir}/ido2db %{_sbindir}/log2ido %{icinga_libdir}/idomod.so ++++++ icinga-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.VcnZCf/_old 2017-02-20 13:15:10.355803799 +0100 +++ /var/tmp/diff_new_pack.VcnZCf/_new 2017-02-20 13:15:10.355803799 +0100 @@ -8,3 +8,5 @@ addFilter("explicit-lib-dependency.*libdbi-drivers-dbd-mysql"); addFilter("explicit-lib-dependency.*libdbi-drivers-dbd-oracle"); addFilter("explicit-lib-dependency.*libdbi-drivers-dbd-pgsql"); +# icinga 1.x is only in maintenance mode, so will not be fixed +addFilter("binary-or-shlib-calls-gethostbyname");
