[DRE-commits] r1272 - in packages/libgems-ruby/trunk/debian: . patches

[Daigo Moriwaki]

Author: daigo-guest
Date: 2007-01-15 12:44:15 +0100 (Mon, 15 Jan 2007)
New Revision: 1272

Added:
   packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
Modified:
   packages/libgems-ruby/trunk/debian/changelog
   packages/libgems-ruby/trunk/debian/patches/00list
Log:
* Installing gems on s390 did not work because of an IO.seek trouble.
  Add a patch (debian/patches/21_avoid_ioseek.dpatch) for a workaround.
  (Closes: #406388)

Modified: packages/libgems-ruby/trunk/debian/changelog
===================================================================
--- packages/libgems-ruby/trunk/debian/changelog	2007-01-11 12:16:55 UTC (rev 1271)
+++ packages/libgems-ruby/trunk/debian/changelog	2007-01-15 11:44:15 UTC (rev 1272)
@@ -1,8 +1,10 @@
-libgems-ruby (0.9.0-6) UNRELEASED; urgency=low
+libgems-ruby (0.9.0-6) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Installing gems on s390 did not work because of an IO.seek trouble.
+    Add a patch (debian/patches/21_avoid_ioseek.dpatch) for a workaround.
+    (Closes: #406388)
 
- -- Daigo Moriwaki <daigo at debian.org>  Fri, 13 Oct 2006 12:55:37 +0900
+ -- Daigo Moriwaki <daigo at debian.org>  Mon, 15 Jan 2007 20:36:33 +0900
 
 libgems-ruby (0.9.0-5) unstable; urgency=medium
 

Modified: packages/libgems-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/00list	2007-01-11 12:16:55 UTC (rev 1271)
+++ packages/libgems-ruby/trunk/debian/patches/00list	2007-01-15 11:44:15 UTC (rev 1272)
@@ -8,6 +8,7 @@
 08_tighter_search_regex.dpatch
 09_installer.dpatch 
 10_datadir.dpatch
+21_avoid_ioseek.dpatch 
 #90_opensuse_gem_commands.dpatch
 #91_opensuse_installer.dpatch
 #92_opensuse_gem_commands.dpatch

Added: packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch	2007-01-11 12:16:55 UTC (rev 1271)
+++ packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch	2007-01-15 11:44:15 UTC (rev 1272)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21_avoid_ioseek.dpatch by Daigo Moriwaki <daigo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/lib/rubygems/package.rb trunk/lib/rubygems/package.rb
+--- trunk~/lib/rubygems/package.rb	2006-06-14 12:39:45.000000000 +0900
++++ trunk/lib/rubygems/package.rb	2007-01-15 20:30:42.000000000 +0900
+@@ -444,17 +444,17 @@
+             size = entry.size
+             yield entry
+             skip = (512 - (size % 512)) % 512
+-            if @io.respond_to? :seek
+-                # avoid reading...
+-                @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
+-            else
++            #if @io.respond_to? :seek
++            #    # avoid reading...
++            #    @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
++            #else
+                 pending = size - entry.bytes_read
+                 while pending > 0
+                     bread = @io.read([pending, 4096].min).size
+                     raise UnexpectedEOF if @io.eof?
+                     pending -= bread
+                 end
+-            end
++            #end
+             @io.read(skip) # discard trailing zeros
+             # make sure nobody can use #read, #getc or #rewind anymore
+             entry.close


Property changes on: packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
___________________________________________________________________
Name: svn:executable
   + *