diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index 7f361e7..2d6adad 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 10 00:48:01 CEST 2018 - ro@suse.de + +- copy usr.lib.nagios.plugins.check_procs as + usr.lib.nagios.plugins.check_procs.sle15 and use that for sle15 + and above. "ptrace" to enable ptrace globally is needed here. + ------------------------------------------------------------------- Wed Nov 8 14:14:00 UTC 2017 - kstreitova@suse.com diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec index 79a53dd..41751b7 100644 --- a/monitoring-plugins.spec +++ b/monitoring-plugins.spec @@ -1,7 +1,7 @@ # # spec file for package monitoring-plugins # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: monitoring-plugins Version: 2.2 Release: 0 Summary: The Monitoring Plug-Ins -License: GPL-2.0+ and GPL-3.0 +License: GPL-2.0-or-later AND GPL-3.0-only Group: System/Monitoring Url: http://monitoring-plugins.org/ Source0: %{name}-%{version}.tar.bz2 @@ -48,6 +48,7 @@ Source31: usr.lib.nagios.plugins.check_load Source32: usr.lib.nagios.plugins.check_procs Source33: usr.lib.nagios.plugins.check_swap Source34: usr.lib.nagios.plugins.check_users +Source35: usr.lib.nagios.plugins.check_procs.sle15 # PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces) Patch1: %{name}-2.1.1-check_logfile.patch # PATCH-FIX-OPENSUSE do not use chown in Makefile (not possible when building as normal user) @@ -1175,7 +1176,11 @@ install -m 644 %{SOURCE24} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE25} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE30} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/apparmor.d/ +%if 0%{?suse_version} >= 1500 +install -m 644 %{SOURCE35} %{buildroot}%{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_procs +%else install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/apparmor.d/ +%endif install -m 644 %{SOURCE33} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE34} %{buildroot}%{_sysconfdir}/apparmor.d/ diff --git a/usr.lib.nagios.plugins.check_procs.sle15 b/usr.lib.nagios.plugins.check_procs.sle15 new file mode 100644 index 0000000..c6922c0 --- /dev/null +++ b/usr.lib.nagios.plugins.check_procs.sle15 @@ -0,0 +1,13 @@ +#include +/usr/lib/nagios/plugins/check_procs { + #include + #include + #include + + ptrace, + + /bin/ps rix, + /proc/ r, + /proc/** r, + /usr/lib/nagios/plugins/check_procs mr, +}