From: Wolfram Schlich <wschlich@gentoo.org>
Date: Sun, 11 Feb 2007 23:31:47 +0000 (+0000)
Subject: permission/ownership fixup
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c99b621f32208151c085a57232b298cc9527d9d;p=gentoo.git

permission/ownership fixup
Package-Manager: portage-2.1.2
---

diff --git a/net-analyzer/zabbix-server/ChangeLog b/net-analyzer/zabbix-server/ChangeLog
index ef210b839f5a..c4d4b6f43eff 100644
--- a/net-analyzer/zabbix-server/ChangeLog
+++ b/net-analyzer/zabbix-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.9 2007/02/11 22:29:06 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.10 2007/02/11 23:31:47 wschlich Exp $
+
+  11 Feb 2007; Wolfram Schlich <wschlich@gentoo.org>
+  zabbix-server-1.1.6.ebuild:
+  permission/ownership fixup
 
 *zabbix-server-1.1.6 (11 Feb 2007)
 
diff --git a/net-analyzer/zabbix-server/Manifest b/net-analyzer/zabbix-server/Manifest
index 8f05288ecea5..59244f941526 100644
--- a/net-analyzer/zabbix-server/Manifest
+++ b/net-analyzer/zabbix-server/Manifest
@@ -70,10 +70,10 @@ EBUILD zabbix-server-1.0.ebuild 3101 RMD160 bf1495f65400a85fdeab52e557655459dd35
 MD5 553fde062c1a3d773d62f16adb812cb2 zabbix-server-1.0.ebuild 3101
 RMD160 bf1495f65400a85fdeab52e557655459dd35903e zabbix-server-1.0.ebuild 3101
 SHA256 658f8c88a5b1876fe6eda135fc68670614dfd610692f09fb36d535524d8831c5 zabbix-server-1.0.ebuild 3101
-EBUILD zabbix-server-1.1.6.ebuild 4077 RMD160 b73a95a33ff1397cb40f4b61d2e9fa2f5f0bb303 SHA1 cfe464c5e7a33bb1e92b962abf94e5359c8360c4 SHA256 1740b5d9267d393d36e2624f7a80230de0281918cbfe3c6ab49b2325e1b57ce5
-MD5 2fdb362b1dda76d294ec7f44271df09c zabbix-server-1.1.6.ebuild 4077
-RMD160 b73a95a33ff1397cb40f4b61d2e9fa2f5f0bb303 zabbix-server-1.1.6.ebuild 4077
-SHA256 1740b5d9267d393d36e2624f7a80230de0281918cbfe3c6ab49b2325e1b57ce5 zabbix-server-1.1.6.ebuild 4077
+EBUILD zabbix-server-1.1.6.ebuild 4559 RMD160 14037701f7bbcccb5727291514771b6803393593 SHA1 83077734cb548414d2cd45386c6336c9df82bfc2 SHA256 f83629803c2a8001a332cfb4cbcdfaf15d0e4feb1cbe83b814510837e8c18f33
+MD5 7ac9430dd81b1146c8c1055d288b429a zabbix-server-1.1.6.ebuild 4559
+RMD160 14037701f7bbcccb5727291514771b6803393593 zabbix-server-1.1.6.ebuild 4559
+SHA256 f83629803c2a8001a332cfb4cbcdfaf15d0e4feb1cbe83b814510837e8c18f33 zabbix-server-1.1.6.ebuild 4559
 EBUILD zabbix-server-1.1.ebuild 4499 RMD160 31839444d5d6786bf0fa0752cf81d03de091a05e SHA1 b8311cfe429043879439bf34d46775f8c6981bb9 SHA256 cbd584bec998673259a49e69949bf7dd4f9c11f1951a066a7218192255af27e0
 MD5 9d40eb55431a65d836c3db2aea3e2618 zabbix-server-1.1.ebuild 4499
 RMD160 31839444d5d6786bf0fa0752cf81d03de091a05e zabbix-server-1.1.ebuild 4499
@@ -82,10 +82,10 @@ EBUILD zabbix-server-1.1_alpha7.ebuild 2922 RMD160 743cccb3d05540c6d2d7620b7fbde
 MD5 bf4b03ca87fddbd33e7d244948040483 zabbix-server-1.1_alpha7.ebuild 2922
 RMD160 743cccb3d05540c6d2d7620b7fbde6aaf37678cc zabbix-server-1.1_alpha7.ebuild 2922
 SHA256 6557acf7a2d9c46279568fb300b6007b3380bcfafca88cf857a1b797755148f2 zabbix-server-1.1_alpha7.ebuild 2922
-MISC ChangeLog 3679 RMD160 803d55b63c1b409762ee26ca196f10b89195b80e SHA1 2b034e294b744e548eef08b9e86aba795967eecf SHA256 9d25be43c4c83d3439548acf12f91af2beafe6193b2abde8f6ad1c4aead1618b
-MD5 165073678791b75bee7bdbd3537e5733 ChangeLog 3679
-RMD160 803d55b63c1b409762ee26ca196f10b89195b80e ChangeLog 3679
-SHA256 9d25be43c4c83d3439548acf12f91af2beafe6193b2abde8f6ad1c4aead1618b ChangeLog 3679
+MISC ChangeLog 3793 RMD160 b4ef7382052d8ffbd91e7ee5a99a9b384de2466f SHA1 e335bf83c3f0c2c63e9355f770122ea47eddaaf3 SHA256 ee0bfbe22c010fbb28f76db51a9b32bcf7d2b9f7b47eb8437c1af9191c42ac3e
+MD5 fceb8f908c3ee90dcff5e8a5afd92e6c ChangeLog 3793
+RMD160 b4ef7382052d8ffbd91e7ee5a99a9b384de2466f ChangeLog 3793
+SHA256 ee0bfbe22c010fbb28f76db51a9b32bcf7d2b9f7b47eb8437c1af9191c42ac3e ChangeLog 3793
 MISC metadata.xml 630 RMD160 0ceb5472b6bc0efd1fa4a09f52d3ef953b0cb13c SHA1 88bffe8fc9f05440edecef1fdc65f4c6dbb6f735 SHA256 770d0897320974215ae8d520cc2f56761e9b53dfa85e9e3081bff1427d8aa03c
 MD5 d86acab58212886771ef2bf837a2e8b9 metadata.xml 630
 RMD160 0ceb5472b6bc0efd1fa4a09f52d3ef953b0cb13c metadata.xml 630
diff --git a/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild b/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild
index b894e0a86ddd..26c7df81631e 100644
--- a/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild
+++ b/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild,v 1.1 2007/02/11 22:29:06 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild,v 1.2 2007/02/11 23:31:47 wschlich Exp $
 
 inherit eutils
 
@@ -23,6 +23,9 @@ RDEPEND="${RDEPEND} net-analyzer/fping"
 S=${WORKDIR}/${MY_P}-${MY_PV}
 
 pkg_setup() {
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
 	if useq oracle; then
 		if [ -z "${ORACLE_HOME}" ]; then
 			eerror
@@ -41,11 +44,6 @@ pkg_setup() {
 	fi
 }
 
-pkg_preinst() {
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
 pkg_postinst() {
 	einfo
 	einfo "You need to configure your database for Zabbix."
@@ -73,6 +71,27 @@ pkg_postinst() {
 		ewarn "  usermod -d /var/lib/zabbix/home zabbix"
 		ewarn
 	fi
+
+	# repeat fowners/fperms functionality from src_install()
+	# here to catch wrong permissions on existing files in
+	# the live filesystem (yeah, that sucks).
+	chown zabbix:zabbix \
+		/etc/zabbix \
+		/etc/zabbix/zabbix_server.conf \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/zabbix \
+		/var/run/zabbix
+	chmod 0640 \
+		/etc/zabbix/zabbix_server.conf
+	chmod 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/zabbix \
+		/var/run/zabbix
 }
 
 src_unpack() {
@@ -134,7 +153,6 @@ src_install() {
 	fowners zabbix:zabbix \
 		/etc/zabbix \
 		/etc/zabbix/zabbix_server.conf \
-		/usr/share/zabbix/database \
 		/var/lib/zabbix \
 		/var/lib/zabbix/home \
 		/var/lib/zabbix/scripts \