We have moved to Git. This repository is only provided for compatibility with old installations. Learn how to migrate your installation here.

annotate net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch @ 56:b9bc67d9be9e

changes for net-analyzer/nrpe-2.15
author Daniel Neugebauer <dneuge@energiequant.de>
date Mon, 17 Mar 2014 16:13:24 +0100
parents c6adeffb54f5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
56
b9bc67d9be9e changes for net-analyzer/nrpe-2.15
Daniel Neugebauer <dneuge@energiequant.de>
parents: 55
diff changeset
1 --- nrpe-2.15/configure.in 2013-09-06 17:27:13.000000000 +0200
b9bc67d9be9e changes for net-analyzer/nrpe-2.15
Daniel Neugebauer <dneuge@energiequant.de>
parents: 55
diff changeset
2 +++ nrpe-2.15-patched/configure.in 2014-03-17 15:39:21.242830288 +0100
54
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
3 @@ -1,12 +1,8 @@
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
4 dnl Process this -*-m4-*- file with autoconf to produce a configure script.
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
5
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
6 -dnl Disable caching
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
7 -define([AC_CACHE_LOAD],)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
8 -define([AC_CACHE_SAVE],)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
9 -
56
b9bc67d9be9e changes for net-analyzer/nrpe-2.15
Daniel Neugebauer <dneuge@energiequant.de>
parents: 55
diff changeset
10 AC_INIT([nrpe],[2.15],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org])
54
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
11 AC_CONFIG_SRCDIR([src/nrpe.c])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
12 -AC_CONFIG_HEADERS([include/config.h])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
13 +
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
14 AC_CONFIG_FILES([Makefile
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
15 subst
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
16 src/Makefile
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
17 @@ -16,7 +12,8 @@
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
18 init-script.suse
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
19 nrpe.spec
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
20 sample-config/nrpe.cfg
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
21 - sample-config/nrpe.xinetd])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
22 + sample-config/nrpe.xinetd
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
23 + include/config.h])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
24 AC_PREFIX_DEFAULT(/usr/local/nagios)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
25
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
26 PKG_NAME=nrpe
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
27 @@ -45,7 +42,7 @@
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
28 AC_HEADER_STDC
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
29 AC_HEADER_TIME
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
30 AC_HEADER_SYS_WAIT
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
31 -AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h tcpd.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
32 +AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
33
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
34 dnl Checks for typedefs, structures, and compiler characteristics.
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
35 AC_C_CONST
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
36 @@ -164,11 +161,20 @@
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
37 AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
38 AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
39 AC_SUBST(SOCKETLIBS)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
40 -AC_CHECK_LIB(wrap,main,[
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
41 - LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
42 +
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
43 +AC_ARG_ENABLE([tcp-wrapper],
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
44 + AS_HELP_STRING([--disable-tcp-wrapper], [Disable building with TCP wrappers. *** DISABLING IS A SECURITY RISK! *** Read the SECURITY file before using this option! @<:@default=enable@:>@]))
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
45 +
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
46 +LIBWRAPLIBS=""
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
47 +AS_IF([test "x$enable_tcp_wrapper" != "xno"], [
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
48 + AC_CHECK_LIB([wrap],[hosts_access],[
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
49 + LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
50 AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
51 - ])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
52 + AC_DEFINE(HAVE_TCPD_H,[1],[Have the TCP wrappers library])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
53 + ])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
54 +])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
55 AC_SUBST(LIBWRAPLIBS)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
56 +
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
57 AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
58
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
59 dnl socklen_t check - from curl
56
b9bc67d9be9e changes for net-analyzer/nrpe-2.15
Daniel Neugebauer <dneuge@energiequant.de>
parents: 55
diff changeset
60 @@ -440,8 +446,11 @@
54
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
61 AC_SUBST(TARGET_PLATFORM)
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
62
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
63 AC_ARG_ENABLE([command-args],
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
64 - AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]),
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
65 - AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments]))
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
66 + AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]))
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
67 +
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
68 +AS_IF([test "x$enable_command_args" = "xyes"], [
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
69 + AC_DEFINE(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
70 +])
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
71
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
72 AC_ARG_ENABLE([bash-command-substitution],
90a7a9dbfafb importing net-analyzer/nrpe-2.14 from official portage tree
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
73 AS_HELP_STRING([--enable-bash-command-substitution],[allows clients to pass bash command substitutions of the form $(command). *** THIS IS A HIGH SECURITY RISK! *** Read the SECURITY file before using this option!]),