Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2024-04-17 14:46:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios" Wed Apr 17 14:46:13 2024 rev:26 rq:1168505 version:4.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/nagios/nagios.changes 2024-03-07 22:02:31.823018748 +0100 +++ /work/SRC/openSUSE:Factory/.nagios.new.26366/nagios.changes 2024-04-17 14:47:02.793738006 +0200 @@ -1,0 +2,71 @@ +Tue Apr 16 14:11:00 UTC 2024 - Lars Vogdt <l...@linux-schulserver.de> + +- update to 4.5.1 + * Fix text rendering in Configuration -> Command Expansion when the + command ends in whitespace + (Thanks Joran LEREEC for reporting this issue) + +- from 4.5.0 + Note: this release is backward-compatible, but does include updates + to the header files. + If you are using any NEB modules in your monitoring solution, you will + need to recompile them with the new nagios-4.5.0 headers to avoid + segmentation faults. + + ENHANCEMENTS + * Add event_handler_period configuration option to hosts and services (#913) + * Add external commands CHANGE_HOST_EVENT_HANDLER_TIMEPERIOD + and CHANGE_SVC_EVENT_HANDLER_TIMEPERIOD (#913) + * Added support for separating your build directory from your + source directory (#867) + +- from older versions: + * Fix missing macros when running performance data commands (#904) + * Fix broken logo images in status pages (regression from 4.4.12) (#917) + * Clean up most compiler warnings on GCC and clang (#901) + * Fix incorrect HTML entity escaping in CGIs (#907, #902) + * Fix issue where predictive dependency checks were not being scheduled for services (#908) + * Fix several typos (#898, #884) + * Fix incorrect error message in preflight check (#865) + * Fix use-after-free in qh_deregister_handler (#866) + * Fix memory leak in qh_deregister_handler (#866) + * Fix mismatched host/service behavior when changing from SOFT to HARD state (#891) + * Minor performance improvements in CGI utility functions (#866) + * Fix memory leak in nagiostats.c when using -c, -s, -d, or -D multiple times (#888) + * Improve service scheduling at startup (#887) + * Fixed check_attempts remaining high during a HARD service recovery (#837) + * Fixed memory leak in NERD (#872) + * Fixed crash when checking for updates using SSL + +- removed patches: + * nagios-4.1.0-add_KOHANNA.conf - not supported any longer + * nagios-fix_encoding_trends.cgi.patch - fixed upstream +- refreshed patches: + * nagios-disable_phone_home.patch - disable page tour in cgi.cfg + * nagios-random_data.patch - rebase + * nagios-4.0.6-remove-date-time.patch - rebase + * nagios-4.4.3-enable-ppc64le.patch - rebase + * nagios-output-length.patch - rebase +- removed scripts and configs: + * nagios-exec-start-post - obsolete (fixes bsc#1202929) + * nagios-exec-start-pre - obsolete (fixes bsc#1202929) + * nagios_systemd - integrated in nagios.service + * nagios-4.1.0-add_KOHANNA.conf - unsupported +- updated nagios.service + * use correct commandline options + * add ExecStopPost to remove the command file + * get rid of EnvironmentFile +- reduce amount of rpmlintrc exceptions +- use service file for downloading the sources +- require procps (ps) for building +- recommend traceroute (for WAP -> statuswml.cgi & traceroute.cgi) +- Nagios plugins can be found under http://nagios-plugins.org/ now. +- use /run/nagios instead of /var/run/nagios as tmp-dir +- create and own /run/nagios as ghost directory +- substitute the distribution path names more general in nagios.cfg +- use symlink to /sbin/service for rcnagios instead of adjusted startup file +- package readme file for exfoliation theme +- package nagios-qh.rb (Query Handler interface example) in nagios-contrib +- run check macro and test the shipped nagios.cfg + +------------------------------------------------------------------- Old: ---- nagios-4.1.0-add_KOHANNA.conf nagios-4.4.7.tar.gz nagios-exec-start-post nagios-exec-start-pre nagios-fix_encoding_trends.cgi.patch nagios_systemd New: ---- _service nagios-4.5.1.tar.gz BETA DEBUG BEGIN: Old: * nagios-4.1.0-add_KOHANNA.conf - not supported any longer * nagios-fix_encoding_trends.cgi.patch - fixed upstream - refreshed patches: BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:03.793774727 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:03.793774727 +0200 @@ -21,6 +21,9 @@ %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates %endif +%if ! %{defined _rundir} + %define _rundir %{_localstatedir}/run +%endif %if 0%{?suse_version} >= 1230 %bcond_without systemd @@ -29,7 +32,7 @@ %endif Name: nagios -Version: 4.4.7 +Version: 4.5.1 Release: 0 Summary: The Nagios Network Monitor License: GPL-2.0-or-later @@ -37,12 +40,10 @@ URL: http://www.nagios.org/ Source0: %{name}-%{version}.tar.gz Source1: rc%{name} -Source2: %{name}-exec-start-pre Source3: %{name}.sysconfig Source4: suse.de-nagios Source5: nagios.8 Source6: nagiosstats.8 -Source7: nagios-exec-start-post Source8: upgrade_nagios.sh Source9: upgrade_nagios.8 Source10: %{name}-README.SuSE @@ -52,8 +53,6 @@ Source14: %{name}-archive.timer Source15: %{name}-archive.service Source20: %{name}-rpmlintrc -# PATCH-FIX-UPSTREAM unescape hex characters in CGI input - avoid addional '+' -Patch3: nagios-fix_encoding_trends.cgi.patch # PATCH-FIX-UPSTREAM return 1 in int main() Patch4: nagios-random_data.patch # PATCH-FIX-OPENSUSE disable Nagios online update checks for distributed packages @@ -62,8 +61,6 @@ Patch14: nagios-4.0.6-remove-date-time.patch # PATCH-FIX-OPENSUSE patch to not truncate performance data Patch16: nagios-output-length.patch -# PATCH-FIX-OPENSUSE use KOHANNA if available -Patch17: nagios-4.1.0-add_KOHANNA.conf # PATCH-FIX-UPSTREAM allow ppc64le builds in contrib Makefile Patch18: nagios-4.4.3-enable-ppc64le.patch BuildRequires: doxygen @@ -80,11 +77,11 @@ BuildRequires: net-tools BuildRequires: openssl-devel BuildRequires: pcre-devel +BuildRequires: procps BuildRequires: unzip BuildRequires: zlib-devel %if %{with systemd} BuildRequires: pkgconfig(systemd) -Source100: nagios_systemd %{?systemd_ordering} %else Recommends: cron @@ -101,6 +98,7 @@ Recommends: monitoring-tools Recommends: icinga-monitoring-tools Recommends: %{name}-plugins +Recommends: traceroute Requires(pre): system-user-nagios %else Requires(pre): shadow-utils @@ -124,10 +122,11 @@ The actual service checks are performed by separate "plugin" programs which return the status of the checks to Nagios. The plugins are -available at http://sourceforge.net/projects/nagiosplug +available at http://nagios-plugins.org/. This package provides core programs for Nagios. The web interface, -documentation, and development files are built as separate packages +documentation, and development files are built as separate packages. + %package www Summary: Provides the HTML and CGI files for the Nagios web interface @@ -161,8 +160,8 @@ Several CGI programs are included with Nagios in order to allow you to view the current service status, problem history, notification history, and log file via the web. This package provides the HTML and CGI files -for the Nagios web interface. In addition, HTML documentation is -included in this package. +for the Nagios web interface. + %package theme-exfoliation Summary: Nagios Core web interface @@ -175,6 +174,7 @@ Exfoliation is a simple makeover for the Nagios Core web interface. It consists of two folders that overlay on a stock Nagios installation. + %package www-dch Summary: HTML and CGI files that do not call home Group: System/Monitoring @@ -198,6 +198,7 @@ Note: The HTML pages use 'side' and 'main' and frame targets. + %package contrib Summary: Files from the contrib directory Group: Development/Tools/Other @@ -207,6 +208,7 @@ %description contrib This package contains all the files from the contrib directory + %package devel Summary: Development files for Nagios Group: Development/Libraries/C and C++ @@ -224,15 +226,14 @@ This package provides include files that Nagios-related applications may compile against. + %prep %setup -q %if 0%{?suse_version} < 01500 -%patch -P 3 -p1 %patch -P 4 -p1 %patch -P 11 -p1 %patch -P 14 -p1 %patch -P 16 -p1 -%patch -P 17 -p1 %patch -P 18 -p1 %else %autopatch -p1 @@ -255,8 +256,11 @@ mv ${F} ${f} done popd 1>/dev/null +sed -i "s|/usr/bin/env ruby|%{_bindir}/ruby|g" contrib/nagios-qh.rb +mv contrib/exfoliation/readme.txt README_Theme_Exfoliation.txt %build +export PATH_TO_TRACEROUTE="%{_sbindir}/traceroute"; \ %configure \ --prefix=%{_prefix} \ --exec-prefix=%{_sbindir} \ @@ -283,6 +287,7 @@ --with-template-extinfo \ --with-perlcache \ --enable-event-broker + # # make daemonchk.cgi and event handlers # @@ -325,9 +330,9 @@ find sample-config/ -name "*.in" -delete find sample-config/ -name "*.in.orig" -delete sed -e 's|command_file=.*|command_file=%{nagios_command_file}|g' \ - -e 's|log_file=/var/lib/nagios/nagios.log|log_file=%{nagios_logdir}/nagios.log|g' \ - -e 's|log_archive_path=/var/lib/nagios/archives|log_archive_path=%{nagios_logdir}/archives|g' \ - -e 's|#query_socket=/var/lib/nagios/rw/nagios.qh|query_socket=%{nagios_localstatedir}/nagios.qh|g' \ + -e 's|/var/lib/nagios/nagios.log|%{nagios_logdir}/nagios.log|g' \ + -e 's|/var/lib/nagios/archives|%{nagios_logdir}/archives|g' \ + -e 's|/var/lib/nagios/rw/nagios.qh|%{nagios_localstatedir}/nagios.qh|g' \ -e 's|^lock_file=.*|lock_file=%nslockfile|g' \ %{buildroot}/%{nagios_sysconfdir}/nagios.cfg > %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg.tmp mv %{buildroot}/%{nagios_sysconfdir}/nagios.cfg.tmp %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg @@ -344,24 +349,24 @@ # # init-script %if %{with systemd} -install -D -m0755 %{SOURCE100} %{buildroot}%{_sbindir}/rc%{name} -install -D -m0755 %{SOURCE2} %{buildroot}/%{nagios_libdir}/%{name}-exec-start-pre -install -D -m0755 %{SOURCE7} %{buildroot}/%{nagios_libdir}/%{name}-exec-start-post +ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} install -D -m0644 %{SOURCE12} %{buildroot}/%{_unitdir}/%{name}.service install -D -m0644 %{SOURCE13} %{buildroot}/%{_prefix}/lib/tmpfiles.d/%{name}.conf %else install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} ln -sf ../../etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} touch %{buildroot}%{nslockfile} -%endif # sysconfig script install -D -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.%{name} +%endif # install cronjob (gzip' the logfiles) %if %{with systemd} sed -e 's|__NAGIOS_USER__|%{nagios_user}|g' \ -e 's|__NAGIOS_GROUP__|%{nagios_group}|g' %{SOURCE4} > %{buildroot}%{_sbindir}/nagios-archive install -Dm0644 %{SOURCE14} %{buildroot}/%{_unitdir}/nagios-archive.timer install -Dm0644 %{SOURCE15} %{buildroot}/%{_unitdir}/nagios-archive.service +# created via tmpfilesd - create here for ghosting it +mkdir -p %{buildroot}%{_rundir}/%{name} %else mkdir %{buildroot}%{_sysconfdir}/cron.weekly sed -e 's|__NAGIOS_USER__|%{nagios_user}|g' \ @@ -391,17 +396,26 @@ rm -f %{buildroot}/%{_sbindir}/convertcfg rm -f %{buildroot}/%{_sbindir}/mini_epn rm -f %{buildroot}/%{_sbindir}/new_mini_epn -# move exfoliation theme to separate folder +# create exfoliation theme in separate folder mkdir -p %{buildroot}%{_datadir}/nagios-themes/exfoliation -mv %{buildroot}%{nagios_datadir}/{stylesheets,images} %{buildroot}%{_datadir}/nagios-themes/exfoliation/ +cp -a %{buildroot}%{nagios_datadir}/* %{buildroot}%{_datadir}/nagios-themes/exfoliation/ +rm -rf %{buildroot}%{_datadir}/nagios-themes/exfoliation/{stylesheets,images} +mv -fv contrib/exfoliation/{stylesheets,images} %{buildroot}%{_datadir}/nagios-themes/exfoliation/ +rmdir contrib/exfoliation %fdupes %{buildroot}%{_datadir}/nagios-themes/exfoliation/ -mkdir -p %{buildroot}%{nagios_datadir}/{stylesheets,images} -cp -rf html/stylesheets/* %{buildroot}%{nagios_datadir}/stylesheets/ -cp -rf html/images/* %{buildroot}%{nagios_datadir}/images/ + + +%check +NAGIOS_CFGFILE=$(mktemp /tmp/nagios.cfg-XXXXXX) +sed -e 's|/var/|%{buildroot}/var/|g' \ + -e 's|/etc/|%{buildroot}/etc/|g' %{buildroot}%{nagios_sysconfdir}/nagios.cfg > "$NAGIOS_CFGFILE" +%{buildroot}%{_sbindir}/nagios -v "$NAGIOS_CFGFILE" +rm "$NAGIOS_CFGFILE" + %if %{with systemd} %pre -%service_add_pre %{name}.service %{name}-archive.service %{name}-archive.timer + %service_add_pre %{name}.service %{name}-archive.service %{name}-archive.timer %endif %post @@ -423,37 +437,36 @@ fi fi %if %{with systemd} -%service_add_post %{name}.service %{name}-archive.service %{name}-archive.timer -systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/%{name}.conf -%fillup_only + %service_add_post %{name}.service %{name}-archive.service %{name}-archive.timer + systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/%{name}.conf %else %{fillup_and_insserv %{name}} %if 0%{?sles_version} != 11 -%set_permissions /etc/cron.weekly/ + %set_permissions /etc/cron.weekly/ %endif %endif %if 0%{?sles_version} != 11 -%set_permissions /var/spool/nagios/ + %set_permissions /var/spool/nagios/ %endif %preun %if %{with systemd} -%service_del_preun %{name}.service %{name}-archive.service %{name}-archive.timer + %service_del_preun %{name}.service %{name}-archive.service %{name}-archive.timer %else -%stop_on_removal %{name} + %stop_on_removal %{name} %endif %postun %if %{with systemd} -%service_del_postun %{name}.service %{name}-archive.service %{name}-archive.timer + %service_del_postun %{name}.service %{name}-archive.service %{name}-archive.timer %else -%restart_on_update %{name} -%{insserv_cleanup} + %restart_on_update %{name} + %{insserv_cleanup} %endif %verifyscript %if ! %{with systemd} -%verify_permissions -e /etc/cron.weekly/ + %verify_permissions -e /etc/cron.weekly/ %endif %verify_permissions -e /var/spool/nagios/ @@ -480,11 +493,7 @@ %{_sbindir}/a2enmod authz_user >/dev/null %{_sbindir}/a2enmod version >/dev/null # enable php in apache config - %if 0%{?sle_version} == 120000 - %{_sbindir}/a2enmod php5 >/dev/null || : - %else %{_sbindir}/a2enmod php >/dev/null || : - %endif fi %if %{with systemd} %{_bindir}/systemctl try-restart apache2 @@ -496,11 +505,11 @@ %post www-dch # Update ? if [ ${1:-0} -eq 1 ]; then -%if %{with systemd} -%{_bindir}/systemctl try-restart apache2 -%else -%restart_on_update apache2 -%endif + %if %{with systemd} + %{_bindir}/systemctl try-restart apache2 + %else + %restart_on_update apache2 + %endif fi %post theme-exfoliation @@ -526,19 +535,17 @@ %dir %{nagios_plugindir} %exclude %{nagios_cgidir}/* %{_mandir}/man8/%{name}* -%attr(0755,root,root) %{_sbindir}/rc%{name} +%{_sbindir}/rc%{name} %attr(0755,root,root) %{_sbindir}/upgrade_nagios %{_mandir}/man8/upgrade_nagios.8* -%{_fillupdir}/sysconfig.%{name} %if %{with systemd} -%attr(0755,root,root) %{nagios_libdir}/%{name}-exec-start-pre -%attr(0755,root,root) %{nagios_libdir}/%{name}-exec-start-post %{_unitdir}/%{name}.service %{_prefix}/lib/tmpfiles.d/%{name}.conf %attr(0755,root,root) %{_sbindir}/nagios-archive %{_unitdir}/nagios-archive.timer %{_unitdir}/nagios-archive.service %else +%{_fillupdir}/sysconfig.%{name} %attr(0755,root,root) %{_sysconfdir}/init.d/%{name} %ghost %dir %{nslockfile_dir} %attr(0644,%{nagios_user},%{nagios_group}) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{nslockfile} @@ -550,6 +557,7 @@ %config(noreplace) %{nagios_sysconfdir}/*.cfg %config(noreplace) %{nagios_sysconfdir}/objects/*.cfg %ghost %config(missingok,noreplace) %attr(0644,%{nagios_user},%{nagios_group}) %{nagios_logdir}/config.err +%ghost %dir %{_rundir}/%{name} # directories with special handling: %attr(0755,root,%{nagios_command_group}) %dir %{nagios_sysconfdir} %attr(0755,root,%{nagios_command_group}) %dir %{nagios_sysconfdir}/objects @@ -578,6 +586,7 @@ %files theme-exfoliation %defattr(0644,root,root,0755) +%doc README_Theme_Exfoliation.txt %dir %{_datadir}/nagios-themes %{_datadir}/nagios-themes/exfoliation/ @@ -589,7 +598,7 @@ %files contrib %defattr(-,root,root) -%doc contrib/README +%doc contrib/README contrib/nagios-qh.rb %dir %{nagios_eventhandlerdir} %attr(0755,root,root) %{nagios_eventhandlerdir}/* ++++++ _service ++++++ <services> <service name="download_url" mode="localonly"> <param name="host">github.com</param> <param name="protocol">https</param> <param name="path">/NagiosEnterprises/nagioscore/releases/download/nagios-4.5.1/nagios-4.5.1.tar.gz</param> </service> </services> ++++++ nagios-4.0.6-remove-date-time.patch ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:03.837776342 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:03.841776489 +0200 @@ -1,7 +1,7 @@ -Index: nagios-4.4.2/cgi/archivejson.c +Index: nagios-4.5.1/cgi/archivejson.c =================================================================== ---- nagios-4.4.2.orig/cgi/archivejson.c -+++ nagios-4.4.2/cgi/archivejson.c +--- nagios-4.5.1.orig/cgi/archivejson.c ++++ nagios-4.5.1/cgi/archivejson.c @@ -761,7 +761,7 @@ int main(void) { json_result(query_time, THISCGI, svm_get_string_from_value(cgi_data.query, valid_queries), @@ -11,10 +11,10 @@ RESULT_SUCCESS, "")); json_object_append_object(json_root, "data", json_help(archive_json_help)); -Index: nagios-4.4.2/cgi/objectjson.c +Index: nagios-4.5.1/cgi/objectjson.c =================================================================== ---- nagios-4.4.2.orig/cgi/objectjson.c -+++ nagios-4.4.2/cgi/objectjson.c +--- nagios-4.5.1.orig/cgi/objectjson.c ++++ nagios-4.5.1/cgi/objectjson.c @@ -1130,7 +1130,7 @@ int main(void) { json_result(query_time, THISCGI, svm_get_string_from_value(cgi_data.query, valid_queries), @@ -24,10 +24,10 @@ RESULT_SUCCESS, "")); json_object_append_object(json_root, "data", json_help(object_json_help)); break; -Index: nagios-4.4.2/cgi/statusjson.c +Index: nagios-4.5.1/cgi/statusjson.c =================================================================== ---- nagios-4.4.2.orig/cgi/statusjson.c -+++ nagios-4.4.2/cgi/statusjson.c +--- nagios-4.5.1.orig/cgi/statusjson.c ++++ nagios-4.5.1/cgi/statusjson.c @@ -1135,7 +1135,7 @@ int main(void) { json_result(query_time, THISCGI, svm_get_string_from_value(cgi_data.query, valid_queries), ++++++ nagios-4.4.3-enable-ppc64le.patch ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:03.849776783 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:03.853776930 +0200 @@ -1,6 +1,8 @@ ---- nagios-4.4.3/contrib/Makefile.in.orig 2019-01-20 10:19:00.388448528 +0100 -+++ nagios-4.4.3/contrib/Makefile.in 2019-01-20 10:19:53.952570327 +0100 -@@ -98,7 +98,7 @@ +Index: nagios-4.5.1/contrib/Makefile.in +=================================================================== +--- nagios-4.5.1.orig/contrib/Makefile.in ++++ nagios-4.5.1/contrib/Makefile.in +@@ -100,7 +100,7 @@ RPM_ARCH := i386 ifeq ($(ARCH),aarch64) RPM_ARCH := aarch64 else ++++++ nagios-4.4.7.tar.gz -> nagios-4.5.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/nagios/nagios-4.4.7.tar.gz /work/SRC/openSUSE:Factory/.nagios.new.26366/nagios-4.5.1.tar.gz differ: char 5, line 1 ++++++ nagios-disable_phone_home.patch ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:03.913779133 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:03.913779133 +0200 @@ -1,7 +1,8 @@ -diff --unified -r nagios-4.4.7-orig/base/utils.c nagios-4.4.7/base/utils.c ---- nagios-4.4.7-orig/base/utils.c 2022-04-14 16:19:37.000000000 +0200 -+++ nagios-4.4.7/base/utils.c 2022-05-13 19:58:24.615532600 +0200 -@@ -3322,142 +3322,6 @@ +Index: nagios-4.5.1/base/utils.c +=================================================================== +--- nagios-4.5.1.orig/base/utils.c ++++ nagios-4.5.1/base/utils.c +@@ -3330,142 +3330,6 @@ int check_for_nagios_updates(int force, /* checks for updates at api.nagios.org */ int query_update_api(void) { @@ -13,7 +14,6 @@ - char recv_buf[1024]; - int report_install = FALSE; - char *ptr = NULL; -- int current_line = 0; - int buf_index = 0; - int in_header = TRUE; - char *var = NULL; @@ -62,8 +62,8 @@ - } - -#ifdef HAVE_SSL -- SSL *ssl; -- SSL_CTX *ctx; +- SSL *ssl = NULL; +- SSL_CTX *ctx = NULL; - - int result = my_ssl_connect(api_server, 443, &sd, &ssl, &ctx, 2); - if(sd > 0 && result != ERROR) { @@ -78,7 +78,9 @@ - - /* close connection */ - SSL_free(ssl); +-#if OPENSSL_VERSION_NUMBER < 0x10100000 - SSL_CTX_free(ctx); +-#endif - close(sd); -#else - my_tcp_connect(api_server, 80, &sd, 2); @@ -100,7 +102,6 @@ - while((ptr = get_next_string_from_buf(recv_buf, &buf_index, sizeof(recv_buf)))) { - - strip(ptr); -- current_line++; - - if(!strcmp(ptr, "")) { - in_header = FALSE; @@ -144,4 +145,17 @@ return OK; } +Index: nagios-4.5.1/sample-config/cgi.cfg.in +=================================================================== +--- nagios-4.5.1.orig/sample-config/cgi.cfg.in ++++ nagios-4.5.1/sample-config/cgi.cfg.in +@@ -285,7 +285,7 @@ refresh_rate=90 + # PAGE TOUR + # Enable page tour for helpful tips and tricks on various pages + +-#enable_page_tour=1 ++enable_page_tour=0 + + + ++++++ nagios-output-length.patch ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:03.929779721 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:03.929779721 +0200 @@ -1,7 +1,7 @@ -Index: nagios-4.4.2/cgi/extinfo.c +Index: nagios-4.5.1/cgi/extinfo.c =================================================================== ---- nagios-4.4.2.orig/cgi/extinfo.c -+++ nagios-4.4.2/cgi/extinfo.c +--- nagios-4.5.1.orig/cgi/extinfo.c ++++ nagios-4.5.1/cgi/extinfo.c @@ -58,7 +58,7 @@ extern hoststatus *hoststatus_list; extern servicestatus *servicestatus_list; @@ -11,10 +11,10 @@ #define HEALTH_WARNING_PERCENTAGE 85 #define HEALTH_CRITICAL_PERCENTAGE 75 -Index: nagios-4.4.2/cgi/status.c +Index: nagios-4.5.1/cgi/status.c =================================================================== ---- nagios-4.4.2.orig/cgi/status.c -+++ nagios-4.4.2/cgi/status.c +--- nagios-4.5.1.orig/cgi/status.c ++++ nagios-4.5.1/cgi/status.c @@ -65,7 +65,7 @@ extern servicestatus *servicestatus_list static nagios_macros *mac; @@ -24,11 +24,11 @@ #define DISPLAY_HOSTS 0 #define DISPLAY_HOSTGROUPS 1 -Index: nagios-4.4.2/include/common.h +Index: nagios-4.5.1/include/common.h =================================================================== ---- nagios-4.4.2.orig/include/common.h -+++ nagios-4.4.2/include/common.h -@@ -508,7 +508,7 @@ extern const char *cmd_error_strerror(in +--- nagios-4.5.1.orig/include/common.h ++++ nagios-4.5.1/include/common.h +@@ -510,7 +510,7 @@ extern const char *cmd_error_strerror(in #define MAX_FILENAME_LENGTH 256 /* max length of path/filename that Nagios will process */ #define MAX_INPUT_BUFFER 1024 /* size in bytes of max. input buffer (for reading files, misc stuff) */ #define MAX_COMMAND_BUFFER 8192 /* max length of raw or processed command line */ @@ -37,10 +37,10 @@ #define MAX_DATETIME_LENGTH 48 -Index: nagios-4.4.2/include/nagios.h +Index: nagios-4.5.1/include/nagios.h =================================================================== ---- nagios-4.4.2.orig/include/nagios.h -+++ nagios-4.4.2/include/nagios.h +--- nagios-4.5.1.orig/include/nagios.h ++++ nagios-4.5.1/include/nagios.h @@ -277,7 +277,7 @@ extern struct load_control loadctl; of MAX_EXTERNAL_COMMAND_LENGTH in common.h to allow for passive checks results received through the external command file. EG 10/19/07 ++++++ nagios-random_data.patch ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:03.941780161 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:03.945780308 +0200 @@ -1,12 +1,12 @@ -Index: nagios-4.4.2/worker/ping/worker-ping.c +Index: nagios-4.5.1/worker/ping/worker-ping.c =================================================================== ---- nagios-4.4.2.orig/worker/ping/worker-ping.c -+++ nagios-4.4.2/worker/ping/worker-ping.c +--- nagios-4.5.1.orig/worker/ping/worker-ping.c ++++ nagios-4.5.1/worker/ping/worker-ping.c @@ -84,6 +84,7 @@ int main( int argc, char **argv, char ** if( worker( worker_socket)) { exit( 1); } -+ return 1; ++ return 1; } void parse_worker_command_line( int argc, char **argv, char **env, ++++++ nagios-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:03.961780896 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:03.965781043 +0200 @@ -1,7 +1,7 @@ # The name of that package is used since years - no need to change it for this new 'policy' addFilter("name-repeated-in-summary.*Nagios") # avoid FollowSymlinks in apache configuration -addFilter("files-duplicated-waste"); +# addFilter("files-duplicated-waste"); addFilter("files-duplicate.*/usr/share/nagios/.*"); addFilter("devel-file-in-non-devel-package.*/usr/lib.*/libnagios.a"); # we have an own rcnagios file that adds additional features otherwise missing if we would @@ -11,7 +11,7 @@ # of the package - so ignore it here as we create the dir via tmpfiles.d addFilter("tmpfile-not-in-filelist.*/var/run/nagios"); # not using the macro should not be a problem if we call the service directly: -addFilter("postin-without-tmpfile-creation.*/usr/lib/tmpfiles.d/nagios.conf"); +#addFilter("postin-without-tmpfile-creation.*/usr/lib/tmpfiles.d/nagios.conf"); # see boo#961115 - CVE-2016-0726 addFilter("zero-length.*/etc/nagios/htpasswd.users"); ++++++ nagios.service ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:03.993782071 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:03.997782217 +0200 @@ -3,7 +3,7 @@ After=syslog.target network.target [Service] -# added automatically, for details please see +# for details of the additional system hardening configuration please see # https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort ProtectSystem=full ProtectHome=true @@ -12,15 +12,12 @@ ProtectKernelModules=true ProtectControlGroups=true RestrictRealtime=true -# end of automatic additions -EnvironmentFile=/etc/sysconfig/nagios -ExecStartPre=/usr/lib/nagios/nagios-exec-start-pre +# end of system hardening ExecStartPre=/usr/sbin/nagios -v /etc/nagios/nagios.cfg -ExecStart=/usr/sbin/nagios /etc/nagios/nagios.cfg -ExecStartPost=/usr/lib/nagios/nagios-exec-start-post +ExecStart=/usr/sbin/nagios -d /etc/nagios/nagios.cfg +ExecStopPost=/usr/bin/rm -f /var/spool/nagios/nagios.cmd ExecReload=/usr/sbin/nagios -v /etc/nagios/nagios.cfg -ExecReload=/bin/kill -HUP $MAINPID -ExecReload=/usr/lib/nagios/nagios-exec-start-post +ExecReload=kill -HUP $MAINPID [Install] WantedBy=multi-user.target ++++++ nagios.tmpfiles ++++++ --- /var/tmp/diff_new_pack.gHJWEC/_old 2024-04-17 14:47:04.025783245 +0200 +++ /var/tmp/diff_new_pack.gHJWEC/_new 2024-04-17 14:47:04.029783393 +0200 @@ -1,3 +1,3 @@ # tmp directory for package nagios -d /var/run/nagios 0770 nagios nagcmd +d /run/nagios 0770 nagios nagcmd
