Fix bug #140385.

(Portage version: 2.1.1_pre2-r6)

3 files changed, 19 insertions, 15 deletions

diff --git a/app-forensics/samhain/ChangeLog b/app-forensics/samhain/ChangeLog
index 6396097271d4..904356af5be8 100644
--- a/app-forensics/samhain/ChangeLog
+++ b/app-forensics/samhain/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-forensics/samhain
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/samhain/ChangeLog,v 1.3 2006/05/24 13:10:34 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/samhain/ChangeLog,v 1.4 2006/07/14 17:17:58 chtekk Exp $
+
+  14 Jul 2006; Luca Longinotti <chtekk@gentoo.org> samhain-2.1.3.ebuild,
+  samhain-2.2.0.ebuild:
+  Fix bug #140385.
 
 *samhain-2.2.0 (24 May 2006)
 *samhain-2.1.3 (24 May 2006)
diff --git a/app-forensics/samhain/samhain-2.1.3.ebuild b/app-forensics/samhain/samhain-2.1.3.ebuild
index df40dd1590b3..e779d05913f6 100644
--- a/app-forensics/samhain/samhain-2.1.3.ebuild
+++ b/app-forensics/samhain/samhain-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/samhain/samhain-2.1.3.ebuild,v 1.1 2006/05/24 13:10:34 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/samhain/samhain-2.1.3.ebuild,v 1.2 2006/07/14 17:17:58 chtekk Exp $
 
 KEYWORDS="~x86"
 DESCRIPTION="Advanced file integrity and intrusion detection tool."
@@ -164,7 +164,7 @@ pkg_postinst() {
 		echo
 		einfo "Manual pages, documentation, and init script were NOT installed in order to"
 		einfo "obscure Samhain's presence. You should also remove samhain's installation"
-		einfo "traces from /var/cache/edb/world and /var/db/pkg."
+		einfo "traces from ${ROOT}/var/cache/edb/world and ${ROOT}/var/db/pkg."
 	fi
 
 	if [[ "${STEALTH}" == "full" ]] ; then
@@ -186,15 +186,15 @@ pkg_postinst() {
 		einfo "Enabling GnuPG support in Samhain requires that you sign your configuration"
 		einfo "and and database files. Please run the following commands as root:"
 		einfo
-		einfo "    gpg -a --clearsign --not-dash-escaped /etc/samhainrc"
-		einfo "    mv /etc/samhainrc.asc /etc/samhainrc"
-		einfo "    chmod 600 /etc/samhainrc"
+		einfo "    gpg -a --clearsign --not-dash-escaped ${ROOT}/etc/samhainrc"
+		einfo "    mv ${ROOT}/etc/samhainrc.asc ${ROOT}/etc/samhainrc"
+		einfo "    chmod 600 ${ROOT}/etc/samhainrc"
 		einfo
-		einfo "Run the same commands on /var/lib/samhain/samhain_file after initialization."
+		einfo "Run the same commands on ${ROOT}/var/lib/samhain/samhain_file after initialization."
 	fi
 
 	echo
-	einfo "Be sure to check your settings in /etc/samhainrc. When ready, run:"
+	einfo "Be sure to check your settings in ${ROOT}/etc/samhainrc. When ready, run:"
 	einfo "    samhain -t init"
 	einfo "to initialize Samhain."
 
diff --git a/app-forensics/samhain/samhain-2.2.0.ebuild b/app-forensics/samhain/samhain-2.2.0.ebuild
index a0911a6cccd6..e11f3d44b649 100644
--- a/app-forensics/samhain/samhain-2.2.0.ebuild
+++ b/app-forensics/samhain/samhain-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/samhain/samhain-2.2.0.ebuild,v 1.1 2006/05/24 13:10:34 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/samhain/samhain-2.2.0.ebuild,v 1.2 2006/07/14 17:17:58 chtekk Exp $
 
 KEYWORDS="~x86"
 DESCRIPTION="Advanced file integrity and intrusion detection tool."
@@ -164,7 +164,7 @@ pkg_postinst() {
 		echo
 		einfo "Manual pages, documentation, and init script were NOT installed in order to"
 		einfo "obscure Samhain's presence. You should also remove samhain's installation"
-		einfo "traces from /var/cache/edb/world and /var/db/pkg."
+		einfo "traces from ${ROOT}/var/cache/edb/world and ${ROOT}/var/db/pkg."
 	fi
 
 	if [[ "${STEALTH}" == "full" ]] ; then
@@ -186,15 +186,15 @@ pkg_postinst() {
 		einfo "Enabling GnuPG support in Samhain requires that you sign your configuration"
 		einfo "and and database files. Please run the following commands as root:"
 		einfo
-		einfo "    gpg -a --clearsign --not-dash-escaped /etc/samhainrc"
-		einfo "    mv /etc/samhainrc.asc /etc/samhainrc"
-		einfo "    chmod 600 /etc/samhainrc"
+		einfo "    gpg -a --clearsign --not-dash-escaped ${ROOT}/etc/samhainrc"
+		einfo "    mv ${ROOT}/etc/samhainrc.asc ${ROOT}/etc/samhainrc"
+		einfo "    chmod 600 ${ROOT}/etc/samhainrc"
 		einfo
-		einfo "Run the same commands on /var/lib/samhain/samhain_file after initialization."
+		einfo "Run the same commands on ${ROOT}/var/lib/samhain/samhain_file after initialization."
 	fi
 
 	echo
-	einfo "Be sure to check your settings in /etc/samhainrc. When ready, run:"
+	einfo "Be sure to check your settings in ${ROOT}/etc/samhainrc. When ready, run:"
 	einfo "    samhain -t init"
 	einfo "to initialize Samhain."