moved firebird.log to /var/log and fixed localhost check in /etc/hosts.equiv

3 files changed, 38 insertions, 19 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index e3fca71e9497..8add7c7d70b3 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.14 2004/04/03 22:54:57 mksoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.15 2004/04/25 09:01:37 mksoft Exp $
+
+  25 Apr 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
+  move and symlink firebird.log to /var/log
+  
+  change the check the for localhost in /etc/hosts.equiv to make sure it
+  won't catch localhost.localdomain as well
+
+  unmask for x86
 
   04 Apr 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
   Modified classic local USE flag, changed to inetd
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index b29542ed3dc0..eb07259c1dcb 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,16 +1,16 @@
-MD5 a71afe7683db444d9647fc136eaeb1c1 files/70firebird 77
-MD5 00a05e4f04f632436d491144b0bd8853 files/digest-firebird-1.0-r1 150
-MD5 10d808d19eb3949349b591c3d525b74a files/digest-firebird-1.0.3 150
-MD5 d76a09a887248deb2d4d466f06515730 files/firebird-1.0-gentoo.patch 2549
+MD5 28ef07873f8002f016febf647e54328b firebird-1.5.0.ebuild 6072
+MD5 2a414f60bbeb886ed74788d465c3e7e5 firebird-1.0-r1.ebuild 1384
+MD5 68013ff47356b9abbd74450d0fb0ea83 ChangeLog 2597
+MD5 b6d46d544ce131eb681e0d7e68a465cc metadata.xml 623
+MD5 448427a1721b322e21af6781e8d0ec1e firebird-1.0.3.ebuild 2607
 MD5 d795330e017a7f1afb99a0bbf69eaeb3 files/firebird-1.0.3-gentoo.patch 1661
-MD5 b0d6de21d0e14d41983d440d5675e9d5 files/firebird.xinetd 206
-MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird-1.5.0 50
-MD5 977b78810d680e76baafbefde76323cf files/digest-firebird-1.5.0 73
-MD5 5b28cc81eff2c59fbee652dc2c6ed483 files/firebird-1.5.0.xinetd 425
 MD5 c5f5e6bae2cae891269931331e69f1ca files/firebird.conf.d 80
 MD5 7c7095ed6c31ad96a8994cc3091d92f8 files/firebird.init.d 704
-MD5 2963fbe93247118e0b076be86fc605c2 ChangeLog 2356
-MD5 2a414f60bbeb886ed74788d465c3e7e5 firebird-1.0-r1.ebuild 1384
-MD5 448427a1721b322e21af6781e8d0ec1e firebird-1.0.3.ebuild 2607
-MD5 b6d46d544ce131eb681e0d7e68a465cc metadata.xml 623
-MD5 25eed95bd409788f08c37879d3a49367 firebird-1.5.0.ebuild 5852
+MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird-1.5.0 50
+MD5 b0d6de21d0e14d41983d440d5675e9d5 files/firebird.xinetd 206
+MD5 d76a09a887248deb2d4d466f06515730 files/firebird-1.0-gentoo.patch 2549
+MD5 5b28cc81eff2c59fbee652dc2c6ed483 files/firebird-1.5.0.xinetd 425
+MD5 00a05e4f04f632436d491144b0bd8853 files/digest-firebird-1.0-r1 150
+MD5 a71afe7683db444d9647fc136eaeb1c1 files/70firebird 77
+MD5 10d808d19eb3949349b591c3d525b74a files/digest-firebird-1.0.3 150
+MD5 977b78810d680e76baafbefde76323cf files/digest-firebird-1.5.0 73
diff --git a/dev-db/firebird/firebird-1.5.0.ebuild b/dev-db/firebird/firebird-1.5.0.ebuild
index 324d34757187..eb45a51a1f4b 100644
--- a/dev-db/firebird/firebird-1.5.0.ebuild
+++ b/dev-db/firebird/firebird-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.0.ebuild,v 1.4 2004/04/08 23:07:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.0.ebuild,v 1.5 2004/04/25 09:01:37 mksoft Exp $
 
 inherit flag-o-matic eutils
 
@@ -135,9 +135,20 @@ pkg_config() {
 	done
 
 	# Create log
-	touch firebird.log
-	chown firebird:firebird firebird.log
-	chmod ug=rw,o= firebird.log
+	if [ ! -h firebird.log ]
+	then
+		if [ -f firebird.log ]
+		then
+			mv firebird.log /var/log
+		else
+			touch /var/log/firebird.log
+			chown firebird:firebird /var/log/firebird.log
+			chmod ug=rw,o= /var/log/firebird.log
+		fi
+
+		# symlink the log to /var/log
+		ln -s /var/log/firebird.log firebird.log
+	fi
 
 	# add gds_db to /etc/services
 	if [ -z "`grep gds_db  /etc/services`" ]
@@ -180,7 +191,7 @@ pkg_config() {
 		chmod u=rw,go=r /etc/hosts.equiv
 	fi
 
-	if [ -z "`grep localhost /etc/hosts.equiv`" ]
+	if [ -z "`grep 'localhost$' /etc/hosts.equiv`" ]
 	then
 		echo "localhost" >> /etc/hosts.equiv
 		einfo "Added localhost to /etc/hosts.equiv"