Hello community,
here is the log from the commit of package nrpe for openSUSE:Factory checked in at 2020-02-29 21:23:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nrpe (Old)
and /work/SRC/openSUSE:Factory/.nrpe.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nrpe"
Sat Feb 29 21:23:40 2020 rev:11 rq:780480 version:3.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/nrpe/nrpe.changes 2018-10-23 20:38:12.460700764 +0200
+++ /work/SRC/openSUSE:Factory/.nrpe.new.26092/nrpe.changes 2020-02-29 21:23:57.898451250 +0100
@@ -1,0 +2,49 @@
+Fri Feb 21 15:52:55 UTC 2020 - lars@linux-schulserver.de
+
+- nrpe.xml firewalld file is handled by firewalld package
+- Leap 15.1 is suse_version 1500 (thanks, dimstar)
+
+-------------------------------------------------------------------
+Mon Feb 3 15:09:45 UTC 2020 - Dominique Leuenberger
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+ shortcut through the -mini flavors.
+
+-------------------------------------------------------------------
+Sun Mar 17 01:38:53 UTC 2019 - Lars Vogdt
+
+- Do not package nrpe.xml for Leap 15.0, as it is included in
+ firewalld package there.
+
+-------------------------------------------------------------------
+Sun Feb 17 16:02:23 UTC 2019 - lars@linux-schulserver.de
+
+- add nrpe.xml snipplet for firewalld
+- still ship nrpe snipplet for SuSEfirewalld for now
+- use systemd files directly from upstream:
+ + drop Requires=var-run.mount line from service file
+ + drop nrpe.service
+ + drop nrpe.socket
+ + do not create tmpfiles.d/nrpe in spec any longer
+- handle migration from /etc/nagios/nrpe.cfg to /etc/nrpe.cfg also
+ for systemd case (triggerun)
+- increase warn/crit level for processes to 350/400 in a default
+ installation
+- added patch and dh.h file to NOT re-calculate dh.h parameters
+ during each build (for reproducable builds).
+ Can be enable/disable by setting the 'reproducable' build
+ condition. Default is: "on" for suse_version >= 15
+ + nrpe-3.2.1-static_dh_parameters.patch
+ + nrpe-3.2.1-dh.h
+- use _rundir and _tmpfilesdir macros everywhere
+- do not create nagios user/group during install on (open)SUSE
+ systems and rely on the files section here instead
+- rename nagios-nrpe-rpmlintrc and nagios-nrpe-SuSEfirewall2 to
+ nrpe-rpmlintrc and nrpe-SuSEfirewall2
+- simplify rpmlintrc
+- build nrpe-doc package as noarch
+- specfile cleanup & remove other distribution specials
+- disable chkconfig call in Makefile on old distributions
+ nrpe-3.2.1-disable-chkconfig_in_Makefile.patch
+
+-------------------------------------------------------------------
Old:
----
nagios-nrpe-SuSEfirewall2
nagios-nrpe-rpmlintrc
nrpe.service
nrpe.socket
New:
----
nrpe-3.2.1-dh.h
nrpe-3.2.1-disable-chkconfig_in_Makefile.patch
nrpe-3.2.1-static_dh_parameters.patch
nrpe-SuSEfirewall2
nrpe-rpmlintrc
nrpe.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nrpe.spec ++++++
--- /var/tmp/diff_new_pack.KKDlPc/_old 2020-02-29 21:23:59.314454052 +0100
+++ /var/tmp/diff_new_pack.KKDlPc/_new 2020-02-29 21:23:59.314454052 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nrpe
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,113 +16,92 @@
#
-# Macro that print mesages to syslog at package (un)install time
%define nnmmsg logger -t %{name}/rpm
%define nrpeport 5666
%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
+ %define _rundir %{_localstatedir}/run
%endif
-
+%{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d}
%if 0%{?suse_version} >= 1210 || 0%{?centos_version} >= 600
-%bcond_without systemd
+ %bcond_without systemd
%else
-%bcond_with systemd
+ %bcond_with systemd
+%endif
+%if 0%{?suse_version} >= 01500
+ %bcond_without firewalld
+%else
+ %bcond_with firewalld
+%endif
+%if 0%{?suse_version} >= 01500
+%bcond_without reproducable
+%else
+%bcond_with reproducable
%endif
-
Name: nrpe
Version: 3.2.1
Release: 0
Summary: Nagios Remote Plug-In Executor
License: GPL-2.0-or-later
Group: System/Monitoring
-Url: http://www.nagios.org/
+URL: http://www.nagios.org/
Source0: nrpe-%{version}.tar.bz2
Source1: nrpe.init
-Source2: nagios-nrpe-rpmlintrc
-Source3: nagios-nrpe-SuSEfirewall2
+Source2: nrpe-rpmlintrc
+Source3: nrpe-SuSEfirewall2
Source4: nrpe.8
Source5: check_nrpe.cfg
-Source6: nrpe.service
-Source8: nrpe.socket
Source10: README.SUSE
Source11: README.SUSE.systemd-addon
-# apparmor profile
Source12: usr.sbin.nrpe
+Source13: nrpe.xml
+Source14: nrpe-3.2.1-dh.h
# PATCH-FIX-UPSTREAM improve help output of nrpe and check_nrpe
Patch2: nrpe-improved_help.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
-%if 0%{?suse_version}
+# PATCH-FIX-openSUSE patch used to NOT re-calculate dh.h parameters (for reproducable builds)
+Patch6: nrpe-3.2.1-static_dh_parameters.patch
+# PATCH-FIX-openSUSE disable chkconfig call in Makefile
+Patch7: nrpe-3.2.1-disable-chkconfig_in_Makefile.patch
+BuildRequires: monitoring-plugins-common
+BuildRequires: nagios-rpm-macros
+Requires(pre): grep
+Requires(pre): sed
+Provides: nagios-nrpe = %{version}
+Obsoletes: nagios-nrpe < 2.14
+Provides: nagios-nrpe-client = %{version}
+Obsoletes: nagios-nrpe-client < %{version}
PreReq: %fillup_prereq
-PreReq: %insserv_prereq
-%endif
%if 0%{?suse_version} < 1200
+PreReq: %insserv_prereq
PreReq: /bin/logger
%else
-PreReq: /usr/bin/logger
-%endif
-PreReq: coreutils
-PreReq: grep
-%if 0%{?suse_version}
-PreReq: netcfg
-PreReq: pwdutils
+Requires(pre): %{_bindir}/logger
%endif
-PreReq: sed
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires(pre): netcfg
+Requires(pre): pwdutils
%if 0%{?suse_version} > 1130
%if 0%{?suse_version} <= 1230
-PreReq: sysvinit(network)
-PreReq: sysvinit(syslog)
+Requires(pre): sysvinit(network)
+Requires(pre): sysvinit(syslog)
%endif
%endif
-#
-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 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: krb5-devel
-%else
-BuildRequires: heimdal-devel
-%endif
-#
-%if 0%{?suse_version} > 1020
BuildRequires: libopenssl-devel
BuildRequires: openssl
-%else
-BuildRequires: openssl-devel
-%endif
-#
-%if 0%{?suse_version} > 1020
+BuildRequires: tcpd-devel
Recommends: inet-daemon
-Recommends: monitoring-plugins-users
-Recommends: monitoring-plugins-load
Recommends: monitoring-plugins-disk
+Recommends: monitoring-plugins-load
Recommends: monitoring-plugins-procs
-%else
-%if 0%{?suse_version}
-Requires: inet-daemon
-%endif
-Requires: monitoring-plugins
-%endif
-#
-Provides: nagios-nrpe = %{version}
-Obsoletes: nagios-nrpe < 2.14
-Provides: nagios-nrpe-client = %{version}
-Obsoletes: nagios-nrpe-client < %{version}
-
+Recommends: monitoring-plugins-users
%if %{with systemd}
-BuildRequires: systemd
-%{?systemd_requires}
+BuildRequires: pkgconfig(systemd)
+%{?systemd_ordering}
%endif
-
-%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
NRPE can be used to run Nagios plugins on a remote machine for
@@ -135,6 +114,9 @@
Group: Documentation/Other
Provides: nagios-nrpe-doc = %{version}
Obsoletes: nagios-nrpe-doc < 2.14
+%if 0%{?suse_version} >= 1230
+BuildArch: noarch
+%endif
%description doc
This package contains the README files, OpenOffice and PDF
@@ -143,13 +125,13 @@
%package -n monitoring-plugins-nrpe
Summary: NRPE plugin
Group: System/Monitoring
-%if 0%{?suse_version} > 1020
-Recommends: monitoring_daemon
-%endif
Provides: nagios-nrpe-server = %{version}-%{release}
Obsoletes: nagios-nrpe-server < 2.14
Provides: nagios-plugins-nrpe = %{version}-%{release}
Obsoletes: nagios-plugins-nrpe < 2.15-%{release}
+%if 0%{?suse_version} > 1020
+Recommends: monitoring_daemon
+%endif
%description -n monitoring-plugins-nrpe
This package contains the plugin for the host runing the Nagios
@@ -167,18 +149,21 @@
%patch2 -p1
%patch4 -p1
%patch5 -p1
+%if %{with reproducable}
+%patch6 -p1
+install -m644 %{SOURCE14} include/dh.h
+%endif
+%patch7 -p1
cp -a %{SOURCE10} .
cp -a %{SOURCE12} .
%if 0%{?suse_version} >= 1210
cat %{SOURCE11} >> README.SUSE
%endif
chmod -x contrib/README.nrpe_check_control
-%if 0%{?suse_version} > 01110
# increase the number of 'allowed' processes on newer systems:
-sed -i "s|check_procs -w 150 -c 200|check_procs -w 250 -c 300|g" sample-config/nrpe.cfg.in
-%endif
+sed -i "s|check_procs -w 150 -c 200|check_procs -w 350 -c 400|g" sample-config/nrpe.cfg.in
# add the new include directory
-sed -i "s|#include_dir=<someotherdirectory>|#include_dir=<someotherdirectory>\ninclude_dir=/etc/nrpe.d|g" sample-config/nrpe.cfg.in
+sed -i "s|#include_dir=<someotherdirectory>|#include_dir=<someotherdirectory>\ninclude_dir=%{_sysconfdir}/nrpe.d|g" sample-config/nrpe.cfg.in
%build
%configure \
@@ -192,7 +177,7 @@
--bindir=%{_sbindir} \
--sbindir=%{_sbindir} \
--with-logdir=%{nagios_logdir} \
- --with-piddir=/var/run/nrpe \
+ --with-piddir=%{_rundir}/%{name} \
--with-pluginsdir=%{nagios_plugindir} \
--enable-install-method=os \
--with-dist-type=suse \
@@ -208,7 +193,7 @@
--with-nagios-group=%{nagios_group} \
--with-nrpe-user=%{nagios_user} \
--with-nrpe-group=%{nagios_group} \
- --with-nrpe-port=%nrpeport \
+ --with-nrpe-port=%{nrpeport} \
--enable-command-args \
--enable-bash-command-substitution \
--enable-ssl
@@ -217,14 +202,16 @@
gcc %{optflags} -o contrib/nrpe_check_control contrib/nrpe_check_control.c
%install
-%nagios_command_user_group_add
install -d %{buildroot}%{_sysconfdir}/xinetd.d
install -d %{buildroot}%{_rundir}/%{name}
%if %{with systemd}
-install -d %{buildroot}/usr/lib/tmpfiles.d
+install -d %{buildroot}%{_tmpfilesdir}/
+install -d %{buildroot}%{_unitdir}/
+%else
+install -d %{buildroot}%{_sysconfdir}/init.d/
%endif
install -d %{buildroot}%{_sysconfdir}/nrpe.d
-make install install-config install-inetd install-daemon \
+make install install-config install-inetd install-daemon install-init \
DESTDIR=%{buildroot} \
CGICFGDIR="%{_sysconfdir}" \
NAGIOS_INSTALL_OPTS="" \
@@ -234,16 +221,28 @@
INIT_OPTS=""
install -Dm 644 %{SOURCE4} %{buildroot}%{_mandir}/man8/nrpe.8
-%if 0%{?suse_version} <= 1230
-install -Dm 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/nrpe
-ln -s -f ../../etc/init.d/nrpe %{buildroot}%{_sbindir}/rcnrpe
+
+%if %{with systemd}
+ sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}.service
+ install -Dm644 startup/default-socket %{buildroot}%{_unitdir}/%{name}.socket
+ ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcnrpe
%else
-ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcnrpe
+ %if 0%{?suse_version} <= 1230
+ # openSUSE uses own nrpe init script
+ rm %{buildroot}%{_sysconfdir}/init.d/nrpe
+ install -Dm 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/nrpe
+ ln -s -f ../..%{_initddir}/nrpe %{buildroot}%{_sbindir}/rcnrpe
+ %endif
%endif
-# install SuSEfirewall2 script
-%if 0%{?suse_version} > 1020
-install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
+%if %{with firewalld}
+ # firewalld service file - handled by firewalld package now
+ # install -Dm 644 %{SOURCE13} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml
+ # temporary: also install SuSEfirewall2 snipplet for a while
+ install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
+%else
+ # install SuSEfirewall2 script
+ install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
%endif
# fix pid_file in nrpe.cfg
@@ -271,21 +270,6 @@
# install simple nrpe.cfg for the Nagios server in the objects directory
install -Dm644 %{SOURCE5} %{buildroot}%{nagios_sysconfdir}/objects/check_nrpe.cfg
-%if %{with systemd}
-# install systemd specific files
-install -Dm644 %{SOURCE6} %{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
-install -Dm644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}.socket
-install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
-echo "d %{_rundir}/%{name} 0755 %{nagios_user} %{nagios_group} -" > %{buildroot}/%{_tmpfilesdir}/%{name}.conf
-chmod 644 %{buildroot}/%{_tmpfilesdir}/%{name}.conf
-%endif
-
-# install config update script in doc dir...
install -Dm755 update-cfg.pl %{buildroot}/%{_defaultdocdir}/%{name}/examples/update-cfg.pl
# ...and also the files we want in the main package
install -m644 CHANGELOG.md README.SUSE README.md usr.sbin.nrpe %{buildroot}/%{_defaultdocdir}/%{name}/
@@ -297,47 +281,33 @@
%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 /etc/services ; then
+if grep -q %{nrpeport} %{_sysconfdir}/services ; then
: OK - port already defined
else
- %nnmmsg "Adding port %nrpeport to /etc/services"
- echo "nrpe %nrpeport/tcp # Nagios nrpe" >> etc/services
+ %{nnmmsg} "Adding port %{nrpeport} to %{_sysconfdir}/services"
+ echo "nrpe %{nrpeport}/tcp # Nagios nrpe" >> etc/services
fi
%if %{with systemd}
- %if 0%{?centos_version}
- #systemd_pre nrpe.service nrpe.socket
- %else
%service_add_pre nrpe.service nrpe.socket
- %endif
%endif
%preun
%if %{with systemd}
- %if 0%{?centos_version}
- %systemd_preun nrpe.service nrpe.socket
- %else
%service_del_preun nrpe.service nrpe.socket
- %endif
%else
-%stop_on_removal %{name}
+ %stop_on_removal %{name}
%endif
%post
-%if 0%{?suse_version}
- %if 0%{?suse_version} <= 1230
+%if 0%{?suse_version} <= 1230
%{fillup_and_insserv -fy %{name}}
- %else
+%else
%fillup_only %{name}
- %endif
%endif
%if %{with systemd}
- %if 0%{?centos_version}
- %systemd_post nrpe.service nrpe.socket
- %else
%service_add_post nrpe.service nrpe.socket
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
- %endif
%endif
%pre -n monitoring-plugins-nrpe
@@ -345,25 +315,34 @@
%nagios_user_group_add
%triggerun -- nagios-nrpe < 2.14
-STATUS='/var/adm/update-scripts/nrpe'
-if [ -x %{_sysconfdir}/init.d/nrpe ]; then
+STATUS='%{_localstatedir}/adm/update-scripts/nrpe'
+%if %{with systemd}
+ if systemctl -q is-enabled nrpe.service ; then
+ echo "systemctl -q restart nrpe.service" >> "$STATUS"
+ elif systemctl -q is-enabled xinetd.service ; then
+ echo "systemctl -q reload xinetd.service" >> "$STATUS"
+ else
+ touch "$STATUS"
+ fi
+%else
+ if [ -x %{_sysconfdir}/init.d/nrpe ]; then
%{_sysconfdir}/init.d/nrpe status >/dev/null
if test $? = 0; then
echo "%{_sysconfdir}/init.d/nrpe restart" >> "$STATUS"
else
touch "$STATUS"
fi
- chmod +x "$STATUS"
-fi
-if [ -x %{_sysconfdir}/init.d/xinetd ]; then
+ fi
+ if [ -x %{_sysconfdir}/init.d/xinetd ]; then
%{_sysconfdir}/init.d/xinetd status >/dev/null
if test $? = 0; then
echo "%{_sysconfdir}/init.d/xinetd try-restart" >> "$STATUS"
+ fi
else
touch "$STATUS"
fi
- chmod +x "$STATUS"
-fi
+%endif
+chmod +x "$STATUS"
%triggerpostun -- nagios-nrpe < 2.14
# Move /etc/nagios/nrpe.cfg to /etc/nrpe.cfg when updating from an old version
@@ -377,23 +356,20 @@
fi
sed -i "s|%{nagios_sysconfdir}/nrpe.cfg|%{_sysconfdir}/nrpe.cfg|g" %{_sysconfdir}/xinetd.d/nrpe || :
sed -i "s|nrpe-service|%{name}|g" %{_sysconfdir}/sysconfig/SuSEfirewall2 || :
-if [ -e /var/adm/update-scripts/nrpe ]; then
- /bin/sh /var/adm/update-scripts/nrpe
- rm /var/adm/update-scripts/nrpe
+if [ -e %{_localstatedir}/adm/update-scripts/nrpe ]; then
+ /bin/sh %{_localstatedir}/adm/update-scripts/nrpe
+ rm %{_localstatedir}/adm/update-scripts/nrpe
fi
%postun
-%if 0%{?suse_version}
- %insserv_cleanup
- %if %{with systemd}
+%if %{with systemd}
%service_del_postun nrpe.service nrpe.socket
%else
%restart_on_update nrpe
+ %if 0%{?suse_version}
+ %insserv_cleanup
%endif
%endif
-%if 0%{?centos_version}
- %systemd_postun_with_restart nrpe.service nrpe.socket
-%endif
%files
%defattr(-,root,root)
@@ -403,32 +379,31 @@
%doc %{_defaultdocdir}/%{name}/README.md
%doc %{_defaultdocdir}/%{name}/CHANGELOG.md
%doc %{_defaultdocdir}/%{name}/usr.sbin.nrpe
-%doc %{_defaultdocdir}/%{name}//examples/update-cfg.pl
-%{_mandir}/man8/nrpe.8*
+%doc %{_defaultdocdir}/%{name}/examples/update-cfg.pl
+%{_mandir}/man8/nrpe.8%{?ext_man}
%dir %{_sysconfdir}/nrpe.d
%config(noreplace) %{_sysconfdir}/nrpe.cfg
%if 0%{?suse_version} > 1315
%dir %{_sysconfdir}/xinetd.d
%endif
%config(noreplace) %{_sysconfdir}/xinetd.d/nrpe
-%if 0%{?suse_version} > 1020
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
-%endif
%if 0%{?suse_version} <= 1230
-%{_sysconfdir}/init.d/nrpe
-%ghost %dir %{_rundir}/%{name}
%ghost %{_rundir}/%{name}/nrpe.pid
%endif
%if %{with systemd}
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket
%{_tmpfilesdir}/%{name}.conf
-%ghost %dir %{_rundir}/%{name}
+%else
+%{_sysconfdir}/init.d/nrpe
%endif
+%ghost %dir %{_rundir}/%{name}
%attr(0755,root,root) %{_sbindir}/nrpe
%{_sbindir}/rcnrpe
%files doc
+%defattr(-,root,root)
%defattr(0644,root,root,0755)
%doc CHANGELOG.md LEGAL *.md docs/*.pdf
++++++ nrpe-3.2.1-dh.h ++++++
#ifndef HEADER_DH_H
# include
#endif
DH *get_dh2048()
{
static unsigned char dhp_2048[] = {
0xED, 0x49, 0xA6, 0x2E, 0xB7, 0x99, 0xA6, 0x48, 0x89, 0x13,
0xA0, 0xC9, 0xB2, 0xF5, 0x43, 0xB3, 0xD5, 0x03, 0x53, 0x42,
0x83, 0xB5, 0xC0, 0x14, 0x92, 0x8A, 0x3A, 0xC2, 0x51, 0xC8,
0x7C, 0xE9, 0xA2, 0x5E, 0x90, 0x6F, 0x5C, 0xB6, 0xA7, 0xC6,
0x4B, 0x6D, 0x61, 0x84, 0x03, 0xC8, 0x13, 0x22, 0xBA, 0x77,
0x55, 0x7C, 0x49, 0x90, 0xED, 0xE9, 0x3E, 0x2D, 0xF1, 0x3C,
0xC8, 0xEF, 0x2E, 0x86, 0x33, 0x63, 0x7D, 0x2D, 0x3E, 0x9A,
0xED, 0xDE, 0x99, 0x54, 0x08, 0xDC, 0x1B, 0xBC, 0xD9, 0x76,
0x42, 0xCE, 0x13, 0x5A, 0xA7, 0x7C, 0xFE, 0xFE, 0x8C, 0xD1,
0xDF, 0xF8, 0xB5, 0x16, 0xBF, 0x69, 0x60, 0xDA, 0xA3, 0xFC,
0xC0, 0x4C, 0xF2, 0xD1, 0x72, 0x5B, 0x50, 0x4E, 0x2C, 0x38,
0x0E, 0xC6, 0x24, 0xBF, 0x6A, 0x6D, 0x76, 0x17, 0x76, 0x15,
0x2A, 0x84, 0x4A, 0xF0, 0xBD, 0x2D, 0xBF, 0x57, 0xB9, 0xB2,
0x90, 0x35, 0x82, 0x2D, 0x5E, 0x48, 0x72, 0x1F, 0x69, 0xD7,
0x5C, 0x62, 0x1F, 0xA3, 0xA7, 0x9B, 0x8C, 0x1D, 0xF3, 0xFA,
0xF3, 0x49, 0x1E, 0x86, 0x17, 0x29, 0x9D, 0x60, 0xE7, 0xCF,
0xC8, 0x9F, 0x3F, 0x51, 0xA2, 0xF6, 0xDD, 0xDF, 0xE1, 0xB3,
0xF2, 0x79, 0x0F, 0x59, 0x52, 0x19, 0xCB, 0x70, 0xE8, 0x2C,
0xA7, 0xF9, 0x92, 0xBB, 0x6A, 0x27, 0x24, 0x34, 0x80, 0x8E,
0x4E, 0x03, 0x2B, 0xD8, 0x5C, 0xF3, 0xCE, 0x64, 0xF7, 0xFE,
0x64, 0xBC, 0x87, 0x17, 0xE7, 0x52, 0x44, 0xDE, 0x3C, 0x5F,
0xA4, 0x96, 0xB7, 0x6A, 0x91, 0x46, 0x3F, 0x03, 0x76, 0xB6,
0x0A, 0x8C, 0x68, 0x99, 0x60, 0x6B, 0x7E, 0xFB, 0x7A, 0x60,
0xF1, 0xB7, 0x39, 0xFF, 0xF5, 0xF2, 0xA3, 0xD2, 0x5A, 0x10,
0x8A, 0x1B, 0x94, 0x68, 0x01, 0x6B, 0xB5, 0xF8, 0x86, 0xA7,
0x9B, 0x5B, 0x95, 0x90, 0xC2, 0x33
};
static unsigned char dhg_2048[] = {
0x02
};
DH *dh = DH_new();
BIGNUM *dhp_bn, *dhg_bn;
if (dh == NULL)
return NULL;
dhp_bn = BN_bin2bn(dhp_2048, sizeof(dhp_2048), NULL);
dhg_bn = BN_bin2bn(dhg_2048, sizeof(dhg_2048), NULL);
if (dhp_bn == NULL || dhg_bn == NULL
|| !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
DH_free(dh);
BN_free(dhp_bn);
BN_free(dhg_bn);
return NULL;
}
return dh;
}
++++++ nrpe-3.2.1-disable-chkconfig_in_Makefile.patch ++++++
Index: nrpe-nrpe-3.2.1/Makefile.in
===================================================================
--- nrpe-nrpe-3.2.1.orig/Makefile.in
+++ nrpe-nrpe-3.2.1/Makefile.in
@@ -128,13 +128,7 @@ install-init:
elif test $(INIT_TYPE) = launchd; then\
launchctl load $(INIT_DIR)/$(INIT_FILE); \
else\
- if test -f /sbin/chkconfig ; then \
- case "$(DESTDIR)" in */rpmbuild/*) break;; \
- *)/sbin/chkconfig nrpe on;; \
- esac; \
- else\
- echo "Make sure to enable the nrpe daemon";\
- fi;\
+ echo "Make sure to enable the nrpe daemon";\
fi;\
fi
++++++ nrpe-3.2.1-static_dh_parameters.patch ++++++
Index: nrpe-nrpe-3.2.1/macros/ax_nagios_get_ssl
===================================================================
--- nrpe-nrpe-3.2.1.orig/macros/ax_nagios_get_ssl
+++ nrpe-nrpe-3.2.1/macros/ax_nagios_get_ssl
@@ -292,10 +292,15 @@ if test x$SSL_TYPE != xNONE; then
AC_DEFINE(USE_SSL_DH)
# Generate DH parameters
if test -f "$sslbin"; then
- echo ""
- echo "*** Generating DH Parameters for SSL/TLS ***"
- # awk to strip off meta data at bottom of dhparam output
- $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ if test -f include/dh.h ; then
+ echo ""
+ echo "*** Skipping generation of DH Parameters for SSL/TLS: include/dh.h already exists ***"
+ else
+ echo ""
+ echo "*** Generating DH Parameters for SSL/TLS ***"
+ # awk to strip off meta data at bottom of dhparam output
+ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ fi
fi
fi
fi
Index: nrpe-nrpe-3.2.1/configure
===================================================================
--- nrpe-nrpe-3.2.1.orig/configure
+++ nrpe-nrpe-3.2.1/configure
@@ -7722,10 +7722,15 @@ fi
# Generate DH parameters
if test -f "$sslbin"; then
- echo ""
- echo "*** Generating DH Parameters for SSL/TLS ***"
- # awk to strip off meta data at bottom of dhparam output
- $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ if test -f include/dh.h ; then
+ echo ""
+ echo "*** Skipping generation of DH Parameters for SSL/TLS: include/dh.h already exists ***"
+ else
+ echo ""
+ echo "*** Generating DH Parameters for SSL/TLS ***"
+ # awk to strip off meta data at bottom of dhparam output
+ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ fi
fi
fi
fi
++++++ nrpe-SuSEfirewall2 ++++++
## Name: NRPE Service
## Description: Opens port for NRPE Service to allow connects from Nagios.
# space separated list of allowed TCP ports
TCP="5666"
# space separated list of allowed UDP ports
UDP=""
# space separated list of allowed RPC services
RPC=""
# space separated list of allowed IP protocols
IP=""
# space separated list of allowed UDP broadcast ports
BROADCAST=""
++++++ nrpe-implicit_declaration.patch ++++++
--- /var/tmp/diff_new_pack.KKDlPc/_old 2020-02-29 21:23:59.418454258 +0100
+++ /var/tmp/diff_new_pack.KKDlPc/_new 2020-02-29 21:23:59.418454258 +0100
@@ -1,7 +1,7 @@
-Index: nrpe-3.1.1/contrib/nrpe_check_control.c
+Index: nrpe-nrpe-3.2.1/contrib/nrpe_check_control.c
===================================================================
---- nrpe-3.1.1.orig/contrib/nrpe_check_control.c
-+++ nrpe-3.1.1/contrib/nrpe_check_control.c
+--- nrpe-nrpe-3.2.1.orig/contrib/nrpe_check_control.c
++++ nrpe-nrpe-3.2.1/contrib/nrpe_check_control.c
@@ -1,4 +1,5 @@
#include
+#include
++++++ nrpe-rpmlintrc ++++++
# better PreRequire grep as we need it for /etc/services...
addFilter("W: useless-explicit-requires grep")
++++++ nrpe.xml ++++++
<?xml version="1.0" encoding="utf-8"?>
<service>
<short>NRPE</short>
<description>Opens port for NRPE Service to allow connects from Nagios.</description>
<port protocol="tcp" port="5666"/>
</service>