From bf3ad3af930bf183b5c273b1ea6b4abbf7b9c4df Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Tue, 1 Nov 2005 12:13:13 +0000
Subject: [PATCH] Some minor tweaks to included patch. Might as well make it
 apply clean, too.

---
 jhalfs-0.2-debian_31_as_host-1.patch | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/jhalfs-0.2-debian_31_as_host-1.patch b/jhalfs-0.2-debian_31_as_host-1.patch
index fa4e4ab..a6e0ead 100644
--- a/jhalfs-0.2-debian_31_as_host-1.patch
+++ b/jhalfs-0.2-debian_31_as_host-1.patch
@@ -1,30 +1,30 @@
-Submitted By: Jhon Kelly (jakelly at shtc dot net)
+Submitted By: John Kelly (jakelly at shtc dot net)
 Date: 2005-09-26
 Initial Package Version: 0.2
 Origin: alfs-discuss
 Upstream Status: Optional
 Description: Allow jhalfs to work with a md5sum program
-that don't accept - as filename, like the one shipped with
+that doesn't accept '-' as a filename, like the one shipped with
 Debian 3.1 stable.
 
---- jhalfs.orig 2005-09-25 17:17:15.000000000 -0400
-+++ jhalfs  2005-09-25 19:12:12.000000000 -0400
-@@ -189,9 +189,12 @@
-   DIR=`echo $1 | sed 's@-doc@@'`
-
+--- jhalfs.orig	2005-11-01 07:10:00.104763416 -0500
++++ jhalfs	2005-11-01 07:10:02.472416413 -0500
+@@ -192,9 +192,12 @@
+   DIR=`echo $1 | sed -e 's@-doc@@' -e 's@-linuxthreads@@' -e 's@-libidn@@'`
+ 
    # Find the md5 sum for this package.
 -  if [ $2 != MD5SUMS ] ; then MD5=`grep "  $2" MD5SUMS` ; fi
 +  if [ $2 != MD5SUMS ] ; then
 +    MD5=$(grep " $2" MD5SUMS | sed -r -e 's/^[[:blank:]]+//;s/[[:blank:]]+$//;s/[[:blank:]]+/ /g')
 +    md5_file=${MD5#* } ; md5_chksum=${MD5% *}
 +  fi
-
+ 
 -  if [ ! -f $2 ] ; then
 +  if [ ! -f $2 -o $2 == MD5SUMS ] ; then
      case $DL in
        wget )
          wget $HTTP/$DIR/$2
-@@ -203,7 +206,7 @@
+@@ -206,7 +209,7 @@
          echo "$DL not supported at this time."
          ;;
      esac
@@ -33,7 +33,7 @@ Debian 3.1 stable.
      case $DL in
        wget )
          wget -c $HTTP/$DIR/$2
-@@ -216,8 +219,11 @@
+@@ -219,8 +222,11 @@
          ;;
      esac
    fi
@@ -46,5 +46,4 @@ Debian 3.1 stable.
 +     fi
    fi
  }
-
-
+