Hello community,
here is the log from the commit of package nrpe for openSUSE:Factory checked in at 2017-05-02 08:54:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nrpe (Old)
and /work/SRC/openSUSE:Factory/.nrpe.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nrpe"
Tue May 2 08:54:53 2017 rev:3 rq:492268 version:3.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nrpe/nrpe.changes 2017-02-07 12:03:29.349437850 +0100
+++ /work/SRC/openSUSE:Factory/.nrpe.new/nrpe.changes 2017-05-02 08:54:54.394206371 +0200
@@ -1,0 +2,53 @@
+Fri Apr 21 15:26:52 CEST 2017 - ro@suse.de
+
+- require inet-daemon only if suse_version is set
+- call centos macros for systemd
+- drop Requires=var-run.mount line from service file on centos
+
+-------------------------------------------------------------------
+Fri Apr 21 12:03:22 CEST 2017 - ro@suse.de
+
+- fix buildrequires for centos:
+ - tcpd-devel is tcp_wrappers-devel
+ - kerberos is krb5-devel
+
+-------------------------------------------------------------------
+Mon Apr 17 17:14:00 UTC 2017 - lars@linux-schulserver.de
+
+-update to 3.1.0:
+ ENHANCEMENTS
+ - Added option to nrpe.cfg.in that can override hard-coded NASTY_METACHARS (John Frickson)
+ - While processing 'include_dir' statement, sort the files (Philippe Kueck / John Frickson)
+ - nrpe can now write to a log file using 'log_file=' in nrpe.cfg (John Frickson)
+ - check_nrpe can now write to a log file using '--log-file=' or '-g' options (John Frickson)
+ FIXES
+ - Added missing debugging syslog entries, and changed printf()'s to syslog()'s. (Jobst Schmalenbach)
+ - Fix help output for ssl option (configure) (Ruben Kerkhof)
+ - Fixes to README.SSL.md and SECURITY.md (Elan Ruusamäe)
+ - Changed the 'check_load' command in nrpe.cfg.in (minusdavid)
+ - Minor change to logging in check_nrpe (John Frickson)
+ - Removed function `b64_decode` which wasn't being used (John Frickson)
+ - check_nrpe ignores -a option when -f option is specified (John Frickson)
+ - Added missing LICENSE file (John Frickson)
+ - Off-by-one BO in my_system() (John Frickson)
+ - Add SOURCE_DATE_EPOCH specification support for reproducible builds. (Bas Couwenberg)
+ - nrpe 3.0.1 allows TLSv1 and TLSv1.1 when I configure for TLSv1.2+ (John Frickson)
+ - "Remote %s accepted a Version %s Packet", please add to debug (John Frickson)
+ - nrpe 3.0.1 segfaults when key and/or cert are broken symlinks (John Frickson)
+ - Fixed a couple of typos in docs/NRPE.* files (Ludmil Meltchev)
+ - Changed release date to ISO format (yyyy-mm-dd) (John Frickson)
+ - Fix systemd unit description (Bas Couwenberg)
+ - Add reload command to systemd service file (Bas Couwenberg)
+ - fix file not found error when updating version (Sven Nierlein)
+ - Spelling fixes (Josh Soref)
+ - Return UNKNOWN when check_nrpe cannot communicate with nrpe and -u set (John Frickson)
+ - xinetd.d parameter causes many messages in log file (John Frickson)
+ - Fixes for openssl 1.1.x (Stephen Smoogen / John Frickson)
+ - PATH and other environment variables not set with numeric nrpe_user (John Frickson)
+- remove upstreamed patches:
+ + nrpe-more_random.patch
+ + nrpe-drop_privileges_before_writing_pidfile.patch
+ + nrpe-3.0-Makefile_use_DESTDIR.patch
+- refreshed other patches
+
+-------------------------------------------------------------------
Old:
----
nrpe-3.0-Makefile_use_DESTDIR.patch
nrpe-3.0.tar.bz2
nrpe-drop_privileges_before_writing_pidfile.patch
nrpe-more_random.patch
New:
----
nrpe-3.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nrpe.spec ++++++
--- /var/tmp/diff_new_pack.QKze9n/_old 2017-05-02 08:54:55.474054104 +0200
+++ /var/tmp/diff_new_pack.QKze9n/_new 2017-05-02 08:54:55.478053540 +0200
@@ -1,8 +1,7 @@
#
# spec file for package nrpe
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -24,15 +23,14 @@
%define _rundir %{_localstatedir}/run
%endif
-%if 0%{?suse_version} >= 1210
+%if 0%{?suse_version} >= 1210 || 0%{?centos_version} >= 600
%bcond_without systemd
%else
%bcond_with systemd
%endif
-
Name: nrpe
-Version: 3.0
+Version: 3.1.0
Release: 0
Summary: Nagios Remote Plug-In Executor
License: GPL-2.0+
@@ -51,25 +49,23 @@
Source11: README.SUSE.systemd-addon
# apparmor profile
Source12: usr.sbin.nrpe
-# PATCH-FIX-UPSTREAM produce more randomness and do not reduce entropy on Linux kernels
-Patch1: nrpe-more_random.patch
# PATCH-FIX-UPSTREAM improve help output of nrpe and check_nrpe
Patch2: nrpe-improved_help.patch
-# PATCH-FIX-UPSTREAM drop privileges before writing the pidfile for more safety
-Patch3: nrpe-drop_privileges_before_writing_pidfile.patch
# PATCH-FIX-openSUSE fix pathnames for nrpe_check_control command
Patch4: nrpe_check_control.patch
# PATCH-FIX-UPSTREAM using implicit definitions of functions
Patch5: nrpe-implicit_declaration.patch
-# PATCH-FIX-UPSTREAM allow variable DESTDIR during install
-Patch6: nrpe-3.0-Makefile_use_DESTDIR.patch
+%if 0%{?suse_version}
PreReq: %fillup_prereq
PreReq: %insserv_prereq
+%endif
PreReq: /bin/logger
PreReq: coreutils
PreReq: grep
+%if 0%{?suse_version}
PreReq: netcfg
PreReq: pwdutils
+%endif
PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1130
@@ -81,9 +77,13 @@
#
BuildRequires: monitoring-plugins-common
BuildRequires: nagios-rpm-macros
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+BuildRequires: tcp_wrappers-devel
+%else
BuildRequires: tcpd-devel
+%endif
#
-%if 0%{?suse_version} > 1000
+%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: krb5-devel
%else
BuildRequires: heimdal-devel
@@ -103,7 +103,9 @@
Recommends: monitoring-plugins-disk
Recommends: monitoring-plugins-procs
%else
+%if 0%{?suse_version}
Requires: inet-daemon
+%endif
Requires: monitoring-plugins
%endif
#
@@ -159,16 +161,12 @@
%prep
%setup -q
-%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
cp -a %{SOURCE10} .
cp -a %{SOURCE12} .
%if 0%{?suse_version} >= 1210
-sed -e '/Have a lot of fun/d' README.SUSE
cat %{SOURCE11} >> README.SUSE
%endif
chmod -x contrib/README.nrpe_check_control
@@ -274,7 +272,11 @@
# install systemd specific files
install -Dm644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
install -Dm644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service
+%if 0%{?centos_version}
+sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" -e "/Requires=var-run.mount/d" %{buildroot}%{_unitdir}/%{name}.service
+%else
sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}.service
+%endif
sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}@.service
install -Dm644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}.socket
install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
@@ -301,23 +303,37 @@
echo "nrpe %nrpeport/tcp # Nagios nrpe" >> etc/services
fi
%if %{with systemd}
+%if 0%{?centos_version}
+#systemd_pre nrpe.service nrpe@.service nrpe.socket
+%else
%service_add_pre nrpe.service nrpe@.service nrpe.socket
%endif
+%endif
%preun
%stop_on_removal %{name}
%if %{with systemd}
+%if 0%{?centos_version}
+%systemd_preun nrpe.service nrpe@.service nrpe.socket
+%else
%service_del_preun nrpe.service nrpe@.service nrpe.socket
%endif
+%endif
%post
+%if 0%{?suse_version}
%if 0%{?suse_version} <= 1230
%{fillup_and_insserv -fy %{name}}
%else
%fillup_only %{name}
%endif
+%endif
%if %{with systemd}
+%if 0%{?centos_version}
+%systemd_post nrpe.service nrpe@.service nrpe.socket
+%else
%service_add_post nrpe.service nrpe@.service nrpe.socket
+%endif
%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
%endif
@@ -365,10 +381,16 @@
%postun
%restart_on_update nrpe
+%if 0%{?suse_version}
%insserv_cleanup
+%endif
%if %{with systemd}
+%if 0%{?centos_version}
+%systemd_postun_with_restart nrpe.service nrpe@.service nrpe.socket
+%else
%service_del_postun nrpe.service nrpe@.service nrpe.socket
%endif
+%endif
%files
%defattr(-,root,root)
++++++ nrpe-3.0.tar.bz2 -> nrpe-3.1.0.tar.bz2 ++++++
++++ 5109 lines of diff (skipped)
++++++ nrpe-implicit_declaration.patch ++++++
--- /var/tmp/diff_new_pack.QKze9n/_old 2017-05-02 08:54:55.861999401 +0200
+++ /var/tmp/diff_new_pack.QKze9n/_new 2017-05-02 08:54:55.861999401 +0200
@@ -1,7 +1,7 @@
-Index: nrpe-3.0/contrib/nrpe_check_control.c
+Index: nrpe-3.1.0/contrib/nrpe_check_control.c
===================================================================
---- nrpe-3.0.orig/contrib/nrpe_check_control.c
-+++ nrpe-3.0/contrib/nrpe_check_control.c
+--- nrpe-3.1.0.orig/contrib/nrpe_check_control.c
++++ nrpe-3.1.0/contrib/nrpe_check_control.c
@@ -1,4 +1,5 @@
#include