Package: ruby1.9.1
Version: 1.9.3.194-7
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

While merging 1.9.3.194-7 into Ubuntu Raring, I noticed a new error in
one of the build tests. test_open_nul throws a NoMethodError for
assert_file_not, which doesn't exist in 1.9.3. The upstream 1.9.3 tree
has a slightly different version of the test that works properly.

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/CVE-2012-4522.patch: Adjust patch to fix build test error.
    Use the version of the fix from upstream's 1.9.3 tree to fix the
    NoMethodError for assert_file_not, which doesn't exist in 1.9.3. Adjust
    the Origin patch tag accordingly.


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ruby1.9.1-1.9.3.194/debian/patches/CVE-2012-4522.patch ruby1.9.1-1.9.3.194/debian/patches/CVE-2012-4522.patch
--- ruby1.9.1-1.9.3.194/debian/patches/CVE-2012-4522.patch	2013-02-13 02:20:34.000000000 -0800
+++ ruby1.9.1-1.9.3.194/debian/patches/CVE-2012-4522.patch	2013-02-21 10:26:30.000000000 -0800
@@ -2,7 +2,7 @@
  This is a fix for CVE-2012-4522.
 Author: Nobuyoshi Nakada  <n...@ruby-lang.org>
 Bug-Debian: http://bugs.debian.org/690670
-Origin: upstream, https://github.com/ruby/ruby/commit/7085db45e4f15a58f9a82c8815bcc31364e0fde1
+Origin: upstream, http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=37164
 Reviewed-By: Antonio Terceiro <terce...@debian.org>
 
 --- ruby1.9.1-1.9.3.194.orig/file.c
@@ -30,7 +30,7 @@
 +      assert_raise(ArgumentError) do
 +        open(path + "\0bar", "w") {}
 +      end
-+      assert_file_not(:exist?, path)
++      refute File.exist?(path)
 +    end
 +  end
  end

Reply via email to