robbat2 14/04/19 17:06:23 Modified: ChangeLog Added: nrpe-2.15.ebuild Log: Bump, include a fix that I wrote for security bug 508122. (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.23 net-analyzer/nrpe/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nrpe/ChangeLog?rev=1.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nrpe/ChangeLog?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nrpe/ChangeLog?r1=1.22&r2=1.23 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -p -w -b -B -u -u -r1.22 -r1.23 --- ChangeLog 9 Mar 2013 19:09:06 -0000 1.22 +++ ChangeLog 19 Apr 2014 17:06:23 -0000 1.23 @@ -1,6 +1,14 @@ # 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.22 2013/03/09 19:09:06 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/ChangeLog,v 1.23 2014/04/19 17:06:23 robbat2 Exp $ + +*nrpe-2.15 (19 Apr 2014) + + 19 Apr 2014; Robin H. Johnson <robb...@gentoo.org> + +files/nrpe-2.15-autoconf-header.patch, + +files/nrpe-2.15-metachar-security-fix.patch, + +files/nrpe-2.15-tcpd-et-al.patch, +nrpe-2.15.ebuild: + Bump, include a fix that I wrote for security bug 508122. 09 Mar 2013; Agostino Sarubbo <a...@gentoo.org> nrpe-2.14.ebuild: Stable for sparc, wrt bug #459870 1.1 net-analyzer/nrpe/nrpe-2.15.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nrpe/nrpe-2.15.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nrpe/nrpe-2.15.ebuild?rev=1.1&content-type=text/plain Index: nrpe-2.15.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/nrpe-2.15.ebuild,v 1.1 2014/04/19 17:06:23 robbat2 Exp $ EAPI=4 inherit eutils toolchain-funcs multilib user autotools DESCRIPTION="Nagios Remote Plugin Executor" HOMEPAGE="http://www.nagios.org/"; SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="command-args ssl tcpd minimal" DEPEND="ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )" RDEPEND="${DEPEND} !minimal? ( >=net-analyzer/nagios-plugins-1.3.0 )" pkg_setup() { enewgroup nagios enewuser nagios -1 /bin/bash /dev/null nagios elog "If you plan to use \"nrpe_check_control\" then you may want to specify" elog "different command and services files. You can override the defaults" elog "through the \"NAGIOS_COMMAND_FILE\" and \"NAGIOS_SERVICES_FILE\" environment variables." elog "NAGIOS_COMMAND_FILE=${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}" elog "NAGIOS_SERVICES_FILE=${NAGIOS_SERVICES_FILE:-/etc/services.cfg}" } src_prepare() { # Add support for large output, # http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html epatch "${FILESDIR}"/${PN}-2.14-multiline.patch # fix configure, among others #326367, #397603 epatch "${FILESDIR}"/${PN}-2.15-tcpd-et-al.patch # otherwise autoconf will overwrite the custom include/config.h.in epatch "${FILESDIR}"/${PN}-2.15-autoconf-header.patch # improve handling of metachars for security epatch "${FILESDIR}"/${PN}-2.15-metachar-security-fix.patch sed -i -e '/define \(COMMAND\|SERVICES\)_FILE/d' contrib/nrpe_check_control.c || die # change the default location of the pid file sed -i -e '/pid_file/s:/var/run:/run:' sample-config/nrpe.cfg.in || die # fix TFU handling of autoheader sed -i -e '/#undef/d' include/config.h.in || die eautoreconf } src_configure() { local myconf if use minimal; then myconf="--disable-tcp-wrapper --disable-command-args" else myconf="$(use_enable tcpd tcp-wrapper) $(use_enable command-args)" fi econf \ --libexecdir=/usr/$(get_libdir)/nagios/plugins \ --localstatedir=/var/nagios \ --sysconfdir=/etc/nagios \ --with-nrpe-user=nagios \ --with-nrpe-group=nagios \ $(use_enable ssl) \ ${myconf} } src_compile() { emake -C src check_nrpe $(use minimal || echo nrpe) # Add nifty nrpe check tool $(tc-getCC) ${CPPFLAGS} ${CFLAGS} \ -DCOMMAND_FILE=\"${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}\" \ -DSERVICES_FILE=\"${NAGIOS_SERVICES_FILE:-/etc/services.cfg}\" \ ${LDFLAGS} -o nrpe_check_control contrib/nrpe_check_control.c || die } src_install() { dodoc LEGAL Changelog README SECURITY \ contrib/README.nrpe_check_control \ $(use ssl && echo README.SSL) exeinto /usr/$(get_libdir)/nagios/plugins doexe src/check_nrpe nrpe_check_control use minimal && return 0 ## NON-MINIMAL INSTALL FOLLOWS ## insinto /etc/nagios newins sample-config/nrpe.cfg nrpe.cfg fowners root:nagios /etc/nagios/nrpe.cfg fperms 0640 /etc/nagios/nrpe.cfg exeinto /usr/libexec doexe src/nrpe newinitd "${FILESDIR}"/nrpe.init nrpe insinto /etc/xinetd.d/ newins "${FILESDIR}/nrpe.xinetd.2" nrpe if use tcpd; then sed -i -e '/^reload()/, /^}/ d' -e '/extra_started_commands/s:reload::' \ "${D}"/etc/init.d/nrpe fi } pkg_postinst() { elog "If you are using the nrpe daemon, remember to edit" elog "the config file /etc/nagios/nrpe.cfg" if use command-args ; then ewarn "" ewarn "You have enabled command-args for NRPE. This enables" ewarn "the ability for clients to supply arguments to commands" ewarn "which should be run. " ewarn "THIS IS CONSIDERED A SECURITY RISK!" ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info" fi }
