Fixed dir permissions. Purged old version 1.3.1

(Portage version: 2.0.51.19)

6 files changed, 13 insertions, 69 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 67c1a74be2b9..5400760078d9 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.34 2005/03/17 12:13:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.35 2005/05/04 11:55:57 eldad Exp $
+
+  04 May 2005; Eldad Zack <eldad@gentoo.org> nagios-plugins-1.3.1-r1.ebuild,
+  nagios-plugins-1.4.ebuild:
+  Fixed dir permissions.
 
   17 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> nagios-plugins-1.4.ebuild:
   Fix sed in src_install for bug 85607.
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index bc94ff72af92..fc13fe37d3f7 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 49bd11a28ab835381df59eac526016c1 nagios-plugins-1.4.ebuild 3199
+MD5 33468285d35c99c200c7720d01e75e60 nagios-plugins-1.4.ebuild 3313
 MD5 3d4ab29e2f2b2c45d731ace02bd24baa nagios-plugins-1.3.1-r1.ebuild 2865
 MD5 28e87bdecda2a6c56ad1fc2dc3f339db nagios-plugins-1.3.1.ebuild 1708
 MD5 29e281a7601dc12e837c5f0dca674d60 ChangeLog 5540
@@ -12,10 +9,3 @@ MD5 639ea6f5791cdf3ad540489c66d1f356 files/digest-nagios-plugins-1.4 70
 MD5 acb0b2b914b27b67b9a33807b1e6838e files/install-opts-fix.diff 3168
 MD5 ee71da291efd7427bd9786591a98df34 files/nagios-plugins-noradius.patch 2661
 MD5 39af7074b023625d9a75730bd6932437 files/digest-nagios-plugins-1.3.1-r1 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCOXRpEZCkKN40op4RAn54AJsH7ai5YrVLNugVRplCEqAvVfQ8owCgmgcp
-unxxFbe9igq9U2AENb1WVA4=
-=t5f1
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.3.1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.3.1
deleted file mode 100644
index 52ae36d236e9..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0078c9c8137694181a4cdf596fdbd74f nagios-plugins-1.3.1.tar.gz 532516
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
index 6fbb18beefa1..7405d782541a 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.3.1-r1.ebuild,v 1.16 2004/12/11 16:37:06 config Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild,v 1.17 2005/05/04 11:55:57 eldad Exp $
 
 inherit eutils
 
@@ -73,6 +73,8 @@ src_install() {
 	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
 
 	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}/usr/nagios/libexec"
+
+	find ${D}/usr/nagios/libexec -type d | xargs chmod 0755 || die "Failed Chmod of ${D}/usr/nagios/libexec (dirs)"
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild
deleted file mode 100644
index 343c77787062..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 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.3.1.ebuild,v 1.8 2004/10/24 13:19:13 mholzer Exp $
-
-inherit eutils
-
-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="x86 ~sparc ~ppc ~amd64"
-IUSE="ssl samba mysql postgres ldap"
-#RDEPEND=">=net-analyzer/nagios-core-1.0"
-DEPEND=">=net-dns/bind-tools-9.2.2_rc1
-		ssl? ( >=dev-libs/openssl-0.9.6g )
-		>=dev-lang/perl-5.6.1-r7
-		>=net-analyzer/fping-2.4_beta2-r1
-		>=net-misc/ntp-4.1.1a
-		>=dev-perl/Net-SNMP-4.0.1-r1
-		>=net-analyzer/net-snmp-5.0.6
-		samba? ( >=net-fs/samba-2.2.5-r1 )
-		>=net-misc/openssh-3.5_p1
-		mysql? ( >=dev-db/mysql-3.23.52-r1 )
-		postgres? ( >=dev-db/postgresql-7.2 )
-		ldap? ( >=net-nds/openldap-2.0.25 )"
-
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}/usr/nagios/libexec"
-}
-
-src_compile() {
-	local myconf
-	use mysql && myconf="${myconf} --with-mysql"
-	use postgres && myconf="${myconf} --with-pgsql"
-	use ssl && myconf="${myconf} --with-openssl"
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--with-nagios-user=nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make || die
-}
-
-src_install() {
-	dodoc AUTHORS CODING COPYING ChangeLog FAQ INSTALL LEGALNEWS README REQUIREMENTS ROADMAP Requirements
-	make DESTDIR=${D} install || die
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild
index f9e10ca13919..73651c5b0ce6 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.4 2005/03/17 12:13:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild,v 1.5 2005/05/04 11:55:58 eldad Exp $
 
 inherit eutils
 
@@ -90,6 +90,8 @@ src_install() {
 	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
 
 	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}/usr/nagios/libexec"
+
+	find ${D}/usr/nagios/libexec -type d | xargs chmod 0755 || die "Failed Chmod of ${D}/usr/nagios/libexec (dirs)"
 }
 
 pkg_postinst() {