Version bump as per #213317, thanks to Krzysztof Olędzki

Package-Manager: portage-2.1.4.4

diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index 1296ccee8b017ae2772a3c82ef76084894eeef18..9e7420cec3dd60cc931a41818f002f1f5e02ac5d 100644 (file)
--- a/net-analyzer/nagios-nrpe/ChangeLog
+++ b/net-analyzer/nagios-nrpe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-nrpe
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.47 2008/02/05 10:56:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.48 2008/03/14 07:27:04 dertobi123 Exp $
+
+*nagios-nrpe-2.12 (14 Mar 2008)
+
+  14 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> -files/nrpe-2.5.1,
+  -nagios-nrpe-2.5.1.ebuild, +nagios-nrpe-2.12.ebuild:
+  Version bump as per #213317, thanks to Krzysztof Olędzki
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> nagios-nrpe-2.10.ebuild:
   Stable on ppc64

diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nagios-nrpe/Manifest
index 4c5d8df3d3dc52c87b10fa3bbe58787314365ab4..e54b75674e3b2a1c87485c1b36564b0b7c49c159 100644 (file)
--- a/net-analyzer/nagios-nrpe/Manifest
+++ b/net-analyzer/nagios-nrpe/Manifest
@@ -1,8 +1,7 @@
 AUX nrpe 591 RMD160 27dec27f122cc022215e1c049b8749cc75746150 SHA1 08c79e7a2e0458c2e896e1470fe6de1591095881 SHA256 795470c9bce54145e54879b22ae9a1a3c288c87418bc45e4b9f5420112a27d5e
-AUX nrpe-2.5.1 591 RMD160 27dec27f122cc022215e1c049b8749cc75746150 SHA1 08c79e7a2e0458c2e896e1470fe6de1591095881 SHA256 795470c9bce54145e54879b22ae9a1a3c288c87418bc45e4b9f5420112a27d5e
 DIST nrpe-2.10.tar.gz 404483 RMD160 f935a1b77a11c106ca1cdb8ccac65e0db4bfc6ce SHA1 daf43042c40991c573fdf9d9ed8060eccd3eee6b SHA256 884b62e1e6d08372f7d82bfc4bc304c1ee0c8308e9c8ec2e1e6caeda505182ff
-DIST nrpe-2.5.1.tar.gz 100382 RMD160 757eb92cde878d8a0d3e483149d8969728ed7e03 SHA1 1beab9dc5fe77b722a12161b23b536ac5e28a6a4 SHA256 a23a0a37d81900d03884898bd0ae9b9da95348cc4a08695a4c229337c83fbe5e
+DIST nrpe-2.12.tar.gz 405725 RMD160 3413f84c9bb926a4dd55cc02d7b0a01bd7fc99ee SHA1 208595c175d726e8e377d565b21897f4de1648cc SHA256 7e8d093abef7d7ffc7219ad334823bdb612121df40de2dbaec9c6d0adeb04cfc
 EBUILD nagios-nrpe-2.10.ebuild 2464 RMD160 3c6052ce833c36f4a901e61d30eb42277a38a8f5 SHA1 dafdaffa3dc2224f50fa11afe96996add3d4be67 SHA256 36ba47e5362e1c7741057e53ac1bd4d290f13906faf5aecd0ba2854f686167b7
-EBUILD nagios-nrpe-2.5.1.ebuild 2348 RMD160 d4b0e7e78b66e38980f30837c67af35988a5737d SHA1 4f2a847f7f0224acb5e7103b26a82307dec56014 SHA256 14f0b6b457f2c5eb3479ba8520006dc46c1e3a67eb92b4b02cd9bb744423fca0
-MISC ChangeLog 6502 RMD160 a1823532f7c5d445ac7d2e66add9c858890da0a9 SHA1 6dfbd28ea79fda4c1cd16752fa964b474046da38 SHA256 58fb17567910e34a6d7460b2726ce88140390677374a8a5fa48e1f59ab0761b8
+EBUILD nagios-nrpe-2.12.ebuild 2470 RMD160 b7460171d12d8cf4611ba476218d3a9056e141d6 SHA1 e8c6d8848088fa37b29570795a982c0dfa6ece0c SHA256 2b397b7c7f65903d6a5d260f5beb0cb44622f8373a324ae2edfa930ff4ddddab
+MISC ChangeLog 6729 RMD160 155ccd8c27735e870a4008a437eb792eecf9a1b8 SHA1 cab8e4b0c96c1d4ab2f37562270626557123b826 SHA256 e8ebc7f4c2a0f89a6907f18dc2983616106625d1449168db32a7f1c422573f24
 MISC metadata.xml 422 RMD160 4411d72c4f4fcf99b8b8e749fccce1fc72315acc SHA1 a95181e936cdb1913067d09e85439ed0fb82d4ea SHA256 53db66821b73f032d46f1db7ca72a341982e02c424bb1eba37d3b7ed70b2bfb9

diff --git a/net-analyzer/nagios-nrpe/files/nrpe-2.5.1 b/net-analyzer/nagios-nrpe/files/nrpe-2.5.1
deleted file mode 100644 (file)
index 768d860..0000000
--- a/net-analyzer/nagios-nrpe/files/nrpe-2.5.1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-
-opts="${opts} reload"
-
-depend() {
-       need net
-}
-
-start() {
-       ebegin "Starting nrpe"
-       start-stop-daemon --start --quiet --name nrpe \
-       --startas /usr/nagios/bin/nrpe \
-               -c nagios:nagios \
-               -- -c /etc/nagios/nrpe.cfg \
-               --daemon
-       eend $? "Failed to Start nrpe"
-}
-
-stop() {
-       ebegin "Stopping nrpe"
-       start-stop-daemon --stop --quiet -n nrpe
-       eend $? "Failed to Stop nrpe"
-}
-
-reload() {
-       ebegin "Reloading nrpe"
-       kill -HUP `pgrep nrpe | head -1`
-       eend $? "Failed to reload nrpe"
-}
-
-restart() {
-       ebegin "Restarting nrpe"
-       svc_stop
-       svc_start
-       eend $? "Failed to Restart nrpe"
-}

diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.1.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12.ebuild
similarity index 74%
rename from net-analyzer/nagios-nrpe/nagios-nrpe-2.5.1.ebuild
rename to net-analyzer/nagios-nrpe/nagios-nrpe-2.12.ebuild
index c71dc1d389cf62affaf2bde92de59392c052aa1f..cf07cd82e9924918f090f80879eeeecdd7b62230 100644 (file)
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.1.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.1.ebuild,v 1.6 2007/07/02 14:38:33 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.12.ebuild,v 1.1 2008/03/14 07:27:04 dertobi123 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ RESTRICT="mirror"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="ssl command-args"
 DEPEND=">=net-analyzer/nagios-plugins-1.3.0
@@ -27,24 +27,22 @@ pkg_setup() {
 src_compile() {
        local myconf
 
-       myconf="${myconf} `use_enable ssl` \
-                                         `use_enable command-args`"
+       myconf="${myconf} $(use_enable ssl) \
+                                         $(use_enable command-args)"
 
        # Generate the dh.h header file for better security (2005 Mar 20 eldad)
        if useq ssl ; then
-               openssl dhparam -C 512 | sed -n '1,/BEGIN DH PARAMETERS/p' | grep -v "BEGIN DH PARAMETERS" > ${S}/src/dh.h
+               openssl dhparam -C 512 | sed -n '1,/BEGIN DH PARAMETERS/p' | grep -v "BEGIN DH PARAMETERS" > "${S}"/src/dh.h
        fi
 
-       ./configure ${myconf} \
+       econf ${myconf} \
                --host=${CHOST} \
                --prefix=/usr/nagios \
                --localstatedir=/var/nagios \
                --sysconfdir=/etc/nagios \
                --with-nrpe-user=nagios \
-               --with-nrpe-grp=nagios \
-               --infodir=/usr/share/info \
-               --mandir=/usr/share/man || die "./configure failed"
-       emake all || die
+               --with-nrpe-grp=nagios || die "econf failed"
+       emake all || die "make failed"
        # Add nifty nrpe check tool
        cd contrib
        $(tc-getCC) ${CFLAGS} -o nrpe_check_control     nrpe_check_control.c
@@ -67,8 +65,16 @@ src_install() {
        exeinto /usr/nagios/libexec
        doexe src/check_nrpe contrib/nrpe_check_control
 
-       newinitd "${FILESDIR}"/nrpe-${PV} nrpe
+       newinitd "${FILESDIR}"/nrpe nrpe
+
+       cat << EOF > "${T}"/55-nagios-nrpe-revdep
+SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec"
+EOF
+
+       insinto /etc/revdep-rebuild
+       doins "${T}"/55-nagios-nrpe-revdep
 }
+
 pkg_postinst() {
        einfo
        einfo "If you are using the nrpe daemon, remember to edit"
@@ -80,6 +86,6 @@ pkg_postinst() {
                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.gz for more info"
+               ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
        fi
 }