Add fix for indefinitely hang while checking ping on Linux VServer (#44382), patch by Norbert Klein and Ivan Chavero

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 112 insertions, 4 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 4a25bb9810ed..38e3a030b567 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.127 2010/01/31 17:40:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.128 2010/03/16 16:39:26 dertobi123 Exp $
+
+*nagios-plugins-1.4.14-r2 (16 Mar 2010)
+
+  16 Mar 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-plugins-1.4.14-r1.ebuild, +nagios-plugins-1.4.14-r2.ebuild,
+  +files/nagios-plugins-1.4.14-vserver.patch:
+  Add fix for indefinitely hang while checking ping on Linux VServer
+  (#44382), patch by Norbert Klein and Ivan Chavero
 
   31 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   nagios-plugins-1.4.14.ebuild:
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index e4fc16e13143..182891bc2548 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,10 +1,11 @@
 AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278
 AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229
 AUX nagios-plugins-1.4.12-pgsqlconfigure.patch 2981 RMD160 6090168654e888ce9b5bb1c5c6b493f3a019472d SHA1 db41a7f6b57f1119045fb90707a7a8182225d9b8 SHA256 8e57962c484363fa790c6920f1f9fe11f273a061fcc59ac2cb9b1d57634a1455
+AUX nagios-plugins-1.4.14-vserver.patch 3509 RMD160 49a84ccf016a707872af94306570d7ff173499b8 SHA1 45c255a947adb07cef9f3f18bf9eb0e511c82937 SHA256 7302c26729d02b00c5b5ac4857136773f348ea0a2b7fbddb8ef701784020c3c8
 DIST nagios-plugins-1.4.13.tar.gz 2279556 RMD160 38de32581581b21e36e047138a94a70a9a031a02 SHA1 fb22eba22095bdd709a65b1477bfb566aac9077e SHA256 592fe3329777e53f8fb526cb61e625a85ae9a1fd850b4039f78a2c460b1607c5
 DIST nagios-plugins-1.4.14.tar.gz 1950729 RMD160 f4e1768d84474fc4fa2b59a52efe320c7cbefb3a SHA1 b9998231f992c92b9370b62f15ac80323042f22c SHA256 b1f0f2c01bab2a320cc7c041106500acfd6a5262ff811a2c31b62608ac6c3352
 EBUILD nagios-plugins-1.4.13-r1.ebuild 4095 RMD160 e6631308d30928cab3c8217e2eb19cf1afd924ff SHA1 e0141cabfd0eeaa34118954aa59493d07ba127f1 SHA256 953f7ae9cfb3c4fb64459625573eea0c4f9a88611c6e0da90a0e954411587dda
-EBUILD nagios-plugins-1.4.14-r1.ebuild 4414 RMD160 9aea640dd830238353deda2f6d2cddf1bee592c3 SHA1 ac0a93d59ec72c5d46ecf1a3a2559435e34b0eba SHA256 874d36dbfd8fc525a97e2d0b0ea68c96fc00d2b6a96df429299efeaa30785a9c
+EBUILD nagios-plugins-1.4.14-r2.ebuild 4462 RMD160 ede63fd35f944e8e90340d51bd1decffc070f959 SHA1 6316721b206ac30d8e8eafb3ca7e2a367fd2fd47 SHA256 525095ec3b3463e1baa1964ef462c264f1d642534b6260059b33ceecdd4d00c7
 EBUILD nagios-plugins-1.4.14.ebuild 4210 RMD160 ae43874a63e1ab9eb33274335522208a596dfb4e SHA1 32e8d52e0d57f29b4bc0a3d30601724dfd7ad74c SHA256 d8d6cebeca7de4e5ad7d1751bf8ff14cb261e579a57b1f0e45732ad5a073ed1c
-MISC ChangeLog 7053 RMD160 03e4f17662fd60bbe2983c71fa2d107026e2aa62 SHA1 f97aea09b0717d418b81ab056121dffaa66cf44b SHA256 032d2454556a13fffb70aa41e4770ceacb7cace1cc429f1f19606724ac8b66fb
+MISC ChangeLog 7391 RMD160 04ba7618fd51e37db9f782874d352d1337d1c9c7 SHA1 7df3e9a58e70ae5cf568d0f18970f1f6b131ba6d SHA256 9598747197261974e76a83962bf106c0d8cc2cba818a5f6516d19e7228951dbf
 MISC metadata.xml 846 RMD160 c586646ae8e50e5530570a9e7dbdc3bfef074d89 SHA1 4a58e0ba3dde6f44a5227c0c232a0f2d2f06ed1d SHA256 ca1e7a175629f4ce6866ca6408744e222216e12c4ce37c6075bf2ded87916ff7
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-vserver.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-vserver.patch
new file mode 100644
index 000000000000..5eb99f31b96c
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-vserver.patch
@@ -0,0 +1,98 @@
+--- configure.in.orig	2009-02-26 14:05:55.000000000 +0000
++++ configure.in	2009-02-26 14:07:02.000000000 +0000
+@@ -94,6 +94,8 @@
+ PKG_ARCH=`uname -p`
+ REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`
+ REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
++first_ip=`/sbin/ifconfig | egrep "inet addr:" | sed -n '1p' | sed 's/ Bcast.*$//' | sed 's/^\s*inet addr://'`
++
+ 
+ AC_SUBST(PKG_ARCH)
+ AC_SUBST(REV_DATESTAMP)
+@@ -869,14 +871,14 @@
+ 	fi
+ 
+ elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
+-	$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
++	$PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+         with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+ 	ac_cv_ping_packets_first=yes
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+         with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
+@@ -884,52 +886,52 @@
+   ac_cv_ping_has_timeout=yes
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+         with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+ 	ac_cv_ping_packets_first=yes
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+ 	with_ping_command="$PATH_TO_PING -n -c %d %s"
+ 	ac_cv_ping_packets_first=yes
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
++elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+ 	with_ping_command="$PATH_TO_PING -n %s -c %d"
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
++elif $PATH_TO_PING $first_ip -n 1 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+ 	with_ping_command="$PATH_TO_PING %s -n %d"
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
++elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+ 	with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \
++elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+ 	with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+ 	with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
+ 	ac_cv_ping_packets_first=yes
+ 	AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
+ 	egrep -i "^round-trip|^rtt" >/dev/null
+ then
+ 	with_ping_command="$PATH_TO_PING -n -c %d %s"
+@@ -1132,7 +1134,7 @@
+ 	if test -n "$PATH_TO_NSLOOKUP"
+ 	then
+ 		AC_MSG_CHECKING(for nslookup syntax)
+-		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null
++		if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 | grep ["Invalid option: sil"] >/dev/null
+ 		then
+ 			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
+ 			AC_MSG_RESULT([$ac_cv_nslookup_command])
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild
index 409961ed74e9..708d728ebf28 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r1.ebuild,v 1.2 2010/01/22 16:01:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild,v 1.1 2010/03/16 16:39:26 dertobi123 Exp $
 
 EAPI=1
 
@@ -55,6 +55,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
 	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
+	epatch "${FILESDIR}"/${P}-vserver.patch
 
 	eautoreconf
 }