Fix bug #454316 (build with USE=tcpd); thanks to Marcel Pennewiß for identifying the issue and providing an updated patch.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

3 files changed, 20 insertions, 16 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/Manifest b/net-analyzer/nrpe/Manifest
index 7a9a704506dc..74bf9f93bcb5 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -5,23 +5,23 @@ AUX nagios-nrpe-2.13-command-args.patch 689 SHA256 cf6d491c7d9da325baf9e3ee50259
 AUX nagios-nrpe-2.13-multiline.patch 6636 SHA256 4dc7bd8693c07253586ea3b6e5aaeb20b09c4cf6e21c2fe31e03998401d25e99 SHA512 0d7bdfd5c1d8649cb32b5c3b4cf27da57f3ca03f5f46035466e6c8dc4602bfdbed5f4a8e3b87b78e0d9afab5a279fdab019729e5d96ab79d2c87e94946515e79 WHIRLPOOL d8a4fb74f5103b24ddbff8b2b8bac6b84c2f794b800331b92b76aa48632106c13a92db75952e9ac58ec7c3e2e7d03c93f52ef22d514be34381aad38ba2aa7922
 AUX nagios-nrpe-2.13-tcpd.patch 1130 SHA256 9f6b42d7086bf60ca87b5d05895b65beb2d9b7a8bd80507c48279ca29184bcea SHA512 a8721cd2063682128018ca0fd33372f6675f567fe69e86cf629e03b96b49ed48b30b251cf3088e9b4bc5247499dd65a1643d9f34582fcbb1e66966716b7aae1b WHIRLPOOL 5f736d4aad351a44d565dd8b27ad3fdebff8b5ebfb2dcd03d381bf74f5b662cef7aa7a62a59e399004322802a6cbfe1cd79f596d427e637feef855737e7fff39
 AUX nrpe-2.14-multiline.patch 6806 SHA256 0e980f84044ddc955ad0f2086caf7102cc115193971bb21ec819bed45af5713a SHA512 09c0cc6a4610d674b0ed0da8cdc96f3653f98b54fc98802c33a1cc0b09755d3d0d6afd7fe6b25e1713e6b27af2ba1fa5063988691bc3b5364fa0bfd137d54546 WHIRLPOOL 02e237b3fcacf51e7fd61c25d661e91ff6a3aeb99a6e6ebe752e52f3407b7c8b8f0317693922fa20c48111b7c7eb1803aaa66fc97b8c7c0c8bcf7e066b762199
-AUX nrpe-2.14-tcpd-et-al.patch 3310 SHA256 df8e0ba342b10a3ce83e0285bc9fa88022087b5ec54a24c6471c8cbde4809845 SHA512 61410f22b5cb28e9effd696678e25092ec5677d73883f441712b18d3a1af5eefe0445203d5a5e2a0701b0ba0b3cfa771a6851ed1d61f22980e3bf29376ced80a WHIRLPOOL 73273fcd5ca4bd861de101f65e8d06a5acec20cb129057ef76de68ffd28bfc3d47071361f0da32553b438ef03e653b296181fbc434778b39672ac1f6b7da783c
+AUX nrpe-2.14-tcpd-et-al.patch 3181 SHA256 535112556fc0ebfa0923fbd0badccd2705390766bb97575a0b2a40e99fa57d0f SHA512 79423de5d95b3582e6b1baf287334eaf9cea0ba168b7d285af88d63a7ca2da7940c7c1572bf2a7be94da767b4bf6ca4c608db5a9b6a0e84b8c502c672bf2b42c WHIRLPOOL 77686a6f1a4d079ffc1c34767133f4ce4f7e81971f20714c9a79d07a415cee1b9e3905e60ff95d180d980b86c57418d20866848ad568e7ab4a3494b7633cb073
 AUX nrpe.init 649 SHA256 45e60dba135cb1a317908036ad7f98e1a8909015544e7b16fc23e4bc54741523 SHA512 4f8f825260de6188926598fa40f1baa3eddd9fbfd3b6554fc43b04cbf7551ea9b41ed0aabe7ad398824547a2d702e10cb1ef0af8b4af33f6f220fc4f29def2cb WHIRLPOOL 8d2afab78baacdb736f1780757b022ecb0dfca9f5948d2447a5f4b72cd725be4762159c238b85dc75c9493ecf9ac5bdca14a41efa50b2fae0e49c2b380231d14
 AUX nrpe.xinetd.2 245 SHA256 9b58e79ec14f538a2750875a49fdbc153c5919b2b97cdc9380ae9d11dbf65c28 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb WHIRLPOOL 60a96b00f18dd3305794f81288ed781b19b471e1838243970672762682d56e34ff4d325a62a77178d229ff67b9b39c9a9da7ef0dd78b8fbdb541b2e983d4f9d4
 DIST nrpe-2.13.tar.gz 411768 SHA256 bac8f7eb9daddf96b732a59ffc5762b1cf073fb70f6881d95216ebcd1254a254 SHA512 71045340022212a76703aeab6b821fe521acb9fbdc8e54d646192be300afc6a6ae06491d1137fb675faa01cfe92c2f4eb9afc9560b1c02e7692d272d69508317 WHIRLPOOL efcd1d2285bd56e562027588c01a942a60afe16a02211cc5d9cb3043e9d44c7d359552a4ab1d472aee55ac6a4a4c81220a6806ebdcda63089d00fc0d43aad3cd
 DIST nrpe-2.14.tar.gz 421635 SHA256 808c7c4a82d0addf15449663e4712b5018c8bbd668e46723139f731f1ac44431 SHA512 bd8b55178a780710bc014d703248953bccad8ac9f048c2cfe1b86ba6c12b3d506b2e32257b1ea3a5ddaad9049753ded2fd690bd6667b13cd4fd59e1a7afae96b WHIRLPOOL 4fec6f992c9229fedfc731de849406332bc954fe52945d77e4335a2a707ded3ecb49e19b30eb76e46dbab748a7232921819592aa47ba5da3167cc4d644858917
 EBUILD nrpe-2.13-r4.ebuild 3512 SHA256 7f32d82da0be07ce955fa4b7b7bc35c2686d56fdac11170b49ad3e83d820bd7d SHA512 71c130d3c325ade74b622c1ff86a63617e720d4ac6beae62785e93510c1a14166083fa7484dcaa641889e9dd9d8c96ebd98f30fa38ff1f30ed0be00667cd1ee7 WHIRLPOOL bc93dea966d6ceba185b9f2db4741c4c08044bf48cfcb904507e46c60c7998d767875fa5e0214568247bb16451f98b4b36478dd7df144c70a14ed7608bf7059c
 EBUILD nrpe-2.14.ebuild 3604 SHA256 33969eebe19ffb1af80bc36baa37a6a18fadb8318e9f700c3797036b35ab82a8 SHA512 a597fd3946432bb3c7cf7f76a61218545cf95eaf56cbe869bbca67b4bb9ece70e21f690ddf7f8fc9ed4d8bf39f0f76983c52bf0ef3c388a3fd993e0cb3e20284 WHIRLPOOL d0794e38f3e2adf01dcbf324c8bf24f61491f127b4a46a5b0e5d55c9236d21131524a1475ca075eb4be82fccb9e6ce61a298fd91dbb60f8609660aa1975670cc
-MISC ChangeLog 13767 SHA256 2ca8178b7c82c4f6fd87c5a32913e35135ab11cb6c57731626ae92bb275d1fce SHA512 96a52da8331178101b69341064714c6c9345a673b30f46cb10181b4e9f101fc9e1633cbed63c51b688cd17a9a32a705c682a37d3d2f2fd1c8b8854cae9e9707e WHIRLPOOL f22ae84af031b60f95840b4a49556b86f9d25195c6449ff6a93fcc3da87155a9ca02094012d50bf7c43553c1a1314ef31449b78f93a1c2e465f86f2efd91c169
+MISC ChangeLog 13988 SHA256 1d2df463b114a664672042be04b3baebd424ef36990348fbc0b643b862bd48d5 SHA512 1ac8290f688f27f15355046283162effa94a40d4401b6716c0e86d0d9494c46f0745a657a017138c75bfb78fa9e6aa0cc07407e0a530d46e44ce7d6909adee0a WHIRLPOOL d5abd07b78a66c0aa9d3b653064e348a160c4376e32c9f545e6b2016904b539c496341b8682fce78c9865b5b04c524f1f93a9f0bc21850eb44debe02aab4b169
 MISC metadata.xml 701 SHA256 8eb0b66c24ed523dcf32aaa5d0782a3a59377c744a944caf35d5ef80bfacf480 SHA512 4dd2ff64151d8aac7cc0dfa995f8f561791e5df6dcaaeb527ef14c3dfc6e0ee379d09dcd0151957bcdebd5849475c8dd88b0f041c1e2fcd7d3f0e6394f9c756d WHIRLPOOL c89442259d16a1ad23429cfcfbbcf566d1d1f7e90e31ee3cf7450ba600e477e28e18aaf9b0250667cab6ffd7909d53599f6b27a49565510d95677fcadeede2c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRAsR9AAoJEBzRPIrUMBNCtyEH/3s6E7rcBaMrXu4BIDvL3usK
-jsWsRRicEfncPJi6vFknqxg1OnMP9uWCTe/ub3UvUPdYrCSXFE5ZOwPfz3FtFMXg
-QiumGM7gn8Z4XqX91XfH7NSe68cjpy6jtU1pdyp33pMbOUSPSzh+QL4koMXiBekD
-U79KnXSnrGozNiwLEBI8ze23g3ECGSGkeROsZP/vAbUrFdkIF5WREwz9CisAD4cu
-siEtQ4vRmId83cZwWnSg2XBSwE9kFomQsCW6QD+IMXr8SVWtFjx3JvINnLVI7otj
-csJkBJQxHLFBkfM5aEYa3e45ayV3ua1NOTGsGeAlHsh+lgY31sF8XsPWLkbsvYI=
-=+S+6
+iQEcBAEBCAAGBQJREGI1AAoJEBzRPIrUMBNC7gcH/j6gZMaYygzzCrKmpfdVNaho
+9EupIpxvB089BNPfjH1FL9IrT5VctgPBdJDOyNC5SimDmzNGTCsbcLflp8vOHJZC
+eNV9S7Ca2KYgQpHTSNA4lOtxHczgd1qdC/O3SSQluoO2D60z/aLq9i+B+jPOaW34
+zVBXIzHxcmblyEIbxdGFhC3JHjSfTma/dH7mBcdfHa0Fxkeh1EMGYNHd/4rzRezS
+pah16W0U6pVp76T5pWpteeTIuKKkS6qIDgcM6rIDHBzG5AGAHtIsZMV3x2gEzg6S
+O/CZfH9YEakQ0EDkVq7JyZodzDx54Ywn8OP5BqsKnENYIAB64kjfJesOA42VG2c=
+=l5pn
 -----END PGP SIGNATURE-----
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],