Changes of Revision 23
| [-] | Changed | nrpe.spec |
|
x 1 2 Source1: %{myname}-rpmlintrc3 Patch0: %{myname}-suse-init.patch4 Patch1: %{myname}-config.patch5 -#Patch2: %{myname}-ipv6.patch6 +Patch2: %{name}-%{version}_ADH.patch7 +Patch3: %{myname}-2.15_packetbuffer.patch8 BuildRoot: %{_tmppath}/%{name}-buildroot9 Prefix: %{_prefix}10 Prefix: /etc/init.d11 12 %setup -q -n %{myname}-%{version}13 %patch014 %patch115 -##%patch2 -p116 +%patch217 +%patch318 19 %pre20 # Create `nagios' group on the system if necessary21 |
||
| [+] | Added | nrpe-2.15_ADH.patch ^ |
| @@ -0,0 +1,28 @@ +--- 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); | ||
| [+] | Added | nrpe-2.15_packetbuffer.patch ^ |
| @@ -0,0 +1,11 @@ +--- 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; | ||
| [+] | Added | nrpe_centos7.log ^ |
| @@ -0,0 +1,348 @@ ++ cd nrpe-2.15 ++ export PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/usr/sbin ++ PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/usr/sbin ++ CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic' ++ CXXFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic' ++ ./configure --with-init-dir=/etc/init.d --with-nrpe-port=5666 --with-nrpe-user=nagios --with-nrpe-group=nagios --prefix=/usr --exec-prefix=/usr/sbin --bindir=/usr/sbin --sbindir=/usr/lib/nagios/cgi --libexecdir=/usr/lib/nagios/plugins --datadir=/usr/share/nagios --sysconfdir=/etc/nagios --localstatedir=/var/log/nagios --enable-command-args +checking for a BSD-compatible install... /bin/install -c +checking build system type... x86_64-unknown-linux-gnu +checking host system type... x86_64-unknown-linux-gnu +checking for gcc... gcc +checking for C compiler default output file name... a.out +checking whether the C compiler works... yes +checking whether we are cross compiling... no +checking for suffix of executables... +checking for suffix of object files... o +checking whether we are using the GNU C compiler... yes +checking whether gcc accepts -g... yes +checking for gcc option to accept ANSI C... none needed +checking whether make sets $(MAKE)... yes +checking how to run the C preprocessor... gcc -E +checking for egrep... grep -E +checking for ANSI C header files... yes +checking whether time.h and sys/time.h may both be included... yes +checking for sys/wait.h that is POSIX.1 compatible... yes +checking for sys/types.h... yes +checking for sys/stat.h... yes +checking for stdlib.h... yes +checking for string.h... yes +checking for memory.h... yes +checking for strings.h... yes +checking for inttypes.h... yes +checking for stdint.h... yes +checking for unistd.h... yes +checking ctype.h usability... yes +checking ctype.h presence... yes +checking for ctype.h... yes +checking dirent.h usability... yes +checking dirent.h presence... yes +checking for dirent.h... yes +checking errno.h usability... yes +checking errno.h presence... yes +checking for errno.h... yes +checking fcntl.h usability... yes +checking fcntl.h presence... yes +checking for fcntl.h... yes +checking getopt.h usability... yes +checking getopt.h presence... yes +checking for getopt.h... yes +checking grp.h usability... yes +checking grp.h presence... yes +checking for grp.h... yes +checking for inttypes.h... (cached) yes +checking netdb.h usability... yes +checking netdb.h presence... yes +checking for netdb.h... yes +checking pwd.h usability... yes +checking pwd.h presence... yes +checking for pwd.h... yes +checking signal.h usability... yes +checking signal.h presence... yes +checking for signal.h... yes +checking for stdint.h... (cached) yes +checking for strings.h... (cached) yes +checking for string.h... (cached) yes +checking syslog.h usability... yes +checking syslog.h presence... yes +checking for syslog.h... yes +checking tcpd.h usability... no +checking tcpd.h presence... no +checking for tcpd.h... no +checking for unistd.h... (cached) yes +checking arpa/inet.h usability... yes +checking arpa/inet.h presence... yes +checking for arpa/inet.h... yes +checking netinet/in.h usability... yes +checking netinet/in.h presence... yes +checking for netinet/in.h... yes +checking socket.h usability... no +checking socket.h presence... no +checking for socket.h... no +checking for sys/types.h... (cached) yes +checking sys/time.h usability... yes +checking sys/time.h presence... yes +checking for sys/time.h... yes +checking sys/resource.h usability... yes +checking sys/resource.h presence... yes +checking for sys/resource.h... yes +checking for sys/wait.h... (cached) yes +checking sys/socket.h usability... yes +checking sys/socket.h presence... yes +checking for sys/socket.h... yes +checking for sys/stat.h... (cached) yes +checking for an ANSI C-conforming const... yes +checking whether struct tm is in sys/time.h or time.h... time.h +checking for mode_t... yes +checking for pid_t... yes +checking for size_t... yes +checking return type of signal handlers... void +checking for uid_t in sys/types.h... yes +checking type of array argument to getgroups... gid_t +checking for int... yes +checking size of int... 4 +checking for short... yes +checking size of short... 2 +checking for long... yes +checking size of long... 8 +checking for uint32_t... yes +checking for u_int32_t... yes +checking for int32_t... yes +checking for va_copy... yes +checking for vsnprintf... yes +checking for snprintf... yes +checking for asprintf... yes +checking for vasprintf... yes +checking for C99 vsnprintf... yes +checking for getopt_long... yes +checking for main in -lnsl... yes +checking for socket in -lsocket... no +checking for main in -lwrap... no +checking for strdup... yes +checking for strstr... yes +checking for strtoul... yes +checking for initgroups... yes +checking for closesocket... no +checking for socklen_t... yes +checking for type of socket size... size_t +checking for SSL headers... SSL headers found in /usr +checking for SSL libraries... SSL libraries found in /usr/lib64 + +*** Generating DH Parameters for SSL/TLS *** +Generating DH parameters, 512 bit long safe prime, generator 2 +This is going to take a long time +.................+........+...+.................................................................................+................+...+.......................+...............++*++*++*++*++*++* +checking for Kerberos include files... could not find include files +checking for perl... /bin/perl +configure: creating ./config.status +config.status: creating Makefile +config.status: creating subst +config.status: creating src/Makefile +config.status: creating package/solaris/Makefile +config.status: creating init-script +config.status: creating init-script.debian +config.status: creating init-script.suse +config.status: creating nrpe.spec +config.status: creating sample-config/nrpe.cfg +config.status: creating sample-config/nrpe.xinetd +config.status: creating include/config.h + + +*** Configuration summary for nrpe 2.15 09-06-2013 ***: + + General Options: + ------------------------- + NRPE port: 5666 + NRPE user: nagios + NRPE group: nagios + Nagios user: nagios + Nagios group: nagios + + +Review the options above for accuracy. If they look okay, +type 'make all' to compile the NRPE daemon and client. + ++ make all +cd ./src/; make ; cd .. +make[1]: Entering directory `/home/abuild/rpmbuild/BUILD/nrpe-2.15/src' +gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -I/usr/include/openssl -I/usr/include -DHAVE_CONFIG_H -I ../include -I ./../include -o nrpe ./nrpe.c ./utils.c ./acl.c -L/usr/lib64 -lssl -lcrypto -lnsl +./nrpe.c: In function 'main': +./nrpe.c:118:2: warning: implicit declaration of function 'asprintf' [-Wimplicit-function-declaration] + asprintf(&env_string,"NRPE_MULTILINESUPPORT=1"); + ^ +./nrpe.c: In function 'wait_for_connections': +./nrpe.c:891:17: warning: unused variable 'timeout' [-Wunused-variable] + struct timeval timeout; + ^ +./nrpe.c:890:9: warning: unused variable 'fdread' [-Wunused-variable] + fd_set fdread; + ^ +./nrpe.c:880:6: warning: unused variable 'r' [-Wunused-variable] + int r; + ^ +In file included from ./nrpe.c:31:0: +./nrpe.c: At top level: +../include/acl.h:57:23: warning: 'ip_acl_head' defined but not used [-Wunused-variable] + static struct ip_acl *ip_acl_head, *ip_acl_prev; + ^ +../include/acl.h:57:37: warning: 'ip_acl_prev' defined but not used [-Wunused-variable] + static struct ip_acl *ip_acl_head, *ip_acl_prev; + ^ +../include/acl.h:58:24: warning: 'dns_acl_head' defined but not used [-Wunused-variable] + static struct dns_acl *dns_acl_head, *dns_acl_prev; + ^ +../include/acl.h:58:39: warning: 'dns_acl_prev' defined but not used [-Wunused-variable] + static struct dns_acl *dns_acl_head, *dns_acl_prev; + ^ +./nrpe.c: In function 'main': +./nrpe.c:204:9: warning: ignoring return value of 'getcwd', declared with attribute warn_unused_result [-Wunused-result] + getcwd(config_file,sizeof(config_file)); + ^ | ||
| [+] | Added | nrpe_centos8.log ^ |
| @@ -0,0 +1,290 @@ ++ cd nrpe-2.15 ++ export PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/usr/sbin ++ PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/usr/sbin ++ CFLAGS='-O2 -g' ++ CXXFLAGS='-O2 -g' ++ ./configure --with-init-dir=/etc/init.d --with-nrpe-port=5666 --with-nrpe-user=nagios --with-nrpe-group=nagios --prefix=/usr --exec-prefix=/usr/sbin --bindir=/usr/sbin --sbindir=/usr/lib/nagios/cgi --libexecdir=/usr/lib/nagios/plugins --datadir=/usr/share/nagios --sysconfdir=/etc/nagios --localstatedir=/var/log/nagios --enable-command-args +checking for a BSD-compatible install... /usr/bin/install -c +checking build system type... x86_64-unknown-linux-gnu +checking host system type... x86_64-unknown-linux-gnu +checking for gcc... gcc +checking for C compiler default output file name... a.out +checking whether the C compiler works... yes +checking whether we are cross compiling... no +checking for suffix of executables... +checking for suffix of object files... o +checking whether we are using the GNU C compiler... yes +checking whether gcc accepts -g... yes +checking for gcc option to accept ANSI C... none needed +checking whether make sets $(MAKE)... yes +checking how to run the C preprocessor... gcc -E +checking for egrep... grep -E +checking for ANSI C header files... yes +checking whether time.h and sys/time.h may both be included... yes +checking for sys/wait.h that is POSIX.1 compatible... yes +checking for sys/types.h... yes +checking for sys/stat.h... yes +checking for stdlib.h... yes +checking for string.h... yes +checking for memory.h... yes +checking for strings.h... yes +checking for inttypes.h... yes +checking for stdint.h... yes +checking for unistd.h... yes +checking ctype.h usability... yes +checking ctype.h presence... yes +checking for ctype.h... yes +checking dirent.h usability... yes +checking dirent.h presence... yes +checking for dirent.h... yes +checking errno.h usability... yes +checking errno.h presence... yes +checking for errno.h... yes +checking fcntl.h usability... yes +checking fcntl.h presence... yes +checking for fcntl.h... yes +checking getopt.h usability... yes +checking getopt.h presence... yes +checking for getopt.h... yes +checking grp.h usability... yes +checking grp.h presence... yes +checking for grp.h... yes +checking for inttypes.h... (cached) yes +checking netdb.h usability... yes +checking netdb.h presence... yes +checking for netdb.h... yes +checking pwd.h usability... yes +checking pwd.h presence... yes +checking for pwd.h... yes +checking signal.h usability... yes +checking signal.h presence... yes +checking for signal.h... yes +checking for stdint.h... (cached) yes +checking for strings.h... (cached) yes +checking for string.h... (cached) yes +checking syslog.h usability... yes +checking syslog.h presence... yes +checking for syslog.h... yes +checking tcpd.h usability... no +checking tcpd.h presence... no +checking for tcpd.h... no +checking for unistd.h... (cached) yes +checking arpa/inet.h usability... yes +checking arpa/inet.h presence... yes +checking for arpa/inet.h... yes +checking netinet/in.h usability... yes +checking netinet/in.h presence... yes +checking for netinet/in.h... yes +checking socket.h usability... no +checking socket.h presence... no +checking for socket.h... no +checking for sys/types.h... (cached) yes +checking sys/time.h usability... yes +checking sys/time.h presence... yes +checking for sys/time.h... yes +checking sys/resource.h usability... yes +checking sys/resource.h presence... yes +checking for sys/resource.h... yes +checking for sys/wait.h... (cached) yes +checking sys/socket.h usability... yes +checking sys/socket.h presence... yes +checking for sys/socket.h... yes +checking for sys/stat.h... (cached) yes +checking for an ANSI C-conforming const... yes +checking whether struct tm is in sys/time.h or time.h... time.h +checking for mode_t... yes +checking for pid_t... yes +checking for size_t... yes +checking return type of signal handlers... void +checking for uid_t in sys/types.h... yes +checking type of array argument to getgroups... gid_t +checking for int... yes +checking size of int... 4 +checking for short... yes +checking size of short... 2 +checking for long... yes +checking size of long... 8 +checking for uint32_t... yes +checking for u_int32_t... yes +checking for int32_t... yes +checking for va_copy... yes +checking for vsnprintf... yes +checking for snprintf... yes +checking for asprintf... yes +checking for vasprintf... yes +checking for C99 vsnprintf... yes +checking for getopt_long... yes +checking for main in -lnsl... yes +checking for socket in -lsocket... no +checking for main in -lwrap... no +checking for strdup... yes +checking for strstr... yes +checking for strtoul... yes +checking for initgroups... yes +checking for closesocket... no +checking for socklen_t... yes +checking for type of socket size... size_t +checking for SSL headers... SSL headers found in /usr +checking for SSL libraries... SSL libraries found in /usr/lib64 + +*** Generating DH Parameters for SSL/TLS *** +Generating DH parameters, 512 bit long safe prime, generator 2 +This is going to take a long time +.........+...............+.................++*++*++*++*++* +checking for Kerberos include files... could not find include files +checking for perl... /usr/bin/perl +configure: creating ./config.status +config.status: creating Makefile +config.status: creating subst +config.status: creating src/Makefile +config.status: creating package/solaris/Makefile +config.status: creating init-script +config.status: creating init-script.debian +config.status: creating init-script.suse +config.status: creating nrpe.spec +config.status: creating sample-config/nrpe.cfg +config.status: creating sample-config/nrpe.xinetd +config.status: creating include/config.h +Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE ([^}]+)}/ at subst line 34. +Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE ([^}]+)}/ at subst line 34. +Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE ([^}]+)}/ at subst line 34. +Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE ([^}]+)}/ at subst line 34. +Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE ([^}]+)}/ at subst line 34. + + +*** Configuration summary for nrpe 2.15 09-06-2013 ***: + + General Options: + ------------------------- + NRPE port: 5666 + NRPE user: nagios + NRPE group: nagios + Nagios user: nagios + Nagios group: nagios + + +Review the options above for accuracy. If they look okay, +type 'make all' to compile the NRPE daemon and client. + ++ make all +cd ./src/; make ; cd .. +make[1]: Entering directory '/home/abuild/rpmbuild/BUILD/nrpe-2.15/src' +gcc -O2 -g -I/usr/include/openssl -I/usr/include -DHAVE_CONFIG_H -I ../include -I ./../include -o nrpe ./nrpe.c ./utils.c ./acl.c -L/usr/lib64 -lssl -lcrypto -lnsl +./nrpe.c: In function 'main': +./nrpe.c:118:2: warning: implicit declaration of function 'asprintf'; did you mean 'vsprintf'? [-Wimplicit-function-declaration] + asprintf(&env_string,"NRPE_MULTILINESUPPORT=1"); + ^~~~~~~~ + vsprintf +./utils.c: In function 'my_connect': +./utils.c:151:10: warning: implicit declaration of function 'my_create_socket'; did you mean 'OBJ_create_objects'? [-Wimplicit-function-declaration] + sock = my_create_socket(ai, bind_address); + ^~~~~~~~~~~~~~~~ + OBJ_create_objects +gcc -O2 -g -I/usr/include/openssl -I/usr/include -DHAVE_CONFIG_H -I ../include -I ./../include -o check_nrpe ./check_nrpe.c ./utils.c -L/usr/lib64 -lssl -lcrypto -lnsl +./utils.c: In function 'my_connect': +./utils.c:151:10: warning: implicit declaration of function 'my_create_socket'; did you mean 'OBJ_create_objects'? [-Wimplicit-function-declaration] + sock = my_create_socket(ai, bind_address); + ^~~~~~~~~~~~~~~~ + OBJ_create_objects +make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/nrpe-2.15/src' + +*** Compile finished *** + +If the NRPE daemon and client compiled without any errors, you +can continue with the installation or upgrade process. + +Read the PDF documentation (NRPE.pdf) for information on the next +steps you should take to complete the installation or upgrade. + ++ exit 0 | ||