- fix IMAP bug with quicksync support (Dovvecot 1.2.0 triggers)

Changed files:
    ruby-imap-quicksync-fix.patch -> 1.1
    ruby.spec -> 1.193

diff --git a/ruby-imap-quicksync-fix.patch b/ruby-imap-quicksync-fix.patch
new file mode 100644 (file)
index 0000000..ffdb676
--- /dev/null
+++ b/ruby-imap-quicksync-fix.patch
@@ -0,0 +1,26 @@
+Only in ruby-1.8.7-p173/lib/net: .imap.rb.swp
+diff -ur ruby-1.8.7-p173-o/lib/net/imap.rb ruby-1.8.7-p173/lib/net/imap.rb
+--- ruby-1.8.7-p173-o/lib/net/imap.rb  2009-07-07 16:43:28.000000000 -0600
++++ ruby-1.8.7-p173/lib/net/imap.rb    2009-07-07 17:04:30.000000000 -0600
+@@ -2764,11 +2764,16 @@
+           match(T_SPACE)
+           result = ResponseCode.new(name, number)
+         else
+-          match(T_SPACE)
+-          @lex_state = EXPR_CTEXT
+-          token = match(T_TEXT)
+-          @lex_state = EXPR_BEG
+-          result = ResponseCode.new(name, token.value)
++          begin
++            match(T_SPACE)
++          rescue ResponseParseError
++            # Got unexpected atom with no value; ignore
++          else
++            @lex_state = EXPR_CTEXT
++            token = match(T_TEXT)
++            @lex_state = EXPR_BEG
++            result = ResponseCode.new(name, token.value)
++          end  
+         end
+         match(T_RBRA)
+         @lex_state = EXPR_RTEXT

diff --git a/ruby.spec b/ruby.spec
index 68aca1813e295e293b39de266049b0fcbdab1661..55bd05a7290d09b2ce136a24ce2033bb335dc0e0 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -46,6 +46,7 @@ Patch0:               %{name}-info.patch
 Patch1:                %{name}-mkmf-shared.patch
 Patch2:                %{name}-require-rubygems-version.patch
 Patch3:                %{name}-lib64.patch
+Patch4:                %{name}-quicksync-fix.patch
 URL:           http://www.ruby-lang.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -220,6 +221,7 @@ Tryb Ruby i debugger dla Emacsa.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 find -type f \( -name '*.rb' -o -name '*.cgi' -o -name '*.test' -o -name 'ruby.1' \
        -o -name 'ruby.info*' -o -name '*.html' -o -name '*.tcl' -o -name '*.texi' \) \