Gentoo Archives: 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: ChangeLog nagios-plugins-1.4.10-r1.ebuild
Date: Mon, 29 Oct 2007 19:51:40
Message-Id: E1Imae7-0007vQ-0j@stork.gentoo.org
1 dertobi123 07/10/29 19:51:35
2
3 Modified: ChangeLog
4 Added: nagios-plugins-1.4.10-r1.ebuild
5 Log:
6 Revbump, fixes for CVE-2007-5623 and CVE-2007-5198
7 (Portage version: 2.1.3.16)
8
9 Revision Changes Path
10 1.77 net-analyzer/nagios-plugins/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.77&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.77&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?r1=1.76&r2=1.77
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v
19 retrieving revision 1.76
20 retrieving revision 1.77
21 diff -u -r1.76 -r1.77
22 --- ChangeLog 23 Oct 2007 19:43:06 -0000 1.76
23 +++ ChangeLog 29 Oct 2007 19:51:34 -0000 1.77
24 @@ -1,6 +1,16 @@
25 # ChangeLog for net-analyzer/nagios-plugins
26 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.76 2007/10/23 19:43:06 dertobi123 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.77 2007/10/29 19:51:34 dertobi123 Exp $
29 +
30 +*nagios-plugins-1.4.10-r1 (29 Oct 2007)
31 +
32 + 29 Oct 2007; Tobias Scherbaum <dertobi123@g.o>
33 + +files/nagios-plugins-1.4.10-check_http.patch, +files/CVE-2007-5623.patch,
34 + +nagios-plugins-1.4.10-r1.ebuild:
35 + revbump, Include a fix for CVE-2007-5623 (Bug #196308)
36 + The fix for CVE-2007-5198 (Bug #194178) was incomplete as per
37 + http://sourceforge.net/tracker/index.php?func=detail&aid=1813346&group_id=29
38 + 880&atid=397597
39
40 23 Oct 2007; Tobias Scherbaum <dertobi123@g.o>
41 -files/nagios-plugins-1.4.8-mysql.patch,
42
43
44
45 1.1 net-analyzer/nagios-plugins/nagios-plugins-1.4.10-r1.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.10-r1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.10-r1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: nagios-plugins-1.4.10-r1.ebuild
51 ===================================================================
52 # Copyright 1999-2007 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.10-r1.ebuild,v 1.1 2007/10/29 19:51:34 dertobi123 Exp $
55
56 WANT_AUTOCONF="latest"
57 WANT_AUTOMAKE="latest"
58
59 inherit eutils autotools
60
61 DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
62 HOMEPAGE="http://www.nagios.org/"
63 SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
64
65 LICENSE="GPL-2"
66 SLOT="0"
67 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
68 IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
69 nagios-ssh nagios-game ups ipv6 radius"
70
71 DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
72 mysql? ( virtual/mysql )
73 postgres? ( >=dev-db/postgresql-7.2 )
74 ssl? ( >=dev-libs/openssl-0.9.6g )
75 radius? ( >=net-dialup/radiusclient-0.3.2 )"
76
77 RESTRICT="test"
78
79 RDEPEND="${DEPEND}
80 >=dev-lang/perl-5.6.1-r7
81 samba? ( >=net-fs/samba-2.2.5-r1 )
82 snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1
83 >=net-analyzer/net-snmp-5.0.6
84 )
85 mysql? ( dev-perl/DBI
86 dev-perl/DBD-mysql )
87 nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
88 nagios-ntp? ( >=net-misc/ntp-4.1.1a )
89 nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
90 nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
91 ups? ( >=sys-power/nut-1.4 )
92 !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )"
93
94 pkg_setup() {
95 enewgroup nagios
96 enewuser nagios -1 /bin/bash /var/nagios/home nagios
97 }
98
99 src_unpack() {
100 unpack ${A}
101 cd "${S}"
102
103 if ! use radius; then
104 EPATCH_OPTS="-p1 -d ${S}" epatch \
105 "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
106 fi
107
108 epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
109
110 ## CVE-2007-5623
111 epatch "${FILESDIR}"/CVE-2007-5623.patch
112
113 epatch "${FILESDIR}"/${P}-check_http.patch
114
115 AT_M4DIR="m4 gl/m4" eautoreconf
116 }
117
118 src_compile() {
119
120 local conf
121 if use ssl; then
122 conf="${conf} --with-openssl=/usr"
123 else
124 conf="${conf} --without-openssl"
125 fi
126
127 econf \
128 $(use_with mysql) \
129 $(use_with postgres) \
130 $(use_with ipv6) \
131 ${conf} \
132 --host=${CHOST} \
133 --prefix=/usr/nagios \
134 --sysconfdir=/etc/nagios \
135 --infodir=/usr/share/info \
136 --mandir=/usr/share/man || die "econf failed"
137
138 # fix problem with additional -
139 sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
140
141 emake || die "emake failed"
142 }
143
144 src_install() {
145 mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
146 chmod +x "${S}"/contrib/*.pl
147
148 sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed"
149 sed -i -e '30s/use lib utils.pm;/use utils;/' \
150 "${S}"/plugins-scripts/check_file_age.pl || die "sed failed"
151
152 dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
153 ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS
154
155 emake DESTDIR="${D}" install || die "make install failed"
156
157 if use mysql || use postgres; then
158 dodir /usr/nagios/libexec
159 exeinto /usr/nagios/libexec
160 doexe "${S}"/contrib/check_nagios_db.pl
161 fi
162
163 dodir /usr/nagios/libexec/
164 mv "${S}"/contrib "${D}"/usr/nagios/libexec/contrib
165
166 chown root:nagios "${D}"/usr/nagios || die "Failed Chown of ${D}usr/nagios"
167 chown -R root:nagios "${D}"/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec"
168
169 chmod -R o-rwx "${D}"/usr/nagios/libexec || die "Failed Chmod of ${D}usr/nagios/libexec"
170
171 chmod 04710 "${D}"/usr/nagios/libexec/check_icmp || die "Failed Chmod of ${D}usr/nagios/libexec/check_icmp"
172 }
173
174 pkg_postinst() {
175 einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor."
176 einfo "Depending on what you want to monitor with nagios, some or all of these USE"
177 einfo "flags need to be set for nagios to function correctly."
178 echo
179 einfo "contrib plugins are installed into /usr/nagios/libexec/contrib"
180 }
181
182
183
184 --
185 gentoo-commits@g.o mailing list