* [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins: nagios-plugins-1.4.16.ebuild ChangeLog
@ 2012-07-31 21:53 Christian Ruppert (idl0r)
0 siblings, 0 replies; 3+ messages in thread
From: Christian Ruppert (idl0r) @ 2012-07-31 21:53 UTC (permalink / raw
To: gentoo-commits
idl0r 12/07/31 21:53:01
Modified: ChangeLog
Added: nagios-plugins-1.4.16.ebuild
Log:
Non-maitainer bump, fixes bug 428560, bug 411497 and bug 366403.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.145 net-analyzer/nagios-plugins/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?r1=1.144&r2=1.145
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- ChangeLog 12 Jun 2012 02:44:29 -0000 1.144
+++ ChangeLog 31 Jul 2012 21:53:01 -0000 1.145
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/nagios-plugins
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.144 2012/06/12 02:44:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.145 2012/07/31 21:53:01 idl0r Exp $
+
+*nagios-plugins-1.4.16 (31 Jul 2012)
+
+ 31 Jul 2012; Christian Ruppert <idl0r@gentoo.org>
+ +nagios-plugins-1.4.16.ebuild, +files/nagios-plugins-1.4.16-contrib.patch:
+ Non-maitainer bump, fixes bug 428560, bug 411497 and bug 366403.
12 Jun 2012; Zac Medico <zmedico@gentoo.org> nagios-plugins-1.4.14-r2.ebuild,
nagios-plugins-1.4.14.ebuild, nagios-plugins-1.4.15.ebuild:
1.1 net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild?rev=1.1&content-type=text/plain
Index: nagios-plugins-1.4.16.ebuild
===================================================================
# Copyright 1999-2012 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.16.ebuild,v 1.1 2012/07/31 21:53:01 idl0r Exp $
EAPI=4
inherit autotools eutils multilib user
DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
HOMEPAGE="http://www.nagios.org/"
SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber"
DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql-base )
ssl? ( >=dev-libs/openssl-0.9.6g )
radius? ( >=net-dialup/radiusclient-0.3.2 )"
RESTRICT="test"
RDEPEND="${DEPEND}
>=dev-lang/perl-5.6.1-r7
samba? ( >=net-fs/samba-2.2.5-r1 )
snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1
>=net-analyzer/net-snmp-5.0.6
)
mysql? ( dev-perl/DBI
dev-perl/DBD-mysql )
nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
nagios-ntp? ( >=net-misc/ntp-4.1.1a )
nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
ups? ( >=sys-power/nut-1.4 )
!sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )
jabber? ( >=dev-perl/Net-Jabber-2.0 )"
pkg_setup() {
enewgroup nagios
enewuser nagios -1 /bin/bash /var/nagios/home nagios
}
src_prepare() {
if ! use radius; then
EPATCH_OPTS="-p1 -d ${S}" epatch \
"${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
fi
# bug 366403
epatch "${FILESDIR}"/${P}-contrib.patch
epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
epatch "${FILESDIR}"/${PN}-1.4.15-vserver.patch
epatch "${FILESDIR}"/${PN}-1.4.15-openldap.patch
eautoreconf
}
src_configure() {
local conf
if use ssl; then
conf="${conf} --with-openssl=/usr"
else
conf="${conf} --without-openssl"
fi
if use postgres; then
conf="${conf} --with-pgsql=/usr"
fi
econf \
$(use_with mysql) \
$(use_with ipv6) \
$(use_with ldap) \
${conf} \
--host=${CHOST} \
--prefix=/usr \
--libexecdir=/usr/$(get_libdir)/nagios/plugins \
--sysconfdir=/etc/nagios || die "econf failed"
# fix problem with additional -
sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
}
src_install() {
mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
chmod +x "${S}"/contrib/*.pl
sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed"
sed -i -e s#/usr/nagios/libexec#/usr/$(get_libdir)/nagios/plugins#g "${S}"/contrib/*.pl || die "sed failed"
sed -i -e '30s/use lib utils.pm;/use utils;/' \
"${S}"/plugins-scripts/check_file_age.pl || die "sed failed"
dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS
emake DESTDIR="${D}" install || die "make install failed"
if use mysql || use postgres; then
dodir /usr/$(get_libdir)/nagios/plugins
exeinto /usr/$(get_libdir)/nagios/plugins
doexe "${S}"/contrib/check_nagios_db.pl
fi
if ! use snmp; then
rm "${D}"/usr/$(get_libdir)/nagios/plugins/check_if{operstatus,status} \
|| die "Failed to remove SNMP check plugins"
fi
mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib
if ! use jabber; then
rm "${D}"usr/$(get_libdir)/nagios/plugins/contrib/nagios_sendim.pl \
|| die "Failed to remove XMPP notification addon"
fi
chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \
|| die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins"
chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \
|| die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins"
if use suid ; then
chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/{check_icmp,check_ide_smart,check_dhcp} \
|| die "Failed setting the suid bit for various plugins"
fi
dosym /usr/$(get_libdir)/nagios/plugins/utils.sh /usr/$(get_libdir)/nagios/plugins/contrib/utils.sh
dosym /usr/$(get_libdir)/nagios/plugins/utils.pm /usr/$(get_libdir)/nagios/plugins/contrib/utils.pm
}
pkg_postinst() {
einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor."
einfo "Depending on what you want to monitor with nagios, some or all of these USE"
einfo "flags need to be set for nagios to function correctly."
echo
einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
}
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins: nagios-plugins-1.4.16.ebuild ChangeLog
@ 2012-08-15 16:38 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-08-15 16:38 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/08/15 16:38:19
Modified: nagios-plugins-1.4.16.ebuild ChangeLog
Log:
QA: stop parallel build as the build system is unsafe. I'll provide a fix asap.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.2 net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild?r1=1.1&r2=1.2
Index: nagios-plugins-1.4.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagios-plugins-1.4.16.ebuild 31 Jul 2012 21:53:01 -0000 1.1
+++ nagios-plugins-1.4.16.ebuild 15 Aug 2012 16:38:19 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.16.ebuild,v 1.1 2012/07/31 21:53:01 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild,v 1.2 2012/08/15 16:38:19 flameeyes Exp $
EAPI=4
@@ -86,6 +86,11 @@
sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
}
+src_compile() {
+ # fails parallel build, fix is non-trivial
+ emake -j1
+}
+
src_install() {
mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
chmod +x "${S}"/contrib/*.pl
1.146 net-analyzer/nagios-plugins/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?r1=1.145&r2=1.146
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- ChangeLog 31 Jul 2012 21:53:01 -0000 1.145
+++ ChangeLog 15 Aug 2012 16:38:19 -0000 1.146
@@ -1,6 +1,11 @@
# ChangeLog for net-analyzer/nagios-plugins
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.145 2012/07/31 21:53:01 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.146 2012/08/15 16:38:19 flameeyes Exp $
+
+ 15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+ nagios-plugins-1.4.16.ebuild:
+ QA: stop parallel build as the build system is unsafe. I'll provide a fix
+ asap.
*nagios-plugins-1.4.16 (31 Jul 2012)
@@ -274,4 +279,3 @@
+files/nagios-plugins-1.4.11-autoconf-2.62.patch,
+nagios-plugins-1.4.11-r1.ebuild:
Fix for autoconf-2.62, bug #218704
-
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins: nagios-plugins-1.4.16.ebuild ChangeLog
@ 2012-08-15 18:29 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-08-15 18:29 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/08/15 18:29:21
Modified: nagios-plugins-1.4.16.ebuild ChangeLog
Log:
Fix building in parallel (tested on 32-way system).
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.3 net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild?r1=1.2&r2=1.3
Index: nagios-plugins-1.4.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios-plugins-1.4.16.ebuild 15 Aug 2012 16:38:19 -0000 1.2
+++ nagios-plugins-1.4.16.ebuild 15 Aug 2012 18:29:21 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.16.ebuild,v 1.2 2012/08/15 16:38:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild,v 1.3 2012/08/15 18:29:21 flameeyes Exp $
EAPI=4
@@ -56,6 +56,7 @@
epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
epatch "${FILESDIR}"/${PN}-1.4.15-vserver.patch
epatch "${FILESDIR}"/${PN}-1.4.15-openldap.patch
+ epatch "${FILESDIR}"/${P}-parallelmake.patch
eautoreconf
}
@@ -86,11 +87,6 @@
sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
}
-src_compile() {
- # fails parallel build, fix is non-trivial
- emake -j1
-}
-
src_install() {
mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
chmod +x "${S}"/contrib/*.pl
1.147 net-analyzer/nagios-plugins/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?r1=1.146&r2=1.147
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog 15 Aug 2012 16:38:19 -0000 1.146
+++ ChangeLog 15 Aug 2012 18:29:21 -0000 1.147
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/nagios-plugins
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.146 2012/08/15 16:38:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.147 2012/08/15 18:29:21 flameeyes Exp $
+
+ 15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+ +files/nagios-plugins-1.4.16-parallelmake.patch, nagios-plugins-1.4.16.ebuild:
+ Fix building in parallel (tested on 32-way system).
15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
nagios-plugins-1.4.16.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-15 18:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-31 21:53 [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins: nagios-plugins-1.4.16.ebuild ChangeLog Christian Ruppert (idl0r)
-- strict thread matches above, loose matches on Subject: below --
2012-08-15 16:38 Diego Petteno (flameeyes)
2012-08-15 18:29 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox