ruby: updated to 1.8.5-p12

diff --git a/ruby/.footprint b/ruby/.footprint
index e77267b3701338dee9ade8952410e8e73ec643eb..bb2a734b89b8f71b2ded5955af3a67467c0fad6c 100644 (file)
--- a/ruby/.footprint
+++ b/ruby/.footprint
@@ -122,6 +122,7 @@ drwxr-xr-x  root/root       usr/lib/ruby/1.8/linux/
 -rwxr-xr-x     root/root       usr/lib/ruby/1.8/linux/bigdecimal.so
 -rw-r--r--     root/root       usr/lib/ruby/1.8/linux/config.h
 -rwxr-xr-x     root/root       usr/lib/ruby/1.8/linux/curses.so
+-rwxr-xr-x     root/root       usr/lib/ruby/1.8/linux/dbm.so
 -rw-r--r--     root/root       usr/lib/ruby/1.8/linux/defines.h
 -rwxr-xr-x     root/root       usr/lib/ruby/1.8/linux/digest.so
 drwxr-xr-x     root/root       usr/lib/ruby/1.8/linux/digest/

diff --git a/ruby/.md5sum b/ruby/.md5sum
index 3f8d055e79a4c48d6b064de94fa48ffecd2d4767..ec1f4487286e13e037e33cbc0f6ad0caa465f2d1 100644 (file)
--- a/ruby/.md5sum
+++ b/ruby/.md5sum
@@ -1,6 +1,5 @@
-3fbb02294a8ca33d4684055adba5ed6f  ruby-1.8.5.tar.gz
+d7d12dd9124c9b7d55cdbbee313e3931  ruby-1.8.5-p12.tar.gz
 d662b7a68bb88366f2a76b433d765d75  ruby-arch.diff
 9d57b2fefcb86461814462033daff254  ruby-array_shift.diff
-9d25f59d1c33a0b215f6c25260dcb536  ruby-cgi_dos.diff
 8c83dec7591afc3bbea9d8325a7e29b4  ruby-rdoc-multiple_files.diff
 af301cb7830a880e7b30fdba1a64ef97  ruby-valgrind.diff

diff --git a/ruby/Pkgfile b/ruby/Pkgfile
index b697f73bf45e7a141bcff33160935b0d4629087d..a5826f48a0a9ca4fef2ab9097d80a3a55043f36f 100644 (file)
--- a/ruby/Pkgfile
+++ b/ruby/Pkgfile
@@ -6,12 +6,11 @@
 # Depends on:  openssl
 
 name=ruby
-version=1.8.5
-release=2
+version=1.8.5-p12
+release=1
 source=(ftp://ftp.ruby-lang.org/pub/$name/1.8/$name-$version.tar.gz \
         $name-arch.diff $name-valgrind.diff \
-        $name-rdoc-multiple_files.diff $name-array_shift.diff \
-               $name-cgi_dos.diff)
+        $name-rdoc-multiple_files.diff $name-array_shift.diff)
 
 build () {
        cd $name-$version
@@ -20,7 +19,6 @@ build () {
        patch -Np1 -i ../$name-arch.diff
        patch -Np1 -i ../$name-rdoc-multiple_files.diff
        patch -Np1 -i ../$name-array_shift.diff
-       patch -Np0 -i ../$name-cgi_dos.diff
 
        ./configure --prefix=/usr --enable-shared --enable-pthread \
                    --mandir=/usr/man

diff --git a/ruby/ruby-cgi_dos.diff b/ruby/ruby-cgi_dos.diff
deleted file mode 100644 (file)
index a563c65..0000000
--- a/ruby/ruby-cgi_dos.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/cgi.rb.orig    2006-08-22 18:38:19.000000000 +0900
-+++ lib/cgi.rb 2006-11-03 00:18:53.000000000 +0900
-@@ -1018,7 +1018,7 @@ class CGI
-               else
-                 stdinput.read(content_length)
-               end
--          if c.nil?
-+          if c.nil? || c.empty?
-             raise EOFError, "bad content body"
-           end
-           buf.concat(c)