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-02-09 23:54:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios" Fri Feb 9 23:54:58 2024 rev:24 rq:1145456 version:4.4.7 Changes: -------- --- /work/SRC/openSUSE:Factory/nagios/nagios.changes 2022-09-23 14:15:47.082059746 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new.1815/nagios.changes 2024-02-09 23:55:29.173809714 +0100 @@ -1,0 +2,29 @@ +Fri Feb 9 14:07:26 UTC 2024 - Lars Vogdt <[email protected]> + +- remove some old rpmlintrc entries +- remove old (< 12.0) SUSE macros from spec file +- nagios-dch and nagios-contrib can be noarch +- use autopatch macro +- set right permission and ownership for /var/log/nagios/config.err + even if this file is just a ghost file in RPM +- use /run/nagios instead of /var/run/nagios for pid file +- get rid of really old (SLE9) fix for nagios command group (was + group www at that time). Since SLE10, we use and own group + (nagcmd) instead. As we do not support to migrate from SLE9 to + SLE11 and beyond directly, this migration should have been done + long time ago already + +------------------------------------------------------------------- +Thu Feb 8 09:57:33 UTC 2024 - Dominique Leuenberger <[email protected]> + +- Do not provide user/group symbols and actually stop generating + those users/groups alltogether. The package system-user-nagios is + taking care of the user setup. + +------------------------------------------------------------------- +Tue Feb 6 08:26:26 UTC 2024 - Marcus Meissner <[email protected]> + +- provide user(nagios), group(nagios), group(wwwrun), user(nagcmd) + bsc#1219600 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.GYQuE8/_old 2024-02-09 23:55:29.853834219 +0100 +++ /var/tmp/diff_new_pack.GYQuE8/_new 2024-02-09 23:55:29.857834363 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects #Compat macro for new _fillupdir macro introduced in Nov 2017 @@ -68,10 +67,7 @@ # PATCH-FIX-UPSTREAM allow ppc64le builds in contrib Makefile Patch18: nagios-4.4.3-enable-ppc64le.patch BuildRequires: doxygen -# yes: we still build for SLE10 -%if 0%{?suse_version} > 1020 BuildRequires: fdupes -%endif BuildRequires: bzip2 BuildRequires: freetype2-devel BuildRequires: gd-devel @@ -100,23 +96,19 @@ Requires(pre): grep %if 0%{?suse_version} Requires(pre): %fillup_prereq -%if 0%{?suse_version} < 01200 -Requires(pre): %insserv_prereq -Requires: cron -%endif -Requires(pre): shadow Recommends: %{name}-www # this package contains shared tools with icinga Recommends: monitoring-tools Recommends: icinga-monitoring-tools Recommends: %{name}-plugins +Requires(pre): system-user-nagios %else Requires(pre): shadow-utils %endif Requires(pre): permissions Requires(pre): sed Requires: mailx -%define nslockfile_dir /var/run/%{name} +%define nslockfile_dir /run/%{name} %define nslockfile %nslockfile_dir/%{name}.pid %define apache2_sysconfdir %{_sysconfdir}/apache2/conf.d # Macro that print mesages to syslog at package (un)install time @@ -177,9 +169,7 @@ Group: System/Monitoring Requires(pre): nagios-theme-switcher Requires: nagios-www >= 3.0 -%if 0%{?suse_version} >= 01210 BuildArch: noarch -%endif %description theme-exfoliation Exfoliation is a simple makeover for the Nagios Core web interface. It consists @@ -189,6 +179,7 @@ Summary: HTML and CGI files that do not call home Group: System/Monitoring Requires: %{name}-www = %{version} +BuildArch: noarch %description www-dch Several CGI programs are included with Nagios in order to allow you to @@ -211,6 +202,7 @@ Summary: Files from the contrib directory Group: Development/Tools/Other Requires: %{name} = %{version} +BuildArch: noarch %description contrib This package contains all the files from the contrib directory @@ -234,6 +226,7 @@ %prep %setup -q +%if 0%{?suse_version} < 01500 %patch3 -p1 %patch4 -p1 %patch11 -p1 @@ -241,6 +234,9 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%else +%autopatch -p1 +%endif find -name ".gitignore" | xargs rm # fixing permissions the dirty way.... chmod 644 Changelog LEGAL LICENSE README.md sample-config/README sample-config/template-object/README @@ -398,33 +394,13 @@ # move exfoliation theme to separate folder mkdir -p %{buildroot}%{_datadir}/nagios-themes/exfoliation mv %{buildroot}%{nagios_datadir}/{stylesheets,images} %{buildroot}%{_datadir}/nagios-themes/exfoliation/ -%if 0%{?suse_version} > 1020 %fdupes %{buildroot}%{_datadir}/nagios-themes/exfoliation/ -%endif mkdir -p %{buildroot}%{nagios_datadir}/{stylesheets,images} cp -rf html/stylesheets/* %{buildroot}%{nagios_datadir}/stylesheets/ cp -rf html/images/* %{buildroot}%{nagios_datadir}/images/ -%pre -# Create user and group on the system if necessary -%nagios_user_group_add -%nagios_command_user_group_add -# update? -if [ ${1:-0} -gt 1 ]; then - # in the past, group www was used as nagios_command_group - now we use the default: nagcmd - if id -Gn %{nagios_user} 2>/dev/null | grep -q %{nagios_command_group} >/dev/null 2>&1 ; then - : # %%{nagios_user} is already in %%nagios_command_group group - else - # Add %%{nagios_user} to %%nagios_command_group. - %if 0%{?suse_version} > 1220 - usermod -a -G %{nagios_command_group} %{nagios_user} - %else - groupmod -A %{nagios_user} %{nagios_command_group} 2>/dev/null - %endif - %{nnmmsg} "Added %{nagios_user} to %{nagios_command_group}" - fi -fi %if %{with systemd} +%pre %service_add_pre %{name}.service %{name}-archive.service %{name}-archive.timer %endif @@ -492,11 +468,7 @@ : # $wwwusr (default: %%nagios_command_user) is already in Nagios cmd group else # modify apache user, adding it to nagios_command_group - %if 0%{?suse_version} > 1220 usermod -a -G %{nagios_command_group} $wwwusr - %else - groupmod -A $wwwusr %{nagios_command_group} 2>/dev/null - %endif %{nnmmsg} "User $wwwusr added to group %{nagios_command_group} so sending commands to Nagios from the CGI is possible." fi # Update ? @@ -577,7 +549,7 @@ %endif %config(noreplace) %{nagios_sysconfdir}/*.cfg %config(noreplace) %{nagios_sysconfdir}/objects/*.cfg -%ghost %config(missingok,noreplace) %{nagios_logdir}/config.err +%ghost %config(missingok,noreplace) %attr(0644,%{nagios_user},%{nagios_group}) %{nagios_logdir}/config.err # directories with special handling: %attr(0755,root,%{nagios_command_group}) %dir %{nagios_sysconfdir} %attr(0755,root,%{nagios_command_group}) %dir %{nagios_sysconfdir}/objects ++++++ nagios-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.GYQuE8/_old 2024-02-09 23:55:29.957837966 +0100 +++ /var/tmp/diff_new_pack.GYQuE8/_new 2024-02-09 23:55:29.961838111 +0100 @@ -1,8 +1,3 @@ -# common.css is used in cgi - and can be expanded by user -addFilter("zero-length.*/usr/share/nagios/stylesheets/common.css"); -# we need xntp for SLES9 -addFilter("init-script-non-var-dependency.*/etc/init.d/nagios xntpd"); -addFilter("subsys-unsupported.*/etc/init.d/nagios"); # 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 @@ -11,7 +6,7 @@ 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 # use a simple simlink to /usr/sbin/service -addFilter("suse-missing-rclink.*nagios"); +addFilter("suse-missing-rclink.*nagios.*"); # Seems like a bug in Factory: adding this as %ghost in the file list breaks the build # of the package - so ignore it here as we create the dir via tmpfiles.d addFilter("tmpfile-not-in-filelist.*/var/run/nagios");
