Fix bug #140385.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 34 insertions, 30 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/Manifest b/app-forensics/samhain/Manifest
index 41d76ca6d09f..6bcc6dfa86f3 100644
--- a/app-forensics/samhain/Manifest
+++ b/app-forensics/samhain/Manifest
@@ -1,18 +1,18 @@
-DIST samhain_signed-2.1.3.tar.gz 1326778 RMD160 26d3b2519d33a814d122e214a1b35a2f82534112 SHA256 351efd78f0f07a9d3eb128c7f1bb8959e32c0a783632890ab850365e9dfd1a5f size 1326778
-DIST samhain_signed-2.2.0.tar.gz 1520179 RMD160 c61e9b1bd71ff3e2a8592badef788a4aba26f22b SHA256 6b02ccae95a46c831569026d43da517440213f6d407cd1bd19a287114167554a size 1520179
-EBUILD samhain-2.1.3.ebuild 7178 RMD160 2910eb1c353c7564affa630b59a8a92d8eda4d0c SHA1 12a7a1391c65370586f35f709acdb2c540af7f20 SHA256 06364264b4eac93e8ea75cda93b42e867318ee2d5a0be4999e9f2ef31280d6ea size 7178
-MD5 d6a5aca8b552bd7f02050d2bc120a7b0 samhain-2.1.3.ebuild 7178
-RMD160 2910eb1c353c7564affa630b59a8a92d8eda4d0c samhain-2.1.3.ebuild 7178
-SHA256 06364264b4eac93e8ea75cda93b42e867318ee2d5a0be4999e9f2ef31280d6ea samhain-2.1.3.ebuild 7178
-EBUILD samhain-2.2.0.ebuild 7178 RMD160 feaabc5543d8098374fb35808fcd963ad12d5565 SHA1 3e396e6a5fbd0ea366f78c99cd43d94894547489 SHA256 496d36d60a2cdb84a7fd203d80557172b78e1e893e440d53e227689e5dd1d91e size 7178
-MD5 79f80a203494da2a5b90573cb9b62e84 samhain-2.2.0.ebuild 7178
-RMD160 feaabc5543d8098374fb35808fcd963ad12d5565 samhain-2.2.0.ebuild 7178
-SHA256 496d36d60a2cdb84a7fd203d80557172b78e1e893e440d53e227689e5dd1d91e samhain-2.2.0.ebuild 7178
-MISC ChangeLog 886 RMD160 9759062ff7f5cf1b5df378ed82153ebe809e843e SHA1 d6bbd6232c4a8b62dde2d1b0d39a6173fcdbf8a4 SHA256 7fcdbe5a8c5cd3e399aa2fc88aaa6dd82f69c6176b20c110b2466773ddc7b846 size 886
-MD5 af8678cba884d39df6b7526138164977 ChangeLog 886
-RMD160 9759062ff7f5cf1b5df378ed82153ebe809e843e ChangeLog 886
-SHA256 7fcdbe5a8c5cd3e399aa2fc88aaa6dd82f69c6176b20c110b2466773ddc7b846 ChangeLog 886
-MISC metadata.xml 230 RMD160 fd2ff2b82d75b757b306ba2de0f742b6cd1f966e SHA1 b4e616879ea88965ecb0709eaa12d7fe1d5dbe1d SHA256 903c9de2c99aeba3f9543766df6ea311ad16e4e44c2e9f66519880eccb76050e size 230
+DIST samhain_signed-2.1.3.tar.gz 1326778 RMD160 26d3b2519d33a814d122e214a1b35a2f82534112 SHA1 73596c07764b7926e7e623b8d9922472daf19ec8 SHA256 351efd78f0f07a9d3eb128c7f1bb8959e32c0a783632890ab850365e9dfd1a5f
+DIST samhain_signed-2.2.0.tar.gz 1520179 RMD160 c61e9b1bd71ff3e2a8592badef788a4aba26f22b SHA1 8c245dfa95eeeecbdf1b443265f77e19052b95bf SHA256 6b02ccae95a46c831569026d43da517440213f6d407cd1bd19a287114167554a
+EBUILD samhain-2.1.3.ebuild 7234 RMD160 ac8cecad89520a97771b957b0b0c4d28ec17cbc6 SHA1 80c4ca672352facc493c63f44dcc58af9bdd96a0 SHA256 0375d34be39355900325aa2c56fc65e5cb791f91c135d68a3cd625d7e74ecb3b
+MD5 804603c4e48a59a8c83bb18b463b6ed3 samhain-2.1.3.ebuild 7234
+RMD160 ac8cecad89520a97771b957b0b0c4d28ec17cbc6 samhain-2.1.3.ebuild 7234
+SHA256 0375d34be39355900325aa2c56fc65e5cb791f91c135d68a3cd625d7e74ecb3b samhain-2.1.3.ebuild 7234
+EBUILD samhain-2.2.0.ebuild 7234 RMD160 a3b4195f275ccf928405c6acb77cec61ec537b94 SHA1 7b1cffce4758941ba1b6aafd45e63b52a6647bf2 SHA256 189ef6f23c0372c671d093b67127393beffeafbe075b06d37f372b54a7341bb3
+MD5 0fed80f4ca57a23b9d065097dc6dd22a samhain-2.2.0.ebuild 7234
+RMD160 a3b4195f275ccf928405c6acb77cec61ec537b94 samhain-2.2.0.ebuild 7234
+SHA256 189ef6f23c0372c671d093b67127393beffeafbe075b06d37f372b54a7341bb3 samhain-2.2.0.ebuild 7234
+MISC ChangeLog 1003 RMD160 d7aa654c27ad74c234359f12c00316082d687e1c SHA1 16bf2ab15fe0c20dfb2669ab98127ee23f49db8b SHA256 c52191b72324d8b9f8635c9dec6d822401c19a21d4b36a46ba6c0d5eec67a269
+MD5 2bad234a398dcd4a5500b666b41a0a03 ChangeLog 1003
+RMD160 d7aa654c27ad74c234359f12c00316082d687e1c ChangeLog 1003
+SHA256 c52191b72324d8b9f8635c9dec6d822401c19a21d4b36a46ba6c0d5eec67a269 ChangeLog 1003
+MISC metadata.xml 230 RMD160 fd2ff2b82d75b757b306ba2de0f742b6cd1f966e SHA1 b4e616879ea88965ecb0709eaa12d7fe1d5dbe1d SHA256 903c9de2c99aeba3f9543766df6ea311ad16e4e44c2e9f66519880eccb76050e
 MD5 b1bcc1a84490adeeaff207fb5578fa44 metadata.xml 230
 RMD160 fd2ff2b82d75b757b306ba2de0f742b6cd1f966e metadata.xml 230
 SHA256 903c9de2c99aeba3f9543766df6ea311ad16e4e44c2e9f66519880eccb76050e metadata.xml 230
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."