diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-02-05 01:36:42 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-02-05 01:36:42 +0000 |
| commit | 468561b0c0b052af2790d21430753abf1e93913c (patch) | |
| tree | 0e2ecebe07d95acb14f0bb4cb336aad9d8c0c381 /net-analyzer/nrpe | |
| parent | Version bump. (diff) | |
| download | gentoo-2-468561b0c0b052af2790d21430753abf1e93913c.tar.gz gentoo-2-468561b0c0b052af2790d21430753abf1e93913c.tar.bz2 gentoo-2-468561b0c0b052af2790d21430753abf1e93913c.zip | |
Fix bug #454316 (build with USE=tcpd); thanks to Marcel Pennewiß for identifying the issue and providing an updated patch.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'net-analyzer/nrpe')
| -rw-r--r-- | net-analyzer/nrpe/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/net-analyzer/nrpe/ChangeLog b/net-analyzer/nrpe/ChangeLog index ddf462f10a27..d3e0b2a86845 100644 --- a/net-analyzer/nrpe/ChangeLog +++ b/net-analyzer/nrpe/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/nrpe # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/ChangeLog,v 1.14 2013/01/25 17:43:37 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/ChangeLog,v 1.15 2013/02/05 01:36:42 flameeyes Exp $ + + 05 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> + files/nrpe-2.14-tcpd-et-al.patch: + Fix bug #454316 (build with USE=tcpd); thanks to Marcel Pennewiß for + identifying the issue and providing an updated patch. *nrpe-2.14 (25 Jan 2013) diff --git a/net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch b/net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch index efd71c7cc133..f18bc31ac4e1 100644 --- a/net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch +++ b/net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch @@ -1,5 +1,3 @@ -Index: nrpe-2.14/configure.in -=================================================================== --- nrpe-2.14.orig/configure.in +++ nrpe-2.14/configure.in @@ -1,12 +1,8 @@ @@ -17,7 +15,7 @@ Index: nrpe-2.14/configure.in AC_CONFIG_FILES([Makefile subst src/Makefile -@@ -16,7 +12,8 @@ AC_CONFIG_FILES([Makefile +@@ -16,7 +12,8 @@ init-script.suse nrpe.spec sample-config/nrpe.cfg @@ -27,7 +25,7 @@ Index: nrpe-2.14/configure.in AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nrpe -@@ -45,7 +42,7 @@ dnl Checks for header files. +@@ -45,7 +42,7 @@ AC_HEADER_STDC AC_HEADER_TIME AC_HEADER_SYS_WAIT @@ -36,7 +34,7 @@ Index: nrpe-2.14/configure.in dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -@@ -164,11 +161,19 @@ dnl Checks for library functions. +@@ -164,11 +161,20 @@ AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl") AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket") AC_SUBST(SOCKETLIBS) @@ -52,6 +50,7 @@ Index: nrpe-2.14/configure.in + LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library]) - ]) ++ AC_DEFINE(HAVE_TCPD_H,[1],[Have the TCP wrappers library]) + ]) +]) AC_SUBST(LIBWRAPLIBS) @@ -59,7 +58,7 @@ Index: nrpe-2.14/configure.in AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket) dnl socklen_t check - from curl -@@ -438,8 +443,11 @@ fi +@@ -438,8 +444,11 @@ AC_SUBST(TARGET_PLATFORM) AC_ARG_ENABLE([command-args], |