r1411 - in trunk: . bzip2

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Feb 19 23:44:38 PST 2006


Author: jim
Date: 2006-02-20 00:44:37 -0700 (Mon, 20 Feb 2006)
New Revision: 1411

Modified:
   trunk/
   trunk/bzip2/bzip2-1.0.3-remove_tempfile-1.patch
Log:
 r1454 at server:  jim | 2006-02-19 23:44:23 -0800
 Send correct bzip2-1.0.3-remove_tempfile-1.patch



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1452
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1454

Modified: trunk/bzip2/bzip2-1.0.3-remove_tempfile-1.patch
===================================================================
--- trunk/bzip2/bzip2-1.0.3-remove_tempfile-1.patch	2006-02-20 07:29:38 UTC (rev 1410)
+++ trunk/bzip2/bzip2-1.0.3-remove_tempfile-1.patch	2006-02-20 07:44:37 UTC (rev 1411)
@@ -6,7 +6,7 @@
 Description: Removes Dependency of tempfile
  
 --- bzip2-1.0.3/bzdiff.orig	2004-10-09 11:29:42.000000000 +0000
-+++ bzip2-1.0.3/bzdiff	2006-02-20 07:15:01.000000000 +0000
++++ bzip2-1.0.3/bzdiff	2006-02-20 07:43:08.000000000 +0000
 @@ -37,10 +37,6 @@
  	echo "Usage: $prog [${comp}_options] file [file]"
  	exit 1
@@ -18,7 +18,7 @@
  set $FILES
  if test $# -eq 1; then
  	FILE=`echo "$1" | sed 's/.bz2$//'`
-@@ -53,10 +49,10 @@
+@@ -53,19 +49,20 @@
                  case "$2" in
  	        *.bz2)
  			F=`echo "$2" | sed 's|.*/||;s|.bz2$||'`
@@ -30,9 +30,11 @@
 -			/bin/rm -f $tmp;;
 +			/bin/rm -f /tmp/"$F".$$;;
  
-                 *)      bzip2 -cdfq "$1" | $comp $OPTIONS - "$2"
+-                *)      bzip2 -cdfq "$1" | $comp $OPTIONS - "$2"
++                *)      bzip2 -cdfq "$1" | $comp $OPTIONS - "$2" | sed -e "s|Files - and /tmp/"$F".$$|Files $1 and $2|g"
                          STAT="$?";;
-@@ -65,7 +61,8 @@
+                 esac;;
+         *)      case "$2" in
  	        *.bz2)
                          bzip2 -cdfq "$2" | $comp $OPTIONS "$1" -
                          STAT="$?";;




More information about the patches mailing list