Changes - j0ke.net Open Build Service

Difference Between Revision 1 and home:netmax / nrpe

[-] [+]	Deleted	nrpe.changes
@@ -1,12 +0,0 @@ -------------------------------------------------------------------- -Wed Sep 25 14:41:33 UTC 2019 - Local OBS User <cs@linux-administrator.com> - -- update to release 2.15 -- full IPv6 support - -------------------------------------------------------------------- -Sun Mar 24 18:09:50 UTC 2013 - cs@linux-administrator.com - -- update to release 2.14 -- disable ipv6 patch (needs update) -
[-] [+]	Changed	nrpe.spec ^
@@ -1,7 +1,7 @@ #!BuildIgnore: post-build-checks %define myname nrpe -%define version 2.15 -%define release 215 +%define version 2.12 +%define release 22 %define nsusr nagios %define nsgrp nagios %define nsport 5666 @@ -24,7 +24,7 @@ Source1: %{myname}-rpmlintrc Patch0: %{myname}-suse-init.patch Patch1: %{myname}-config.patch -#Patch2: %{myname}-ipv6.patch +Patch2: %{myname}-ipv6.patch BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} Prefix: /etc/init.d @@ -36,7 +36,7 @@ %if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?fedora_version} PreReq: /usr/bin/logger, sed, mktemp %endif -BuildRequires: openssl openssl-devel glibc-devel gcc gcc-c++ +BuildRequires: openssl openssl-devel glibc-devel libgcc gcc gcc-c++ Obsoletes: %{myname} Provides: %{myname} @@ -68,7 +68,7 @@ %setup -q -n %{myname}-%{version} %patch0 %patch1 -##%patch2 -p1 +%patch2 -p1 %pre # Create `nagios' group on the system if necessary @@ -117,22 +117,10 @@ fi %post -if [ -d /etc/sudoers.d ] ; then - cat > /etc/sudoers.d/50_nagios << EOF -nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/ -Defaults:nagios !requiretty -Defaults:nagios !env_keep -EOF -chmod 0440 /etc/sudoers.d/50_nagios - -elif [ -f /etc/sudoers ] ; then +if [ -f /etc/sudoers ] ; then if [ -z "`grep ^nagios /etc/sudoers`" ] ; then echo "nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/" >> /etc/sudoers fi - if [ -z "`grep ^Defaults:nagios`" ] ; then - echo "Defaults:nagios !requiretty" >> /etc/sudoers - echo "Defaults:nagios !env_keep" >> /etc/sudoers - fi fi %build @@ -168,7 +156,6 @@ cp sample-config/nrpe.cfg ${RPM_BUILD_ROOT}/etc/nagios/nrpe.cfg %if 0%{?suse_version} cp init-script.suse ${RPM_BUILD_ROOT}/etc/init.d/nrpe -chmod +x ${RPM_BUILD_ROOT}/etc/init.d/nrpe %else cp init-script ${RPM_BUILD_ROOT}/etc/init.d/nrpe %endif @@ -181,21 +168,21 @@ %files -%defattr(0755,root,root) +%defattr(755,root,root) /etc/init.d/nrpe %config(noreplace)/etc/xinetd.d/nrpe %{_prefix}/sbin/nrpe %dir /etc/nagios %dir /etc/nagios/nrpe.d/ -%defattr(0644,root,root) +%defattr(644,root,root) %config(noreplace) /etc/nagios/*.cfg -%defattr(0644,%{nsusr},%{nsgrp}) +%defattr(644,%{nsusr},%{nsgrp}) %doc Changelog LEGAL README %files plugin -%defattr(0755,root,root) +%defattr(755,root,root) %{_prefix}/lib/nagios/plugins -%defattr(0644,%{nsusr},%{nsgrp}) +%defattr(644,%{nsusr},%{nsgrp}) %doc Changelog LEGAL README %changelog
[-] [+]	Deleted	nrpe-2.15_ADH.patch ^
@@ -1,28 +0,0 @@ ---- src/check_nrpe.c.orig 2019-10-14 13:53:38.006178348 +0200 -+++ src/check_nrpe.c 2019-10-14 13:58:27.177952881 +0200 -@@ -165,7 +165,11 @@ - /* do SSL handshake / - if(result==STATE_OK && use_ssl==TRUE){ - if((ssl=SSL_new(ctx))!=NULL){ -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+ SSL_CTX_set_cipher_list(ctx,"ADH@SECLEVEL=0"); -+#else - SSL_CTX_set_cipher_list(ctx,"ADH"); -+#endif - SSL_set_fd(ssl,sd); - if((rc=SSL_connect(ssl))!=1){ - printf("CHECK_NRPE: Error - Could not complete SSL handshake.\n"); ---- src/nrpe.c.orig 2019-10-14 13:53:33.194180011 +0200 -+++ src/nrpe.c 2019-10-14 13:57:33.778179881 +0200 -@@ -265,7 +265,11 @@ - SSL_CTX_set_options(ctx,SSL_OP_NO_SSLv2 \| SSL_OP_NO_SSLv3); - - / use anonymous DH ciphers */ -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+ SSL_CTX_set_cipher_list(ctx,"ADH@SECLEVEL=0"); -+#else - SSL_CTX_set_cipher_list(ctx,"ADH"); -+#endif - dh=get_dh512(); - SSL_CTX_set_tmp_dh(ctx,dh); - DH_free(dh);
[-] [+]	Deleted	nrpe-2.15_packetbuffer.patch ^
@@ -1,11 +0,0 @@ ---- include/common.h.orig 2020-02-05 09:55:21.662321386 +0100 -+++ include/common.h 2020-02-05 09:56:31.282321231 +0100 -@@ -60,7 +60,7 @@ - #define NRPE_PACKET_VERSION_2 2 - #define NRPE_PACKET_VERSION_1 1 /* older packet version identifiers (no longer supported) / - --#define MAX_PACKETBUFFER_LENGTH 1024 / max amount of data we'll send in one query/response / -+#define MAX_PACKETBUFFER_LENGTH 8192 / max amount of data we'll send in one query/response */ - - typedef struct packet_struct{ - int16_t packet_version;
	Deleted	nrpe-2.14.tar.bz2 ^
	Deleted	nrpe-2.15.tar.bz2 ^