More flexable patch and a few more checks

5 files changed, 326 insertions, 5 deletions

diff --git a/app-forensics/air/ChangeLog b/app-forensics/air/ChangeLog
index c013be752ad7..ea69c296645e 100644
--- a/app-forensics/air/ChangeLog
+++ b/app-forensics/air/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/air
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/ChangeLog,v 1.4 2004/09/12 10:49:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/ChangeLog,v 1.5 2004/09/13 10:25:31 dragonheart Exp $
+
+*air-1.2.5-r1 (13 Sep 2004)
+
+  13 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/air-1.2.5-r1-installfix.patch, +air-1.2.5-r1.ebuild:
+  More flexable patch and a few more checks
 
   12 Sep 2004; Daniel Black <dragonheart@gentoo.org> air-1.2.5.ebuild:
   changed to remove /usr/bin/split which is installed by coreutils
diff --git a/app-forensics/air/Manifest b/app-forensics/air/Manifest
index ced9635a6204..28b4f43d4ae5 100644
--- a/app-forensics/air/Manifest
+++ b/app-forensics/air/Manifest
@@ -3,16 +3,19 @@ Hash: SHA1
 
 MD5 abf4dac9e97fdbe7b1aecd7e907010c0 air-1.2.3_beta3.ebuild 1394
 MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
-MD5 fdfd804dc73a4d0c6312b7de43a588fd ChangeLog 1639
+MD5 fce12227088d34f3ef4c6e65567374ee ChangeLog 1828
 MD5 ae48e97cccc4c40c705f83dcc9231bde air-1.2.5.ebuild 1382
+MD5 40dcd455f17a07019658647711ff6b92 air-1.2.5-r1.ebuild 1450
 MD5 5e2c9543b3ba5b7ad85af0c87c767029 files/digest-air-1.2.3_beta3 66
 MD5 ef2381a8147873ad21c5d638d5cde8d1 files/air-1.2.3_beta3-installfix.patch 5335
 MD5 119062acfec408661f896f96cd7c325c files/digest-air-1.2.5 60
 MD5 b79d011ebc05acba20817235893211cd files/air-1.2.5-installfix.patch 6415
+MD5 0be60368933ff4d3d47c6e37aa446b6e files/air-1.2.5-r1-installfix.patch 9111
+MD5 119062acfec408661f896f96cd7c325c files/digest-air-1.2.5-r1 60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBRCoTmdTrptrqvGERAt//AJsE8Wi8EahLjVjZdIgL6yVoramDtACfQmj+
-noV0nozy6zl1c71lrCv1Xrc=
-=HCA8
+iD8DBQFBRXXCmdTrptrqvGERAtAeAJ4tTEATxxw6p5Y4yzOJ+cYJN6lAKACfdBpc
+DM8ClvBK3gWjEe0c80zAMD8=
+=CSCm
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/air/air-1.2.5-r1.ebuild b/app-forensics/air/air-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..4499d80d5814
--- /dev/null
+++ b/app-forensics/air/air-1.2.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/air-1.2.5-r1.ebuild,v 1.1 2004/09/13 10:25:31 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="A GUI front-end to dd/dcfldd"
+HOMEPAGE="http://air-imager.sourceforge.net/"
+SRC_URI="mirror://sourceforge/air-imager/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/perl-tk-804.027
+	app-arch/sharutils
+	sys-apps/sed
+	dev-lang/perl"
+
+RDEPEND="app-arch/mt-st
+	dev-lang/perl
+	sys-apps/coreutils"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-installfix.patch
+}
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+
+	PERLTK_VER=`best_version dev-perl/perl-tk`
+	export PERLTK_VER=${PERLTK_VER:17}
+
+	env INTERACTIVE=no INSTALL_DIR=${D}/usr TEMP_DIR=${T} \
+		FINAL_INSTALL_DIR=/usr \
+		./install-${P} \
+		|| die "failed to install - please attach ${T}/air-install.log to a bug report at http://bugs.gentoo.org"
+
+	dodoc README
+
+	chown -R root:root ${D}
+	fowners root:users /usr/share/air/logs
+	fperms ug+rwx /usr/share/air/logs
+	if [ -p ${D}usr/share/air/air-fifo ]; then
+		fperms ug+rw /usr/share/air/air-fifo
+		fowners root:users /usr/share/air/air-fifo
+	fi
+}
+
+pkg_postinst() {
+	einfo "This will use programs from the following packages if installed:"
+	einfo "sys-apps/dcfldd"
+	einfo "net-analyzer/netcat"
+	einfo "net-analyzer/cryptcat"
+}
diff --git a/app-forensics/air/files/air-1.2.5-r1-installfix.patch b/app-forensics/air/files/air-1.2.5-r1-installfix.patch
new file mode 100644
index 000000000000..9a31dbb9c973
--- /dev/null
+++ b/app-forensics/air/files/air-1.2.5-r1-installfix.patch
@@ -0,0 +1,250 @@
+--- air-1.2.5/install-air-1.2.5	2004-08-12 02:16:24.000000000 +0930
++++ install-air-1.2.5	2004-09-13 19:53:15.118414552 +0930
+@@ -1,18 +1,33 @@
+ #!/bin/sh
+ 
+ VERSION="1.2.5"
+-PERLTK_VER="804.027"
++if [ "$PERLTK_VERz" = "z" ] ; then
++	PERLTK_VER="804.027"
++fi
+ TK_SOURCE="http://www.cpan.org/modules/by-module/Tk"
+-TK_FILE='Tk-804.027.tar.gz'
+-TEMP_DIR="/tmp"
+-TK_DIR=$TEMP_DIR/Tk-804.027
+-ICON_DIR="/usr/local/share/air/bitmaps"
+-LOG_DIR="/usr/local/share/air/logs"
+-INSTALL_LOG="/tmp/air-install.log"
++TK_FILE=Tk-$PERLTK_VER.tar.gz
++if [ "$TEMP_DIRz" = "z" ] ; then
++	TEMP_DIR="/tmp"
++fi
++TK_DIR=$TEMP_DIR/Tk-$PERLTK_VER
++if [ "$INSTALL_DIRz" = "z" ]; then
++	INSTALL_DIR="/usr/local"
++fi
++if [ "$FINAL_INSTALL_DIRz" = "z" ]; then
++	FINAL_INSTALL_DIR=$INSTALL_DIR
++fi
++ICON_DIR="$INSTALL_DIR/share/air/bitmaps"
++LOG_DIR="$INSTALL_DIR/share/air/logs"
++INSTALL_LOG="$TEMP_DIR/air-install.log"
+ 
+ echo "Install Log for AIR Version $VERSION" > $INSTALL_LOG
+ date >> $INSTALL_LOG
+-cat /etc/redhat-release >> $INSTALL_LOG
++[ -f /etc/redhat-release ] && cat /etc/redhat-release >> $INSTALL_LOG
++[ -f /etc/gentoo-release ] && cat /etc/gentoo-release >> $INSTALL_LOG
++echo PERLTK_VER=$PERLTK_VER >> $INSTALL_LOG
++echo TEMP_DIR=$TEMP_DIR >> $INSTALL_LOG
++echo INSTALL_DIR=$INSTALL_DIR >> $INSTALL_LOG
++echo FINAL_INSTALL_DIR=$FINAL_INSTALL_DIR >> $INSTALL_LOG
+ cat /proc/cpuinfo >> $INSTALL_LOG
+ free >> $INSTALL_LOG
+ 
+@@ -59,7 +74,7 @@
+ if [ $? -ne 0 ] ; then
+ 	CUR_VER="0"
+ fi
+-if [ $CUR_VER == $PERLTK_VER ] ; then
++if [ $CUR_VER = $PERLTK_VER ] ; then
+ 	echo "Perl/Tk ($CUR_VER) is already installed on your system, so"
+ 	echo "this installer will only update the other components of AIR."
+ 	UPGRADE="yes"
+@@ -76,13 +91,15 @@
+ fi
+ echo "Perl/Tk version: $TK_VER" >> $INSTALL_LOG
+ 
+-echo ""
+-echo "If you are ready to proceed with the installation/upgrade,"
+-echo "press ENTER."
+-echo ""
+-echo "To cancel, hit Control-C."
++if [ ! "$INTERACTIVE" = "no" ] ; then
++	echo ""
++	echo "If you are ready to proceed with the installation/upgrade,"
++	echo "press ENTER."
++	echo ""
++	echo "To cancel, hit Control-C."
+ 
+-read foo < /dev/tty  
++	read foo < /dev/tty  
++fi
+ 
+ if [ $UPGRADE = "no" ] ; then
+ echo "Attempting to get the latest version of Perl/Tk..."
+@@ -90,7 +107,7 @@
+ echo "Need to download Perl/Tk:" >> $INSTALL_LOG
+ echo "decoding snarf..." >> $INSTALL_LOG
+ 
+-sed 's/^X//' << 'SHAR_EOF' | uudecode -o /tmp/snarf.gz 2>> $INSTALL_LOG
++sed 's/^X//' << 'SHAR_EOF' | uudecode -o $TEMP_DIR/snarf.gz 2>> $INSTALL_LOG
+ begin 755 snarf.gz
+ M'XL("-BW"SL``W-N87)F`.U\?WQ35;;O29N64%(2H$B1XAQ'RP^AOZCR&RS$
+ M%!`*(:&MOY@2VK2GM4U"<@*M6(RFG4L:,],WUW&\]SKO,N./R\SUSCAW'`='
+@@ -347,7 +364,7 @@
+ fi
+ 
+ echo "decoding air-counter..." >> $INSTALL_LOG
+-sed 's/^X//' << 'SHAR2_EOF' | uudecode -o /tmp/air-counter 2>> $INSTALL_LOG
++sed 's/^X//' << 'SHAR2_EOF' | uudecode -o $TEMP_DIR/air-counter 2>> $INSTALL_LOG
+ begin 755 air-counter
+ M(R$O=7-R+V)I;B]P97)L"B,J*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
+ M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
+@@ -399,7 +416,7 @@
+ SHAR2_EOF
+ 
+ echo "decoding air..." >> $INSTALL_LOG
+-sed 's/^X//' << 'SHAR3_EOF' | uudecode -o /tmp/air 2>> $INSTALL_LOG
++sed 's/^X//' << 'SHAR3_EOF' | uudecode -o $TEMP_DIR/air 2>> $INSTALL_LOG
+ begin 755 air
+ M(R$O=7-R+V)I;B]P97)L(`HC*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
+ M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
+@@ -2041,8 +2058,15 @@
+ end
+ SHAR3_EOF
+ 
++if [ ! "$FINAL_INSTALL_DIR" = "/usr/local" ] ; then
++	mv $TEMP_DIR/air $TEMP_DIR/air.orig
++	echo "correcting installation directory in air to $FINAL_INSTALL_DIR" | tee -a $INSTALL_LOG
++	sed -e "s:/usr/local:$FINAL_INSTALL_DIR:g" $TEMP_DIR/air.orig > $TEMP_DIR/air
++	rm -f $TEMP_DIR/air.orig | tee -a $INSTALL_LOG
++fi
++
+ echo "decoding icons..." >> $INSTALL_LOG
+-sed 's/^X//' << 'SHAR4_EOF' | uudecode -o /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
++sed 's/^X//' << 'SHAR4_EOF' | uudecode -o $TEMP_DIR/air-icons.tar.gz 2>> $INSTALL_LOG
+ begin 664 air-icons.tar.gz
+ M'XL("*3?P3T``V%I<BUI8V]N<RYT87(`[-T)4%/WO@?P!,(68HP8*6(,$%$B
+ M8@PA+&I$-ME%1*[U*:6*:*GEJD6NM4@AA#TB"D:%@"P1$`($!(R0A&R$L`H(
+@@ -2335,8 +2359,8 @@
+ end
+ SHAR4_EOF
+ 
+-echo "decodiing tailer..." >> $INSTALL_LOG
+-sed 's/^X//' << 'SHAR5_EOF' | uudecode -o /usr/local/bin/tailer 2>> $INSTALL_LOG
++echo "decoding tailer..." >> $INSTALL_LOG
++sed 's/^X//' << 'SHAR5_EOF' | uudecode -o $TEMP_DIR/tailer 2>> $INSTALL_LOG
+ begin 755 tailer
+ M(R$O8FEN+W-H"B,J*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
+ M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BH*(R`@
+@@ -2370,8 +2394,8 @@
+ end
+ SHAR5_EOF
+ 
+-echo "decodiing split..." >> $INSTALL_LOG
+-sed 's/^X//' << 'SHAR6_EOF' | uudecode -o /tmp/split.gz 2>> $INSTALL_LOG
++echo "decoding split..." >> $INSTALL_LOG
++sed 's/^X//' << 'SHAR6_EOF' | uudecode -o $TEMP_DIR/split.gz 2>> $INSTALL_LOG
+ begin 755 split.gz
+ M'XL("/.S$T$``W-P;&ET`.U\#WQ4Q;7PW;"$)03O@HN-)<I5@X"2D""TA$"!
+ MP")4@I&P_BFL89-LV-5--MV]2T)+)+A9R>UM;%ZKKVJU)87VT7]*:Z4)*`2"
+@@ -2630,12 +2654,12 @@
+ end
+ SHAR6_EOF
+ if [ $UPGRADE = "no" ] ; then
+-	# unzip /tmp/snarf.gz
+-	/bin/gunzip /tmp/snarf.gz 
++	# unzip $TEMP_DIR/snarf.gz
++	/bin/gunzip $TEMP_DIR/snarf.gz 
+ 	
+ 	# Use snarf to "snarf" the Perl/Tk package (It has a progress display)
+ 	
+-	/tmp/snarf -n $TK_SOURCE/$TK_FILE $TEMP_DIR/$TK_FILE
++	$TEMP_DIR/snarf -n $TK_SOURCE/$TK_FILE $TEMP_DIR/$TK_FILE
+ 	
+ 	
+ 	if [ $? -ne 0 ] ; then
+@@ -2650,7 +2674,7 @@
+ 		echo "If the installer failed with some other error message,"
+ 		echo "please email steve@unixgurus.com for assistance."
+ 		echo ""
+-		rm -f /tmp/snarf*
++		rm -f $TEMP_DIR/snarf*
+ 		exit 1
+ 	else
+ 		echo "Download of Perl/Tk successful." | tee -a $INSTALL_LOG
+@@ -2679,6 +2703,10 @@
+ fi	
+ 
+ # create directories if they don't exist
++if [ ! -d $INSTALL_DIR/bin ]; then
++	echo "creating directory $INSTALL_DIR/bin..." | tee -a $INSTALL_LOG
++	mkdir -p $INSTALL_DIR/bin 2>> $INSTALL_LOG
++fi
+ if [ ! -d $ICON_DIR ]; then
+ 	echo "creating directory $ICON_DIR..." | tee -a $INSTALL_LOG
+ 	mkdir -p $ICON_DIR 2>> $INSTALL_LOG
+@@ -2690,37 +2718,56 @@
+ 
+ # install air-counter 
+ echo "Unpacking and installing air-counter..." | tee -a $INSTALL_LOG
+-mv -f /tmp/air-counter /usr/local/bin/air-counter 2>> $INSTALL_LOG
+-chmod +x /usr/local/bin/air-counter 2>> $INSTALL_LOG
+-rm -f /tmp/air-counter 2>> $INSTALL_LOG
++mv -f $TEMP_DIR/air-counter $INSTALL_DIR/bin/air-counter 2>> $INSTALL_LOG
++chmod +x $INSTALL_DIR/bin/air-counter 2>> $INSTALL_LOG
++rm -f $TEMP_DIR/air-counter 2>> $INSTALL_LOG
+ echo "Install of air-counter is complete." | tee -a $INSTALL_LOG
+ echo ""
+ 
++# install tailer
++echo "Unpacking and installing tailer..." | tee -a $INSTALL_LOG
++mv -f $TEMP_DIR/tailer $INSTALL_DIR/bin/tailer 2>> $INSTALL_LOG
++chmod +x $INSTALL_DIR/bin/tailer 2>> $INSTALL_LOG
++rm -f $TEMP_DIR/tailer 2>> $INSTALL_LOG
++echo "Install of tailer is complete." | tee -a $INSTALL_LOG
++echo ""
++
+ # unzip and install icons 
+ echo "Unpacking and installing icons..." | tee -a $INSTALL_LOG
+-/bin/tar -C $TEMP_DIR -zxf /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
+-mv -f /tmp/*.xbm $ICON_DIR 2>> $INSTALL_LOG
+-mv -f /tmp/*.gif $ICON_DIR 2>> $INSTALL_LOG
+-rm -f /tmp/air-icons.tar.gz 2>> $INSTALL_LOG
++/bin/tar -C $TEMP_DIR -zxf $TEMP_DIR/air-icons.tar.gz 2>> $INSTALL_LOG
++mv -f $TEMP_DIR/*.xbm $ICON_DIR 2>> $INSTALL_LOG
++mv -f $TEMP_DIR/*.gif $ICON_DIR 2>> $INSTALL_LOG
++rm -f $TEMP_DIR/air-icons.tar.gz 2>> $INSTALL_LOG
+ echo "Install of icons is complete." | tee -a $INSTALL_LOG
+ echo ""
+ 
+ #unzip and install split
+-echo "Unpacking and installing split..." | tee -a $INSTALL_LOG
+-/bin/gunzip /tmp/split.gz 2>> $INSTALL_LOG
+-mv -f /tmp/split /usr/local/bin/split 2>> $INSTALL_LOG
+-chmod +x /usr/local/bin/split 2>> $INSTALL_LOG
+-rm -f /tmp/split 2>> $INSTALL_LOG
+-echo "Install of split is complete." | tee -a $INSTALL_LOG
+-echo ""
++MY_ARCH=`uname -m`
++
++if [ "$MY_ARCH" = "i386" -o "$MY_ARCH" = "i486" -o "$MY_ARCH" = "i586" -o "$MY_ARCH" = "i686" ] && [ ! -x $FINAL_INSTALL_DIR/bin/split ] ; then
++	echo "Unpacking and installing split..." | tee -a $INSTALL_LOG
++	/bin/gunzip $TEMP_DIR/split.gz 2>> $INSTALL_LOG
++	mv -f $TEMP_DIR/split $INSTALL_DIR/bin/split 2>> $INSTALL_LOG
++	chmod +x  $INSTALL_DIR/bin/split 2>> $INSTALL_LOG
++	rm -f $TEMP_DIR/split 2>> $INSTALL_LOG
++	echo "Install of split is complete." | tee -a $INSTALL_LOG
++	echo ""
++else
++	if [ -x $FINAL_INSTALL_DIR/bin/split ] ; then
++		echo "$FINAL_INSTALL_DIR/bin/split already installed - not installing split." | tee -a $INSTALL_LOG
++	else
++		echo "Included $FINAL_INSTALL_DIR/split is a x86 architecture executable and current machine isn't." | tee -a $INSTALL_LOG
++		echo "You need $FINAL_INSTALL_DIR/bin/split to run air-imager"  | tee -a $INSTALL_LOG
++	fi
++fi
+ 
+ if [ $UPGRADE = "yes" ] ; then
+ 	echo "Updating AIR to version $VERSION..."
+ else
+ 	echo "Installing AIR $VERSION..." | tee -a $INSTALL_LOG
+ fi
+-mv -f /tmp/air /usr/local/bin/air 2>> $INSTALL_LOG
+-rm -f /tmp/air 2>> $INSTALL_LOG
++mv -f $TEMP_DIR/air $INSTALL_DIR/bin/air 2>> $INSTALL_LOG
++rm -f $TEMP_DIR/air 2>> $INSTALL_LOG
+ 
+ if [ $UPGRADE = "yes" ]; then
+ 	echo "Upgrade to AIR v$VERSION complete."
diff --git a/app-forensics/air/files/digest-air-1.2.5-r1 b/app-forensics/air/files/digest-air-1.2.5-r1
new file mode 100644
index 000000000000..b6c3f49e5017
--- /dev/null
+++ b/app-forensics/air/files/digest-air-1.2.5-r1
@@ -0,0 +1 @@
+MD5 173e5c2e9feca01a5afcea89a77aa901 air-1.2.5.tar.gz 80132