packages: perl-Image-Info/perl-Image-Info-perl5.6-segv.patch - adjusted for...

[amateja]

Author: amateja                      Date: Wed Aug 26 07:11:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted for 1.29

---- Files affected:
packages/perl-Image-Info:
   perl-Image-Info-perl5.6-segv.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/perl-Image-Info/perl-Image-Info-perl5.6-segv.patch
diff -u packages/perl-Image-Info/perl-Image-Info-perl5.6-segv.patch:1.1 packages/perl-Image-Info/perl-Image-Info-perl5.6-segv.patch:1.2
--- packages/perl-Image-Info/perl-Image-Info-perl5.6-segv.patch:1.1	Fri Feb 14 22:13:24 2003
+++ packages/perl-Image-Info/perl-Image-Info-perl5.6-segv.patch	Wed Aug 26 09:11:18 2009
@@ -1,6 +1,6 @@
---- Image-Info-1.12/lib/Image/Info/JPEG.pm.orig	Tue Dec 31 01:03:06 2002
-+++ Image-Info-1.12/lib/Image/Info/JPEG.pm	Fri Feb 14 20:38:23 2003
-@@ -55,27 +55,6 @@
+--- Image-Info-1.29/lib/Image/Info/JPEG.pm.orig	2009-07-08 22:18:22.000000000 +0200
++++ Image-Info-1.29/lib/Image/Info/JPEG.pm	2009-08-26 09:05:45.000000000 +0200
+@@ -59,27 +59,6 @@
      $buf;
  }
  
@@ -28,7 +28,7 @@
  sub process_file
  {
      my($info, $fh, $cnf) = @_;
-@@ -226,9 +205,9 @@
+@@ -238,9 +217,9 @@
  
      if ($code == 0x10) {
  	eval {
@@ -41,16 +41,16 @@
  	};
  	$info->push_info(1, "error" => $@) if $@;
      }
-@@ -261,9 +240,9 @@
- 	    my $jdata = substr($data, $ipos, $ilen);
- 	    #$info->push_info($i, "JPEGImage" => $jdata);
+@@ -283,9 +262,9 @@
+ 		my $jdata = substr($data, $ipos, $ilen);
+ 		#$info->push_info($i, "JPEGImage" => $jdata);
  
--	    with_io_string {
--		_process_file($info, $_, $i);
--	    } $jdata;
-+	    require IO::String;
-+	    my $fh = IO::String->new($jdata);
-+	    _process_file($info, $fh, $i);
+-		with_io_string {
+-		    _process_file($info, $_, $i);
+-		} $jdata;
++		require IO::String;
++		my $fh = IO::String->new($jdata);
++		_process_file($info, $fh, $i);
+ 	    }
  	}
  
- 	# Turn XResolution/YResolution into 'resolution'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Image-Info/perl-Image-Info-perl5.6-segv.patch?r1=1.1&r2=1.2&f=u