security update

4 files changed, 226 insertions, 2 deletions

diff --git a/sys-apps/mindi/Manifest b/sys-apps/mindi/Manifest
index af91b13db313..11657f854cfc 100644
--- a/sys-apps/mindi/Manifest
+++ b/sys-apps/mindi/Manifest
@@ -1,8 +1,8 @@
-MD5 22d87d8a3a2f49842df93307b0b2668e ChangeLog 1092
+MD5 14c0de0ffae336de9791b0ec88498395 ChangeLog 1206
 MD5 a8aa819f59515cc6c35080976944e88b mindi-0.67.ebuild 901
 MD5 53ab1afcc853eab2f2570b5c106041ec mindi-0.81.ebuild 841
 MD5 ec9b1c4bf26a635d741e069fd94ad935 mindi-0.85.ebuild 1225
-MD5 a209e1f508413a7c8cba2669678268f0 mindi-0.86.ebuild 1275
+MD5 f72edda043ed870d8a1b735945dc9e8d mindi-0.86.ebuild 1380
 MD5 1fd811786e62e7ba5c42e691b3c9a727 files/digest-mindi-0.67 69
 MD5 75eddeccd1420abb7081c34d09aa4a13 files/digest-mindi-0.81 60
 MD5 f7ffab39c958c0caee50b8c052173d78 files/mindi-0.65.patch 847
diff --git a/sys-apps/mindi/files/digest-mindi-0.86 b/sys-apps/mindi/files/digest-mindi-0.86
new file mode 100644
index 000000000000..0ad3dc246917
--- /dev/null
+++ b/sys-apps/mindi/files/digest-mindi-0.86
@@ -0,0 +1 @@
+MD5 59527088138978fca8af462da2ca735d mindi-0.86.tgz 909289
diff --git a/sys-apps/mindi/files/mindi-0.86-security.patch b/sys-apps/mindi/files/mindi-0.86-security.patch
new file mode 100644
index 000000000000..4ba63f85af26
--- /dev/null
+++ b/sys-apps/mindi/files/mindi-0.86-security.patch
@@ -0,0 +1,175 @@
+diff -Naur mindi-0.81/mindi mindi-0.81-patched/mindi
+--- mindi-0.81/mindi	2003-08-19 14:53:28.000000000 +0200
++++ mindi-0.81-patched/mindi	2003-08-19 14:58:52.000000000 +0200
+@@ -13,7 +13,7 @@
+ 
+ MINDI_VERSION=0.81_20021219
+ EXTRA_SPACE=16384          ; # increase if you run out of ramdisk space
+-TMP_ROOT=/tmp
++TMP_ROOT=`mktemp -d`
+ WRITE_BOOT_FLOPPIES="yes" ; # do you want to be propted to write floppy images
+ PROMPT_WRITE_BOOT_FLOPPIES="yes"
+     # do you want to be prompted to write
+@@ -357,9 +357,9 @@
+     mountpoint=$TMP_ROOT/mountpoint.$$
+     mkdir -p $mountpoint
+     dd if=/dev/zero of=$imagefile bs=1k count=1440 > /dev/null 2> /dev/null || LogIt "Cannot dd (CODI)\n"
+-    mke2fs -N 12 -F $imagefile > /tmp/mke2fs.$$ 2>> /tmp/mke2fs.$$
+-    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
+-    rm -f /tmp/mke2fs.$$
++    mke2fs -N 12 -F $imagefile > $TMP_ROOT/mke2fs.$$ 2>> $TMP_ROOT/mke2fs.$$
++    [ "$?" -ne "0" ] && cat $TMP_ROOT/mke2fs.$$
++    rm -f $TMP_ROOT/mke2fs.$$
+     mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $mountpoint; does your kernel support loopfs? If not, please recompile your kernel. Your Linux distro is broken."
+     mv $tarball $mountpoint/
+     if [ "$?" -ne "0" ] ; then
+@@ -399,16 +399,16 @@
+     my_partitions=`mount | fgrep $$ | cut -f1 -d' '`
+     [ "$my_partitions" != "" ] && umount $my_partitions
+     [ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
+-    cd /tmp
++    cd $TMP_ROOT
+     mkdir -p mindi.err
+-    for i in /tmp/mindi-needlist.txt /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log /tmp/mountlist.txt.$$ ; do
++    for i in $TMP_ROOT/mindi-needlist.txt /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log $TMP_ROOT/mountlist.txt.$$ ; do
+ 	[ -e "$i" ] && cp -f $i mindi.err/
+     done
+     rm -f mindi.err.*.tgz
+     tar -c mindi.err -f- | gzip -9 > mindi.err.$$.tgz
+     cd /
+-    rm -Rf mindi.err /tmp/mountlist.txt.$$
+-    LogIt "Please e-mail a copy of /tmp/mindi.err.$$.tgz to the mailing list."
++    rm -Rf mindi.err $TMP_ROOT/mountlist.txt.$$
++    LogIt "Please e-mail a copy of $TMP_ROOT/mindi.err.$$.tgz to the mailing list."
+     LogIt "See http://www.mondorescue.com for more information."
+     LogIt "WE CANNOT HELP unless you enclose that file."
+     exit 1
+@@ -673,7 +673,7 @@
+     progress=0
+     noof_lines=`cat $tempfile | wc -l`
+     for fname in `cat $tempfile` ; do
+-        tempdepfile=`mktemp /tmp/mindilinux/tempdepfile.XXXXXX`
++        tempdepfile=`mktemp $TMP_ROOT/mindilinux/tempdepfile.XXXXXX`
+         LocateDeps $fname > $tempdepfile
+ 	echo "$fname" >> $outfile.pre
+         cat $tempdepfile >> $outfile.pre
+@@ -984,7 +984,7 @@
+ 
+ 
+ 
+-# Called by TurnTgzIntoRdz, to make /tmp/mondo-restore.cfg
++# Called by TurnTgzIntoRdz, to make $TMP_ROOT/mondo-restore.cfg
+ 
+ MakeMondoConfigFile() {
+     local outfile use_lzo use_comp
+@@ -1327,17 +1327,17 @@
+     if [ -d "/home/MondoCD" ] ; then
+ 	cp -pRdu /home/MondoCD/* . || Die "Cannot do kung pow"
+     fi
+-    mkisofs -U -J -r -o $imagesdir/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> /tmp/$$.mk
++    mkisofs -U -J -r -o $imagesdir/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $TMP_ROOT/$$.mk
+     if [ "$?" -ne "0" ] ; then
+ 	echo "----------- mkisofs's errors --------------" >> $LOGFILE
+-	cat /tmp/$$.mk >> $LOGFILE
++	cat $TMP_ROOT/$$.mk >> $LOGFILE
+ 	echo "mkisofs returned the following errors:-"
+-	cat /tmp/$$.mk
++	cat $TMP_ROOT/$$.mk
+ 	LogIt "Failed to create ISO image.\n"
+     else
+ 	echo "Created bootable ISO image at $imagesdir/mindi.iso\n" >> $LOGFILE
+     fi
+-    rm -f /tmp/$$.mk
++    rm -f $TMP_ROOT/$$.mk
+     cd $old_pwd
+ }
+ 
+@@ -1366,9 +1366,9 @@
+     mountpoint=$TMP_ROOT/mountpoint.$$
+     mkdir -p $mountpoint
+     dd if=/dev/zero of=$imagefile bs=1k count=$disksize > /dev/null 2> /dev/null || Die "Cannot dd blank file"
+-    mke2fs -N 26 -m 0 -F $imagefile > /tmp/mke2fs.$$ 2>> /tmp/mke2fs.$$
+-    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
+-    rm -f /tmp/mke2fs.$$
++    mke2fs -N 26 -m 0 -F $imagefile > $TMP_ROOT/mke2fs.$$ 2>> $TMP_ROOT/mke2fs.$$
++    [ "$?" -ne "0" ] && cat $TMP_ROOT/mke2fs.$$
++    rm -f $TMP_ROOT/mke2fs.$$
+     mount -t ext2 -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
+ # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
+     mkdir -p $mountpoint/etc
+@@ -1501,15 +1501,15 @@
+ 	$LILO_EXE -r $mountpoint >> $LOGFILE 2>> $LOGFILE
+     fi
+     if [ $? -ne "0" ] ; then
+-	if [ "`cat $LOGFILE | fgrep "/tmp/dev.0"`" ] ; then
+-	    LogIt "The '/tmp/dev.0' error is NOT Mindi's fault. It is LILO's.\n"
++	if [ "`cat $LOGFILE | fgrep "$TMP_ROOT/dev.0"`" ] ; then
++	    LogIt "The '$TMP_ROOT/dev.0' error is NOT Mindi's fault. It is LILO's.\n"
+ 	    LogIt "Please reboot your PC as a workaround.\n"
+ 	    Die "LILO sneezed and Mindo caught a cold. Please read the README / FAQ.\n"
+ 	fi
+ 	LogIt "Cannot run lilo on $mountpoint\nPlease upgrade/downgrade your version of LILO. It has a bug.\n"
+ 	retval=$(($retval+1))
+     fi
+-    cp -f $liloconf /tmp/lilo.conf
++    cp -f $liloconf $TMP_ROOT/lilo.conf
+     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
+     echo -en "..."
+     rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
+@@ -1671,7 +1671,7 @@
+ 	ListKernelModulePaths >> $needlist
+     fi
+     if [ "$res" -ne "0" ] ; then
+-	rm -f /tmp/mindi-needlist.txt
++	rm -f $TMP_ROOT/mindi-needlist.txt
+ 	Die "You have $res file`PluralOrNot $res` present in dependency list\nbut absent from filesystem."
+     fi
+     FindAndAddUserKeyboardMappingFile
+@@ -2104,9 +2104,6 @@
+     dd if=/dev/zero of=$tempfile bs=1k count=$ramdisk_size > /dev/null 2> /dev/null || Die "Not enough room for temporary ramdisk (TurnTgzIntoRdz)"
+     echo -en "..."
+     mke2fs -b 1024 -N 65536 -m 0 -F $tempfile >> $LOGFILE 2>> $LOGFILE
+-
+-    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
+-    rm -f /tmp/mke2fs.$$
+     echo -en "..."
+     mkdir -p $mountpoint
+     mount -t ext2 -o loop $tempfile $mountpoint || Die "Cannot loopmount $tempfile to $mountpoint"
+@@ -2252,8 +2249,8 @@
+ AbortIfMkfsVfatMissing
+ FindIsolinuxBinary
+ FindLiloBinary
+-cat /proc/mounts | fgrep " $TMP_ROOT " | fgrep tmpfs > /dev/null 2> /dev/null && TMP_ROOT=/home && LogIt "Changing TMP_ROOT to $TMP_ROOT because you're using tmpfs for /tmp" ; # tmpfs doesn't like Mindi and /tmp, for some reason
+-rm -f /tmp/mindi_lo
++cat /proc/mounts | fgrep " $TMP_ROOT " | fgrep tmpfs > /dev/null 2> /dev/null && TMP_ROOT=`mktemp -d -p /var/tmp` && LogIt "Changing TMP_ROOT to $TMP_ROOT because you're using tmpfs for /tmp" ; # tmpfs doesn't like Mindi and /tmp, for some reason
++rm -f $TMP_ROOT/mindi_lo
+ trap "Aborted" SIGTERM
+ DONE="\r\t\t\t\t\t\t\t\t\tDone.         "
+ CHOPSIZE=160
+@@ -2262,7 +2259,7 @@
+ imagesdir=/root/images/mindi
+ mkdir -p $imagesdir
+ kernelpath=""
+-MONDO_ROOT=/tmp/mindilinux/mondo-root
++MONDO_ROOT="$TMP_ROOT/mindilinux/mondo-root"
+ mkdir -p $MONDO_ROOT
+ 
+ if [ "$#" -ne "0" ] ; then
+@@ -2405,7 +2402,7 @@
+ fi
+ echo -e "Mindi's temp dir = $TMP_ROOT \nMindi's output dir=$imagesdir" >> $LOGFILE
+ [ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty..."
+-rm -f /tmp/mindi.err.*.tgz
++rm -f $TMP_ROOT/mindi.err.*.tgz
+ 
+ PrepareDataDiskImages $imagesdir
+ noof_disks=$?
+@@ -2450,7 +2447,7 @@
+     done
+ fi
+ [ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
+-rm -Rf /tmp/mindi-needlist.txt /tmp/mountlist.txt.$$
++rm -Rf $TMP_ROOT/mindi-needlist.txt $TMP_ROOT/mountlist.txt.$$
+ LogIt "$FRIENDLY_OUTSTRING"
+ echo "Mindi is exiting" >> $LOGFILE
+ exit 0
diff --git a/sys-apps/mindi/mindi-0.86.ebuild b/sys-apps/mindi/mindi-0.86.ebuild
new file mode 100644
index 000000000000..35d467dc9d2e
--- /dev/null
+++ b/sys-apps/mindi/mindi-0.86.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.86.ebuild,v 1.1 2003/09/02 10:12:39 aliz Exp $
+
+DESCRIPTION="Mindi builds boot/root disk images using your existing kernel, modules, tools and libraries"
+HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
+SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${P}.tgz"
+RESTRICT="nouserpriv"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64"
+RESTRICT="nouserpriv"
+
+DEPEND=">=sys-apps/bzip2-1.0.1
+		>=app-cdr/cdrtools-1.11
+		>=sys-libs/ncurses-5
+		>=sys-devel/binutils-2
+		>=sys-apps/syslinux-1.7
+		>=sys-apps/lilo-22
+		>=app-admin/dosfstools-2.8
+		>=sys-apps/mindi-kernel-1*"
+		
+src_unpack() {
+	for i in ${FEATURES} ; do
+		if [ "${i}" = "userpriv" ] ; then
+			echo
+			ewarn "mindi cannot be installed if userpriv"
+			ewarn "is set within FEATURES."
+			ewarn "Please emerge mindi as follows:"
+			echo
+			ewarn "# FEATURES=\"-userpriv\" emerge mindi"
+			die "userpriv failure"
+		fi
+	done
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-security.patch
+}
+
+src_install() {
+	dodir /usr/share/mindi
+	dodir /usr/sbin
+	cp * --parents -rdf ${D}/usr/share/mindi/
+	rm ${D}/usr/share/mindi/{CHANGES,INSTALL,LICENSE,README,TODO}
+	dodoc CHANGES INSTALL LICENSE README TODO
+	dosym /usr/share/mindi/mindi /usr/sbin/
+}