Added a patch to ignore .keep

5 files changed, 219 insertions, 13 deletions

diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog
index 44ae3eabaa92..25f807365fbe 100644
--- a/sys-apps/debianutils/ChangeLog
+++ b/sys-apps/debianutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/debianutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.15 2003/03/26 23:04:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.16 2003/04/04 00:21:06 seemant Exp $
+
+*debianutils-1.16.7-r1 (03 Apr 2003)
+
+  03 Apr 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r1.ebuild, debianutils-1.16.7.ebuild,
+  debianutils-1.16.7.ebuild, files/debianutils-1.16.7-gentoo.patch:
+  Added patch for run-parts to ignore .keep files. Patch was submitted by: Jukka
+  Salmi <jukka-gentoo@2003.salmi.ch> in bug #18423.
 
 *debianutils-1.16.7 (26 Mar 2003)
 
diff --git a/sys-apps/debianutils/debianutils-1.16.7.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild
index 08ad758b48db..1c9dcf9b7f96 100644
--- a/sys-apps/debianutils/debianutils-1.16.7.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7.ebuild,v 1.1 2003/03/26 23:04:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r1.ebuild,v 1.1 2003/04/04 00:21:06 seemant Exp $
 
 IUSE="static build"
 
@@ -24,7 +24,8 @@ src_unpack() {
 
 	# Make installkernel and mkboot more Gentoo friendly
 	# <azarah@gentoo.org> (25 Sep 2002)
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	#epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/blah.patch
 
 	# Patch savelog to use bzip2 compression instead of gzip
 	epatch ${FILESDIR}/${PN}-compress.patch
diff --git a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
index 221286455ddb..5947a7907fec 100644
--- a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
+++ b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
@@ -1,6 +1,6 @@
-diff -urN debianutils-1.16.3/installkernel debianutils-1.16.3.azarah/installkernel
---- debianutils-1.16.3/installkernel	2002-06-13 14:22:33.000000000 +0200
-+++ debianutils-1.16.3.azarah/installkernel	2002-09-26 23:07:52.000000000 +0200
+diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel
+--- debianutils-1.16.7.old/installkernel	2002-09-28 12:17:03.000000000 -0700
++++ debianutils-1.16.7/installkernel	2003-04-03 16:16:55.000000000 -0800
 @@ -33,7 +33,7 @@
    cat "$2" > "$dir/$1-$ver"
  
@@ -10,9 +10,9 @@ diff -urN debianutils-1.16.3/installkernel debianutils-1.16.3.azarah/installkern
       = "$1-$ver" ] ; then
        ln -sf "$1-$ver.old" "$dir/$1.old"
      else
-diff -urN debianutils-1.16.3/mkboot debianutils-1.16.3.azarah/mkboot
---- debianutils-1.16.3/mkboot	2002-02-19 02:03:17.000000000 +0200
-+++ debianutils-1.16.3.azarah/mkboot	2002-09-26 23:10:00.000000000 +0200
+diff -urN debianutils-1.16.7.old/mkboot debianutils-1.16.7/mkboot
+--- debianutils-1.16.7.old/mkboot	2002-10-16 20:20:42.000000000 -0700
++++ debianutils-1.16.7/mkboot	2003-04-03 16:16:55.000000000 -0800
 @@ -14,7 +14,13 @@
  
  # check whether GRUB is installed
@@ -28,7 +28,7 @@ diff -urN debianutils-1.16.3/mkboot debianutils-1.16.3.azarah/mkboot
  }
  
  # check whether LILO is installed
-@@ -94,7 +100,7 @@
+@@ -96,7 +102,7 @@
      fi
  
      boottype="lilo"
@@ -37,7 +37,7 @@ diff -urN debianutils-1.16.3/mkboot debianutils-1.16.3.azarah/mkboot
  	echo "Since you don't have root permissions, I can't put LILO on the diskette."
  	echo "I will make a non-LILO diskette instead, but it won't be as useful.  You"
  	echo "can hit <Ctrl-C> to cancel."
-@@ -144,6 +150,16 @@
+@@ -146,6 +152,16 @@
      echo "either make a bootable floppy diskette, re-run LILO, or have GRUB"
      echo "installed."
  
@@ -54,7 +54,7 @@ diff -urN debianutils-1.16.3/mkboot debianutils-1.16.3.azarah/mkboot
      grubcheck
      if [ $? -eq 0 ] ; then
          echo -e "\nGRUB is installed. To automatically switch to new kernels, point your"
-@@ -151,16 +167,6 @@
+@@ -153,16 +169,6 @@
          exit 0
      fi
  
@@ -71,3 +71,197 @@ diff -urN debianutils-1.16.3/mkboot debianutils-1.16.3.azarah/mkboot
      echo -en "\nShould I make a bootdisk? (y/n) "
      read input
      if [ "$input" = "y" ] ; then
+diff -urN debianutils-1.16.7.old/mkboot~ debianutils-1.16.7/mkboot~
+--- debianutils-1.16.7.old/mkboot~	1969-12-31 16:00:00.000000000 -0800
++++ debianutils-1.16.7/mkboot~	2002-10-16 20:20:42.000000000 -0700
+@@ -0,0 +1,177 @@
++#!/bin/bash
++# mkboot: make the system bootable
++# Debian GNU/Linux
++# Copyright 1996-1997 Guy Maor <maor@debian.org>
++# This is free software; see the GNU General Public License version 2
++# or later for copying conditions.  There is NO warranty.
++
++PATH=$PATH:/sbin:/usr/sbin
++
++# root partition
++rootpart=$(rdev | cut -d ' ' -f 1)
++# temporary directory
++tmpdir=${TMPDIR-/tmp}
++
++# check whether GRUB is installed
++grubcheck () {
++    [ $(dpkg -s grub | grep -i ^status: | cut -d ' ' -f 4) = "installed" ]
++}
++
++# check whether LILO is installed
++lilocheck () {
++    echo -en "\nChecking for LILO..."
++    if [ $(whoami) != root ] ; then
++	echo "Only root can check for LILO"
++        return 1;
++    fi
++    if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ] ; then
++	echo "No"
++	return 1;
++    fi
++    bootpart=$(perl -ne 'print $1 if /^\s*boot\s*=\s*(\S*)/' /etc/lilo.conf)
++    if [ -z "$bootpart" ] ; then
++	# lilo defaults to current root when 'boot=' is not present
++	bootpart=$rootpart
++    fi
++    if ! dd if=$bootpart ibs=16 count=1 2>&- | grep -q LILO ; then
++	echo -e "\nYes, but I couldn't find a LILO signature on $bootpart"
++	echo "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
++	return 1;
++    fi
++    echo "Yes, on $bootpart"
++    return 0;
++}
++
++
++# make a lilo boot disk
++makelilo () {
++(
++    b=$tmpdir/boot$$
++    trap "set +e; cd /; umount /dev/fd0; rmdir $b" 0
++    set -ex
++    mkdir $b
++    mke2fs -q /dev/fd0
++    mount -t ext2 /dev/fd0 $b
++    if [ -e /boot/boot.b ]; then
++        cp /boot/boot.b $b/boot.b
++    fi
++    cp $1 $b/vmlinuz
++    cd $b
++    cat > lilo.conf <<- EOF
++	lba32
++	boot = /dev/fd0
++	install = boot.b
++	map = map
++	compact
++	prompt
++	timeout = 50
++	read-only
++	image = vmlinuz
++	label = linux
++	root = $rootpart
++	EOF
++    lilo -C lilo.conf
++)
++}
++
++
++# make a simple boot disk
++makesimple () {
++(
++    set -ex
++    dd if=$1 of=/dev/fd0
++    rdev /dev/fd0 $rootpart
++    rdev -R /dev/fd0 1
++)
++}    
++
++
++
++# make a boot disk
++makedisk () {
++    kernel=${1:-/vmlinuz}
++    if [ ! -r $kernel ] ; then
++	echo "Error: Can't read $kernel."
++	exit 1
++    fi
++
++    boottype="lilo"
++    if [ $(whoami) != root ] ; then
++	echo "Since you don't have root permissions, I can't put LILO on the diskette."
++	echo "I will make a non-LILO diskette instead, but it won't be as useful.  You"
++	echo "can hit <Ctrl-C> to cancel."
++	boottype="simple"
++    fi
++
++    echo -en "\nInsert a floppy diskette into your boot drive, and press <Return>. "
++    read input
++    diskok=0
++    while [ "$diskok" != 1 ] ; do
++	echo -e "\nCreating a $boottype bootdisk..."
++	make$boottype $kernel
++	if [ $? -eq 0 ] ; then
++	    diskok=1
++	else
++	    echo -e "\nThere was a problem creating the boot diskette.  Please make sure that"
++	    echo "you inserted the diskette into the correct drive and that the diskette"
++	    echo "is not write-protected."
++	    echo -en "\nWould you like to try again? (y/n) "
++	    read input
++	    if [ "$input" != "y" ] ; then
++		return 1
++	    fi
++	fi
++    done
++    echo "...Success."
++    return 0
++}
++
++usage="$0 [-r rootpartition] [-i] [kernel]"
++
++while getopts "r:ih-" opt ; do
++    case "$opt" in
++	r) rootpart="$OPTARG" ;;
++	i) installkernel=1 ;;
++	h) echo $usage ; exit 0 ;;
++	-) break ;;
++	*) echo $usage 1>&2 ; exit 1 ;;
++    esac
++done
++shift $(($OPTIND - 1))
++
++if [ "$installkernel" ] ; then
++    shift
++    echo "In order to use the new kernel image you have just installed, you"
++    echo "will need to reboot the machine.  First, however, you will need to"
++    echo "either make a bootable floppy diskette, re-run LILO, or have GRUB"
++    echo "installed."
++
++    grubcheck
++    if [ $? -eq 0 ] ; then
++        echo -e "\nGRUB is installed. To automatically switch to new kernels, point your"
++        echo "default entry in menu.lst to $1"
++        exit 0
++    fi
++
++    lilocheck
++    if [ $? -eq 0 ] ; then
++	echo -en "\nShould I run /sbin/lilo? (y/n) "
++	read input
++	if [ "$input" = "y" ] ; then
++	    /sbin/lilo && exit 0
++            echo "There was a problem running /sbin/lilo."
++	fi
++    fi
++
++    echo -en "\nShould I make a bootdisk? (y/n) "
++    read input
++    if [ "$input" = "y" ] ; then
++	makedisk $1 && exit 0
++    fi
++
++    echo -e "\nWARNING: Your system is probably unbootable now.  After correcting any"
++    echo "problems, rerun this script with the command \`mkboot -installkernel'."
++    exit 1
++fi
++
++makedisk $1
+diff -urN debianutils-1.16.7.old/run-parts.c debianutils-1.16.7/run-parts.c
+--- debianutils-1.16.7.old/run-parts.c	2002-10-16 21:19:37.000000000 -0700
++++ debianutils-1.16.7/run-parts.c	2003-04-03 16:17:20.000000000 -0800
+@@ -120,7 +120,8 @@
+             !fnmatch("*~", c, 0) ||
+             !fnmatch("*.pre_fcopy", c, 0) ||
+             !fnmatch("*.notslocate", c, 0) ||
+-            !fnmatch("*.disabled", c, 0) );
++            !fnmatch("*.disabled", c, 0) ||
++			!fnmatch("*.keep", c, 0) );
+ }
+ 
+ 
diff --git a/sys-apps/debianutils/files/digest-debianutils-1.16.7 b/sys-apps/debianutils/files/digest-debianutils-1.16.7
deleted file mode 100644
index 43e9c44d417a..000000000000
--- a/sys-apps/debianutils/files/digest-debianutils-1.16.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ff426c92daf7fab4d19dcec81f27800 debianutils_1.16.7.tar.gz 26097
diff --git a/sys-apps/debianutils/files/digest-debianutils-1.16.7-r1 b/sys-apps/debianutils/files/digest-debianutils-1.16.7-r1
new file mode 100644
index 000000000000..058e07613d28
--- /dev/null
+++ b/sys-apps/debianutils/files/digest-debianutils-1.16.7-r1
@@ -0,0 +1,4 @@
+MD5 e814d4dcbe42ad46f0fa3449b653c173 /files/debianutils-1.16.7-gentoo.patch 7521
+MD5 3f67e66ea1d7aa13843f253310322f51 /files/debianutils-compress.patch 743
+MD5 06eac09d0d1acc54e0f40bad174d7352 /debianutils-1.16.7-r1.ebuild 1386
+MD5 7ff426c92daf7fab4d19dcec81f27800 debianutils_1.16.7.tar.gz 26097