[gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins/files: nagios-plugins-1.4.15-vserver.patch - gentoo-commits

From:	"Tobias Scherbaum (dertobi123)" <dertobi123@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins/files: nagios-plugins-1.4.15-vserver.patch
Date:	Fri, 30 Jul 2010 15:02:15
Message-Id:	`20100730143442.D28752CAD8@corvid.gentoo.org`

1

dertobi123    10/07/30 14:34:42

2

3

  Added:                nagios-plugins-1.4.15-vserver.patch

4

  Log:

5

  Version bump

6

  (Portage version: 2.2_rc67/cvs/Linux x86_64)

7

8

Revision  Changes    Path

9

1.1                  net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch

10

11

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch?rev=1.1&view=markup

12

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch?rev=1.1&content-type=text/plain

13

14

Index: nagios-plugins-1.4.15-vserver.patch

15

===================================================================

16

--- configure.in.orig	2010-07-30 16:22:01.000000000 +0200

17

+++ configure.in	2010-07-30 16:24:30.000000000 +0200

18

@@ -94,6 +94,8 @@

19

 REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`

20

 REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`

21

22

+first_ip=`/sbin/ifconfig | egrep "inet addr:" | sed -n '1p' | sed 's/ Bcast.*$//' | sed 's/^\s*inet addr://'`

23

+

24

 AC_SUBST(PKG_ARCH)

25

 AC_SUBST(REV_DATESTAMP)

26

 AC_SUBST(REV_TIMESTAMP)

27

@@ -950,14 +952,14 @@

28

fi

29

30

 elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \

31

-	$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \

32

+	$PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \

33

 	egrep -i "^round-trip|^rtt" >/dev/null

34

 then

35

 	with_ping_command="$PATH_TO_PING -n -U -c %d %s"

36

 	ac_cv_ping_packets_first=yes

37

 	AC_MSG_RESULT([$with_ping_command])

38

39

-elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \

40

+elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null | \

41

 	egrep -i "^round-trip|^rtt" >/dev/null

42

 then

43

 	with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"

44

@@ -965,52 +967,52 @@

45

   ac_cv_ping_has_timeout=yes

46

 	AC_MSG_RESULT([$with_ping_command])

47

48

-elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \

49

+elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null | \

50

 	egrep -i "^round-trip|^rtt" >/dev/null

51

 then

52

 	with_ping_command="$PATH_TO_PING -n -U -c %d %s"

53

 	ac_cv_ping_packets_first=yes

54

 	AC_MSG_RESULT([$with_ping_command])

55

56

-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \

57

+elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \

58

 	egrep -i "^round-trip|^rtt" >/dev/null

59

 then

60

 	with_ping_command="$PATH_TO_PING -n -c %d %s"

61

 	ac_cv_ping_packets_first=yes

62

 	AC_MSG_RESULT([$with_ping_command])

63

64

-elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \

65

+elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null | \

66

 	egrep -i "^round-trip|^rtt" >/dev/null

67

 then

68

 	with_ping_command="$PATH_TO_PING -n %s -c %d"

69

 	AC_MSG_RESULT([$with_ping_command])

70

71

-elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \

72

+elif $PATH_TO_PING $first_ip -n 1 2>/dev/null | \

73

 	egrep -i "^round-trip|^rtt" >/dev/null

74

 then

75

 	with_ping_command="$PATH_TO_PING %s -n %d"

76

 	AC_MSG_RESULT([$with_ping_command])

77

78

-elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \

79

+elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \

80

 	egrep -i "^round-trip|^rtt" >/dev/null

81

 then

82

 	with_ping_command="$PATH_TO_PING -n -s %s 56 %d"

83

 	AC_MSG_RESULT([$with_ping_command])

84

85

-elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \

86

+elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null | \

87

 	egrep -i "^round-trip|^rtt" >/dev/null

88

 then

89

 	with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"

90

 	AC_MSG_RESULT([$with_ping_command])

91

92

-elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \

93

+elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null | \

94

 	egrep -i "^round-trip|^rtt" >/dev/null

95

 then

96

 	with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"

97

 	ac_cv_ping_packets_first=yes

98

 	AC_MSG_RESULT([$with_ping_command])

99

100

-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \

101

+elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \

102

 	egrep -i "^round-trip|^rtt" >/dev/null

103

 then

104

 	with_ping_command="$PATH_TO_PING -n -c %d %s"

105

@@ -1221,7 +1223,7 @@

106

 	if test -n "$PATH_TO_NSLOOKUP"

107

 	then

108

 		AC_MSG_CHECKING(for nslookup syntax)

109

-		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null

110

+		if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 | grep ["Invalid option: sil"] >/dev/null

111

 		then

112

 			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"

113

 			AC_MSG_RESULT([$ac_cv_nslookup_command])

1	dertobi123 10/07/30 14:34:42
2
3	Added: nagios-plugins-1.4.15-vserver.patch
4	Log:
5	Version bump
6	(Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8	Revision Changes Path
9	1.1 net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch
10
11	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch?rev=1.1&view=markup
12	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch?rev=1.1&content-type=text/plain
13
14	Index: nagios-plugins-1.4.15-vserver.patch
15	===================================================================
16	--- configure.in.orig 2010-07-30 16:22:01.000000000 +0200
17	+++ configure.in 2010-07-30 16:24:30.000000000 +0200
18	@@ -94,6 +94,8 @@
19	REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`
20	REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
21
22	+first_ip=`/sbin/ifconfig \| egrep "inet addr:" \| sed -n '1p' \| sed 's/ Bcast.$//' \| sed 's/^\sinet addr://'`
23	+
24	AC_SUBST(PKG_ARCH)
25	AC_SUBST(REV_DATESTAMP)
26	AC_SUBST(REV_TIMESTAMP)
27	@@ -950,14 +952,14 @@
28	fi
29
30	elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
31	- $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null \| \
32	+ $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null \| \
33	egrep -i "^round-trip\|^rtt" >/dev/null
34	then
35	with_ping_command="$PATH_TO_PING -n -U -c %d %s"
36	ac_cv_ping_packets_first=yes
37	AC_MSG_RESULT([$with_ping_command])
38
39	-elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null \| \
40	+elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null \| \
41	egrep -i "^round-trip\|^rtt" >/dev/null
42	then
43	with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
44	@@ -965,52 +967,52 @@
45	ac_cv_ping_has_timeout=yes
46	AC_MSG_RESULT([$with_ping_command])
47
48	-elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null \| \
49	+elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null \| \
50	egrep -i "^round-trip\|^rtt" >/dev/null
51	then
52	with_ping_command="$PATH_TO_PING -n -U -c %d %s"
53	ac_cv_ping_packets_first=yes
54	AC_MSG_RESULT([$with_ping_command])
55
56	-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null \| \
57	+elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null \| \
58	egrep -i "^round-trip\|^rtt" >/dev/null
59	then
60	with_ping_command="$PATH_TO_PING -n -c %d %s"
61	ac_cv_ping_packets_first=yes
62	AC_MSG_RESULT([$with_ping_command])
63
64	-elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null \| \
65	+elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null \| \
66	egrep -i "^round-trip\|^rtt" >/dev/null
67	then
68	with_ping_command="$PATH_TO_PING -n %s -c %d"
69	AC_MSG_RESULT([$with_ping_command])
70
71	-elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null \| \
72	+elif $PATH_TO_PING $first_ip -n 1 2>/dev/null \| \
73	egrep -i "^round-trip\|^rtt" >/dev/null
74	then
75	with_ping_command="$PATH_TO_PING %s -n %d"
76	AC_MSG_RESULT([$with_ping_command])
77
78	-elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null \| \
79	+elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null \| \
80	egrep -i "^round-trip\|^rtt" >/dev/null
81	then
82	with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
83	AC_MSG_RESULT([$with_ping_command])
84
85	-elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null \| \
86	+elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null \| \
87	egrep -i "^round-trip\|^rtt" >/dev/null
88	then
89	with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
90	AC_MSG_RESULT([$with_ping_command])
91
92	-elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null \| \
93	+elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null \| \
94	egrep -i "^round-trip\|^rtt" >/dev/null
95	then
96	with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
97	ac_cv_ping_packets_first=yes
98	AC_MSG_RESULT([$with_ping_command])
99
100	-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null \| \
101	+elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null \| \
102	egrep -i "^round-trip\|^rtt" >/dev/null
103	then
104	with_ping_command="$PATH_TO_PING -n -c %d %s"
105	@@ -1221,7 +1223,7 @@
106	if test -n "$PATH_TO_NSLOOKUP"
107	then
108	AC_MSG_CHECKING(for nslookup syntax)
109	- if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 \| grep ["Invalid option: sil"] >/dev/null
110	+ if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 \| grep ["Invalid option: sil"] >/dev/null
111	then
112	ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
113	AC_MSG_RESULT([$ac_cv_nslookup_command])

Gentoo Archives: gentoo-commits