Chown before user:group creation problem fixed

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index bb66653d2b9761c54c488a7a12abfaf6f60a6b5c..401c96968df54b2c3f267b9d2371f0d6fc91352d 100644 (file)
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.54 2005/09/28 18:22:32 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.55 2005/10/01 18:14:11 soulse Exp $
+
+  01 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r2.ebuild,
+  nagios-core-1.2-r3.ebuild, nagios-core-1.2-r4.ebuild:
+  Chown before user:group creation problem fixed
 
 *nagios-core-2.0b_p4 (28 Sep 2005)
 

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 9d80d95cdf6d801bd46c5f1bee4e1c7add06a5d4..fa1b855984862083a53ad4ff7b0ff0e068fc79ad 100644 (file)
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,22 +1,22 @@
-MD5 52cf94ac684fbce165720d5dca1cadfe ChangeLog 9698
+MD5 7be1dd3e56bc118ada839b495a2c7751 ChangeLog 9864
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
-MD5 8b8118567805f4ea62359eb7dbf2019e nagios-core-1.2-r2.ebuild 6616
-MD5 33cb82c11240d04aee53074e0b43e681 nagios-core-1.2-r4.ebuild 7082
-MD5 245ae631470f09b98d5eb40a35a59d8e nagios-core-1.2-r3.ebuild 7161
+MD5 c60f2af0333c20fd8f6ea749ab7baf50 nagios-core-1.2-r2.ebuild 6609
+MD5 603ac10868c51582eb5672cca59d2f4a nagios-core-1.2-r3.ebuild 7157
+MD5 054d681909883c2f856c6abadc183356 nagios-core-1.2-r4.ebuild 7114
 MD5 ce3be07134c88a9567e69cfbe28fe86a nagios-core-2.0b_p1.ebuild 5825
 MD5 be04314bc38c3f1ad8b15ac0b7399264 nagios-core-2.0b_p2.ebuild 5856
 MD5 9c1d799b7e7b5bc5c2267241c2b44755 nagios-core-2.0b_p4.ebuild 5858
+MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
-MD5 d062be8c632fbfa88dd1194e0bea2abf files/nagios 1389
-MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
-MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
-MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
-MD5 19566d92e4989244216c7fb6d19d688c files/digest-nagios-core-2.0b_p2 65
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r2 63
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r3 63
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
+MD5 aa5bb53aee1f5609395e8184f2eff4a6 files/digest-nagios-core-2.0b_p1 65
+MD5 19566d92e4989244216c7fb6d19d688c files/digest-nagios-core-2.0b_p2 65
+MD5 d062be8c632fbfa88dd1194e0bea2abf files/nagios 1389
 MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
+MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
-MD5 aa5bb53aee1f5609395e8184f2eff4a6 files/digest-nagios-core-2.0b_p1 65
 MD5 7a96e80dbe17f26441d3266662b58a51 files/digest-nagios-core-2.0b_p4 65

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
index fd51cf0a7f258558be48cc8c6a904ca6dc22c43f..7861328b5d94586832c4100b143dde4105aa9ba2 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r2.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-core/nagios-core-1.2-r2.ebuild,v 1.13 2005/07/09 18:38:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild,v 1.14 2005/10/01 18:14:11 soulse Exp $
 
 inherit eutils
 
@@ -159,7 +159,7 @@ src_install() {
 
        if use !noweb; then
                if use apache2; then
-                       insinto /etc/apache2/conf/modules.d
+                       insinto /etc/apache2/modules.d
                        doins ${FILESDIR}/99_nagios.conf
                else
                        insinto /etc/apache/conf/addon-modules

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
index 54418ee8bca7b2da6ffc56f102260c49e6d36228..b11db1d863feb8c4ca93844c2f0b610f5d380fd0 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r3.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-core/nagios-core-1.2-r3.ebuild,v 1.10 2005/09/26 15:30:08 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild,v 1.11 2005/10/01 18:14:11 soulse Exp $
 
 inherit eutils
 
@@ -167,7 +167,7 @@ src_install() {
        #Apache Module
        if use !noweb; then
                if use apache2; then
-                       insinto /etc/apache2/conf/modules.d
+                       insinto /etc/apache2/modules.d
                        doins ${FILESDIR}/99_nagios.conf
                else
                        insinto /etc/apache/conf/addon-modules

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
index 85a8148ad74adbe42c9eaba66a3812e6d4eb3f80..944848f343690d63c258dc05445cc31e7be4dc42 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r4.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-core/nagios-core-1.2-r4.ebuild,v 1.5 2005/09/26 15:30:08 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.6 2005/10/01 18:14:11 soulse Exp $
 
 inherit eutils depend.apache toolchain-funcs
 
@@ -39,6 +39,15 @@ pkg_setup() {
                        die "pkg_setup failed"
                fi
        fi
+
+       enewgroup nagios
+
+       if use noweb; then
+               enewuser nagios -1 /bin/bash /dev/null nagios
+       else
+               enewuser nagios -1 /bin/bash /dev/null apache
+               usermod -G apache nagios
+       fi
 }
 
 src_unpack() {
@@ -183,14 +192,9 @@ pkg_preinst() {
        keepdir /usr/nagios/share/ssi
        keepdir /var/nagios/rw
 
-       enewgroup nagios
-
        if use noweb; then
-               enewuser nagios -1 /bin/bash /dev/null nagios
                chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
        else
-               enewuser nagios -1 /bin/bash /dev/null apache
-               usermod -G apache nagios
                chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
        fi