megacoffee.net Gentoo overlay - legacy mirror

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

comparison net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch @ 54:90a7a9dbfafb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
importing net-analyzer/nrpe-2.14 from official portage tree
author Daniel Neugebauer <dneuge@energiequant.de>
date Mon, 17 Mar 2014 16:09:30 +0100
parents
children
comparison
equal deleted inserted replaced
53:5cc622037103 54:90a7a9dbfafb
1 --- nrpe-2.14.orig/configure.in
2 +++ nrpe-2.14/configure.in
3 @@ -1,12 +1,8 @@
4 dnl Process this -*-m4-*- file with autoconf to produce a configure script.
5
6 -dnl Disable caching
7 -define([AC_CACHE_LOAD],)
8 -define([AC_CACHE_SAVE],)
9 -
10 -2.14([nrpe],[2.13],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org])
11 +AC_INIT([nrpe],[2.14],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org])
12 AC_CONFIG_SRCDIR([src/nrpe.c])
13 -AC_CONFIG_HEADERS([include/config.h])
14 +
15 AC_CONFIG_FILES([Makefile
16 subst
17 src/Makefile
18 @@ -16,7 +12,8 @@
19 init-script.suse
20 nrpe.spec
21 sample-config/nrpe.cfg
22 - sample-config/nrpe.xinetd])
23 + sample-config/nrpe.xinetd
24 + include/config.h])
25 AC_PREFIX_DEFAULT(/usr/local/nagios)
26
27 PKG_NAME=nrpe
28 @@ -45,7 +42,7 @@
29 AC_HEADER_STDC
30 AC_HEADER_TIME
31 AC_HEADER_SYS_WAIT
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 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)
33 +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)
34
35 dnl Checks for typedefs, structures, and compiler characteristics.
36 AC_C_CONST
37 @@ -164,11 +161,20 @@
38 AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
39 AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
40 AC_SUBST(SOCKETLIBS)
41 -AC_CHECK_LIB(wrap,main,[
42 - LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
43 +
44 +AC_ARG_ENABLE([tcp-wrapper],
45 + 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@:>@]))
46 +
47 +LIBWRAPLIBS=""
48 +AS_IF([test "x$enable_tcp_wrapper" != "xno"], [
49 + AC_CHECK_LIB([wrap],[hosts_access],[
50 + LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
51 AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library])
52 - ])
53 + AC_DEFINE(HAVE_TCPD_H,[1],[Have the TCP wrappers library])
54 + ])
55 +])
56 AC_SUBST(LIBWRAPLIBS)
57 +
58 AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket)
59
60 dnl socklen_t check - from curl
61 @@ -438,8 +444,11 @@
62 AC_SUBST(TARGET_PLATFORM)
63
64 AC_ARG_ENABLE([command-args],
65 - 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!]),
66 - AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments]))
67 + 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!]))
68 +
69 +AS_IF([test "x$enable_command_args" = "xyes"], [
70 + AC_DEFINE(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments])
71 +])
72
73 AC_ARG_ENABLE([bash-command-substitution],
74 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!]),