Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nrpe for openSUSE:Factory checked in
at 2023-03-16 22:59:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nrpe (Old)
and /work/SRC/openSUSE:Factory/.nrpe.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nrpe"
Thu Mar 16 22:59:44 2023 rev:17 rq:1072360 version:4.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/nrpe/nrpe.changes 2021-10-15
23:04:11.190106998 +0200
+++ /work/SRC/openSUSE:Factory/.nrpe.new.31432/nrpe.changes 2023-03-16
22:59:47.435884423 +0100
@@ -1,0 +2,8 @@
+Thu Mar 16 09:14:28 UTC 2023 - Lars Vogdt <l...@linux-schulserver.de>
+
+- use getent to check if the nrpe port is already added to the
+ services description in post-script (bsc#1205157)
+- remove xinetd snipplets on newer (>15.5) distributions:
+ xinetd is not supported any longer
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nrpe.spec ++++++
--- /var/tmp/diff_new_pack.Iu0o47/_old 2023-03-16 22:59:47.987887142 +0100
+++ /var/tmp/diff_new_pack.Iu0o47/_new 2023-03-16 22:59:47.991887161 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nrpe
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -67,7 +67,6 @@
Patch7: nrpe-disable-chkconfig_in_Makefile.patch
# PATCH-FIX-UPSTREAM this fills up the logs on the clients without real need
Patch8: nrpe-4.0.4-silence_wrong_package_version_messages.patch
-BuildRequires: monitoring-plugins-common
BuildRequires: nagios-rpm-macros
Requires(pre): grep
Requires(pre): sed
@@ -82,8 +81,6 @@
%else
Requires(pre): %{_bindir}/logger
%endif
-Requires(pre): netcfg
-Requires(pre): pwdutils
%if 0%{?suse_version} > 1130
%if 0%{?suse_version} <= 1230
Requires(pre): sysvinit(network)
@@ -91,9 +88,20 @@
%endif
%endif
BuildRequires: krb5-devel
+%if 0%{?suse_version}
+Requires(pre): netcfg
+Requires(pre): pwdutils
BuildRequires: libopenssl-devel
-BuildRequires: openssl
+BuildRequires: monitoring-plugins-common
BuildRequires: tcpd-devel
+%endif
+%if 0%{?fedora_version}
+Requires(pre): shadow-utils
+BuildRequires: nagios-plugins-all
+BuildRequires: openssl-devel
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: openssl
Recommends: inet-daemon
Recommends: monitoring-plugins-disk
Recommends: monitoring-plugins-load
@@ -276,12 +284,17 @@
# remove the uninstall script: this is done by RPM
rm %{buildroot}/%{_sbindir}/nrpe-uninstall
+%if 0%{?suse_version} >= 1599
+# remove xinetd snipplets on newer distribution, where we do not support
xinetd any longer
+rm -rf %{buildroot}%{_sysconfdir}/xinetd.d
+%endif
+
%pre
# Create user and group on the system if necessary
%nagios_user_group_add
%nagios_command_user_group_add
# check if the port for nrpe is already defined in /etc/services
-if grep -q %{nrpeport} %{_sysconfdir}/services ; then
+if getent services nrpe >/dev/null ; then
: OK - port already defined
else
%{nnmmsg} "Adding port %{nrpeport} to %{_sysconfdir}/services"
@@ -322,6 +335,7 @@
elif systemctl -q is-enabled xinetd.service ; then
echo "systemctl -q reload xinetd.service" >> "$STATUS"
else
+ # JFYI: no need to restart the nrpe.socket
touch "$STATUS"
fi
%else
@@ -387,10 +401,10 @@
%{_mandir}/man8/nrpe.8%{?ext_man}
%dir %{_sysconfdir}/nrpe.d
%config(noreplace) %{_sysconfdir}/nrpe.cfg
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 && 0%{?suse_version} < 1599
%dir %{_sysconfdir}/xinetd.d
-%endif
%config(noreplace) %{_sysconfdir}/xinetd.d/nrpe
+%endif
%if %{without firewalld}
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
%endif
