[DRE-commits] [SCM] sup-mail.git branch, master, updated. debian/0.12.1-1-9-gf1e4d87

[Per Andersson]

The following commit has been merged in the master branch:
commit 59ceb4cf4f924d1ca152c0be22c9d64873d4a8d3
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sat May 19 00:42:12 2012 +0200

    Update call to current GPGME::Data API.

diff --git a/debian/patches/0002-Fix-support-for-gpgme-2.0.patch b/debian/patches/0002-Fix-support-for-gpgme-2.0.patch
index 4414fed..9e68e5b 100644
--- a/debian/patches/0002-Fix-support-for-gpgme-2.0.patch
+++ b/debian/patches/0002-Fix-support-for-gpgme-2.0.patch
@@ -4,16 +4,17 @@ Subject: Fix support for gpgme 2.0
 
 * Add support for gpgme 2.0 and stay backward compatible with 1.0.
 * Add test suite for lib/sup/crypto.rb.
+* Update call to current GPGME::Data API.
 
 Taken from http://gitorious.org/sup/mainline/merge_requests/12
 ---
- lib/sup/crypto.rb   |   39 ++++++++++++++++---
- test/test_crypto.rb |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 140 insertions(+), 6 deletions(-)
+ lib/sup/crypto.rb   |   41 ++++++++++++++++---
+ test/test_crypto.rb |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 142 insertions(+), 7 deletions(-)
  create mode 100755 test/test_crypto.rb
 
 diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb
-index bc96f88..24ecfc2 100644
+index bc96f88..4ddcf70 100644
 --- a/lib/sup/crypto.rb
 +++ b/lib/sup/crypto.rb
 @@ -48,10 +48,17 @@ EOS
@@ -78,6 +79,15 @@ index bc96f88..24ecfc2 100644
      rescue GPGME::Error => exc
        raise Error, gpgme_exc_msg(exc.message)
      end
+@@ -223,7 +246,7 @@ EOS
+       plain_data = nil
+     else
+       signed_text_data = nil
+-      plain_data = GPGME::Data.empty
++      plain_data = GPGME::Data.empty!
+     end
+     begin
+       ctx.verify(sig_data, signed_text_data, plain_data)
 @@ -246,7 +269,11 @@ EOS
                                 {:operation => "decrypt", :options => gpg_opts}) || gpg_opts
      ctx = GPGME::Ctx.new(gpg_opts)
@@ -102,10 +112,10 @@ index bc96f88..24ecfc2 100644
  
 diff --git a/test/test_crypto.rb b/test/test_crypto.rb
 new file mode 100755
-index 0000000..abb4fba
+index 0000000..c7ec88b
 --- /dev/null
 +++ b/test/test_crypto.rb
-@@ -0,0 +1,107 @@
+@@ -0,0 +1,108 @@
 +#!/usr/bin/ruby
 +
 +# tests for sup's crypto libs
@@ -207,6 +217,7 @@ index 0000000..abb4fba
 +            assert_instance_of RMail::Message, signed
 +            assert_instance_of String, (signed.body[1].body)
 +            CryptoManager.verify signed.body[0], signed.body[1], true
++            CryptoManager.verify signed.body[0], signed.body[1], false
 +        end
 +    end
 +

-- 
sup-mail.git