gpgme 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65993f7a3db501f55c06f44ca45ffba42aca481
-  data.tar.gz: 8e7b33418f70db73635f0c6cb7c1b8ec8684542a
+  metadata.gz: f4029d3a91ef53cbba61b60cadc0ae5a990de620
+  data.tar.gz: d54ecce41c072bc922f50be17510f209ca0327c6
 SHA512:
-  metadata.gz: 496b076d1eb632a40a6b18b88338060a26f1966e3fb81c3a02012894e6db877a80346f3493d7567a999fb8187797c297fc1d19918bb895e73e61fe277610cc11
-  data.tar.gz: 83974877c9b57b0284022f5660e442961f3d5d6db30636e28fac1ce24d5c0092940ba613816a79ca13befee61e88892b2f090861527fa904ce3224d3fe3eea8b
+  metadata.gz: d6af9b82d68f349f8d774683f04740036d743c3c2801f49e9a53d3b94af26d8b045a31e4b23e737f6b21418bba26f7c038ea59bef8650125fbe7b160aa52c624
+  data.tar.gz: c38ed6111d7ebb79e87276c81fac76bc5e38af4e61065a1042c3fa8d297040e9c796ad50f0b25a5b363a0801bf4d3fb9b904d5169663ee80e8b12906b586ee0c

data/ext/gpgme/extconf.rb

@@ -62,7 +62,7 @@ EOS
   require 'rubygems'
   require 'mini_portile'
 
-  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.12').tap do |recipe|
+  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.13').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = ["ftp://ftp.gnupg.org/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2"]
     recipe.configure_options = [
@@ -96,7 +96,7 @@ EOS
     recipe.activate
   end
 
-  gpgme_recipe = MiniPortile.new('gpgme', '1.4.3').tap do |recipe|
+  gpgme_recipe = MiniPortile.new('gpgme', '1.5.0').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = ["ftp://ftp.gnupg.org/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2"]
     recipe.configure_options = [
@@ -104,6 +104,10 @@ EOS
       '--enable-static',
       "--with-gpg-error-prefix=#{libgpg_error_recipe.path}",
       "--with-libassuan-prefix=#{libassuan_recipe.path}",
+      # GPGME 1.5.0 assumes gpgsm is present if gpgconf is found.
+      # However, on some systems (e.g. Debian), they are splitted into
+      # separate packages.
+      '--disable-gpgsm-test',
       "CFLAGS='-fPIC #{ENV["CFLAGS"]}'",
     ]
     checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"

data/ext/gpgme/gpgme_n.c

@@ -132,6 +132,15 @@ static VALUE cEngineInfo,
   cImportStatus,
   cImportResult;
 
+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER >= 0x010500
+static VALUE
+rb_s_gpgme_get_dirinfo (VALUE dummy, VALUE vwhat)
+{
+  const char *result = gpgme_get_dirinfo (StringValueCStr(vwhat));
+  return result ? rb_str_new2 (result) : Qnil;
+}
+#endif
+
 static VALUE
 rb_s_gpgme_check_version (VALUE dummy, VALUE vreq)
 {
@@ -809,6 +818,10 @@ save_gpgme_key_attrs (VALUE vkey, gpgme_key_t key)
         rb_iv_set (vsubkey, "@fpr", rb_str_new2 (subkey->fpr));
       rb_iv_set (vsubkey, "@timestamp", LONG2NUM(subkey->timestamp));
       rb_iv_set (vsubkey, "@expires", LONG2NUM(subkey->expires));
+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER >= 0x010500
+      if (subkey->curve)
+	rb_iv_set (vsubkey, "@curve", rb_str_new2 (subkey->curve));
+#endif
       rb_ary_push (vsubkeys, vsubkey);
     }
   vuids = rb_ary_new ();
@@ -1988,6 +2001,96 @@ rb_s_gpgme_wait (VALUE dummy, VALUE vctx, VALUE rstatus, VALUE vhang)
   return Qnil;
 }
 
+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER >= 0x010500
+static VALUE
+rb_s_gpgme_op_spawn_start (VALUE dummy, VALUE vctx, VALUE vfile,
+			   VALUE vargv, VALUE vdatain, VALUE vdataout,
+			   VALUE vdataerr, VALUE vflags)
+{
+  gpgme_ctx_t ctx;
+  const char *file;
+  const char **argv;
+  gpgme_data_t datain = NULL;
+  gpgme_data_t dataout = NULL;
+  gpgme_data_t dataerr = NULL;
+  gpgme_error_t err;
+
+  CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);
+
+  UNWRAP_GPGME_CTX(vctx, ctx);
+  if (!ctx)
+    rb_raise (rb_eArgError, "released ctx");
+
+  file = StringValueCStr(vfile);
+
+  if (NIL_P(vargv))
+    argv = NULL;
+  else
+    {
+      int i;
+
+      argv = ALLOC_N(const char *, RARRAY_LEN(vargv) + 1);
+      for (i = 0; i < RARRAY_LEN(vargv); i++)
+	argv[i] = StringValueCStr(RARRAY_PTR(vargv)[i]);
+      argv[i] = NULL;
+    }
+
+  UNWRAP_GPGME_DATA(vdatain, datain);
+  UNWRAP_GPGME_DATA(vdataout, dataout);
+  UNWRAP_GPGME_DATA(vdataerr, dataerr);
+
+  err = gpgme_op_spawn_start (ctx, file, argv, datain, dataout, dataerr,
+			      NUM2INT(vflags));
+  if (argv)
+    xfree (argv);
+  return LONG2NUM(err);
+}
+
+static VALUE
+rb_s_gpgme_op_spawn (VALUE dummy, VALUE vctx, VALUE vfile,
+		     VALUE vargv, VALUE vdatain, VALUE vdataout,
+		     VALUE vdataerr, VALUE vflags)
+{
+  gpgme_ctx_t ctx;
+  const char *file;
+  const char **argv;
+  gpgme_data_t datain = NULL;
+  gpgme_data_t dataout = NULL;
+  gpgme_data_t dataerr = NULL;
+  gpgme_error_t err;
+
+  CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);
+
+  UNWRAP_GPGME_CTX(vctx, ctx);
+  if (!ctx)
+    rb_raise (rb_eArgError, "released ctx");
+
+  file = StringValueCStr(vfile);
+
+  if (NIL_P(vargv))
+    argv = NULL;
+  else
+    {
+      int i;
+
+      argv = ALLOC_N(const char *, RARRAY_LEN(vargv) + 1);
+      for (i = 0; i < RARRAY_LEN(vargv); i++)
+	argv[i] = StringValueCStr(RARRAY_PTR(vargv)[i]);
+      argv[i] = NULL;
+    }
+
+  UNWRAP_GPGME_DATA(vdatain, datain);
+  UNWRAP_GPGME_DATA(vdataout, dataout);
+  UNWRAP_GPGME_DATA(vdataerr, dataerr);
+
+  err = gpgme_op_spawn (ctx, file, argv, datain, dataout, dataerr,
+			NUM2INT(vflags));
+  if (argv)
+    xfree (argv);
+  return LONG2NUM(err);
+}
+#endif
+
 void
 Init_gpgme_n (void)
 {
@@ -1995,6 +2098,10 @@ Init_gpgme_n (void)
 
   mGPGME = rb_define_module ("GPGME");
 
+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER >= 0x010500
+  rb_define_module_function (mGPGME, "gpgme_get_dirinfo",
+			     rb_s_gpgme_get_dirinfo, 1);
+#endif
   rb_define_module_function (mGPGME, "gpgme_check_version",
 			     rb_s_gpgme_check_version, 1);
   rb_define_module_function (mGPGME, "gpgme_engine_check_version",
@@ -2238,11 +2345,23 @@ Init_gpgme_n (void)
   rb_define_module_function (mGPGME, "gpgme_wait",
 			     rb_s_gpgme_wait, 3);
 
+  /* Running other Programs */
+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER >= 0x010500
+  rb_define_module_function (mGPGME, "gpgme_op_spawn",
+			     rb_s_gpgme_op_spawn, 7);
+  rb_define_module_function (mGPGME, "gpgme_op_spawn_start",
+			     rb_s_gpgme_op_spawn_start, 7);
+#endif
+
   /* gpgme_pubkey_algo_t */
   rb_define_const (mGPGME, "GPGME_PK_RSA", INT2FIX(GPGME_PK_RSA));
   rb_define_const (mGPGME, "GPGME_PK_DSA", INT2FIX(GPGME_PK_DSA));
   rb_define_const (mGPGME, "GPGME_PK_ELG", INT2FIX(GPGME_PK_ELG));
   rb_define_const (mGPGME, "GPGME_PK_ELG_E", INT2FIX(GPGME_PK_ELG_E));
+  /* This algorithm was added in 1.5.0. */
+#ifdef GPGME_PK_ECC
+  rb_define_const (mGPGME, "GPGME_PK_ECC", INT2FIX(GPGME_PK_ECC));
+#endif
 
   /* gpgme_hash_algo_t */
   rb_define_const (mGPGME, "GPGME_MD_MD5", INT2FIX(GPGME_MD_MD5));
@@ -2251,6 +2370,10 @@ Init_gpgme_n (void)
   rb_define_const (mGPGME, "GPGME_MD_MD2", INT2FIX(GPGME_MD_MD2));
   rb_define_const (mGPGME, "GPGME_MD_TIGER", INT2FIX(GPGME_MD_TIGER));
   rb_define_const (mGPGME, "GPGME_MD_HAVAL", INT2FIX(GPGME_MD_HAVAL));
+  /* This algorithm was added in 1.5.0. */
+#ifdef GPGME_MD_SHA224
+  rb_define_const (mGPGME, "GPGME_MD_SHA224", INT2FIX(GPGME_MD_SHA224));
+#endif
   rb_define_const (mGPGME, "GPGME_MD_SHA256", INT2FIX(GPGME_MD_SHA256));
   rb_define_const (mGPGME, "GPGME_MD_SHA384", INT2FIX(GPGME_MD_SHA384));
   rb_define_const (mGPGME, "GPGME_MD_SHA512", INT2FIX(GPGME_MD_SHA512));
@@ -2497,6 +2620,11 @@ Init_gpgme_n (void)
   rb_define_const (mGPGME, "GPGME_PROTOCOL_ASSUAN",
 		   INT2FIX(GPGME_PROTOCOL_ASSUAN))
 #endif
+  /* This protocol was added in 1.5.0. */
+#ifdef GPGME_PROTOCOL_SPAWN
+  rb_define_const (mGPGME, "GPGME_PROTOCOL_SPAWN",
+                   INT2FIX(GPGME_PROTOCOL_SPAWN));
+#endif
 
   /* gpgme_status_code_t */
   rb_define_const (mGPGME, "GPGME_STATUS_EOF",
@@ -2653,6 +2781,21 @@ Init_gpgme_n (void)
   rb_define_const (mGPGME, "GPGME_STATUS_PKA_TRUST_GOOD",
 		   INT2FIX(GPGME_STATUS_PKA_TRUST_GOOD));
 #endif
+  /* These status codes were added in 1.5.0. */
+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER >= 0x010500
+  rb_define_const (mGPGME, "GPGME_STATUS_PLAINTEXT_LENGTH",
+                   INT2FIX(GPGME_STATUS_PLAINTEXT_LENGTH));
+  rb_define_const (mGPGME, "GPGME_STATUS_MOUNTPOINT",
+                   INT2FIX(GPGME_STATUS_MOUNTPOINT));
+  rb_define_const (mGPGME, "GPGME_STATUS_PINENTRY_LAUNCHED",
+                   INT2FIX(GPGME_STATUS_PINENTRY_LAUNCHED));
+  rb_define_const (mGPGME, "GPGME_STATUS_ATTRIBUTE",
+                   INT2FIX(GPGME_STATUS_ATTRIBUTE));
+  rb_define_const (mGPGME, "GPGME_STATUS_BEGIN_SIGNING",
+                   INT2FIX(GPGME_STATUS_BEGIN_SIGNING));
+  rb_define_const (mGPGME, "GPGME_STATUS_KEY_NOT_CREATED",
+		   INT2FIX(GPGME_STATUS_KEY_NOT_CREATED));
+#endif
 
   /* The available keylist mode flags.  */
   rb_define_const (mGPGME, "GPGME_KEYLIST_MODE_LOCAL",
@@ -2705,4 +2848,12 @@ Init_gpgme_n (void)
   rb_define_const (mGPGME, "GPGME_PINENTRY_MODE_LOOPBACK",
                    INT2FIX(GPGME_PINENTRY_MODE_LOOPBACK));
 #endif
+
+  /* These flags were added in 1.5.0. */
+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER >= 0x010500
+  rb_define_const (mGPGME, "GPGME_SPAWN_DETACHED",
+                   INT2FIX(GPGME_SPAWN_DETACHED));
+  rb_define_const (mGPGME, "GPGME_SPAWN_ALLOW_SET_FG",
+                   INT2FIX(GPGME_SPAWN_ALLOW_SET_FG));
+#endif
 }

data/lib/gpgme/constants.rb

@@ -64,33 +64,35 @@ module GPGME
   MD_RMD160 = GPGME_MD_RMD160
   MD_SHA1 = GPGME_MD_SHA1
   MD_SHA256 = GPGME_MD_SHA256
+  if defined?(MD_SHA224)
+    MD_SHA224 = GPGME_MD_SHA224
+  end
   MD_SHA384 = GPGME_MD_SHA384
   MD_SHA512 = GPGME_MD_SHA512
   MD_TIGER = GPGME_MD_TIGER
-  if defined?(GPGME_PINENTRY_MODE_DEFAULT)
+  if defined?(gpgme_set_pinentry_mode)
     PINENTRY_MODE_DEFAULT = GPGME_PINENTRY_MODE_DEFAULT
-  end
-  if defined?(GPGME_PINENTRY_MODE_ASK)
     PINENTRY_MODE_ASK = GPGME_PINENTRY_MODE_ASK
-  end
-  if defined?(GPGME_PINENTRY_MODE_CANCEL)
     PINENTRY_MODE_CANCEL = GPGME_PINENTRY_MODE_CANCEL
-  end
-  if defined?(GPGME_PINENTRY_MODE_ERROR)
     PINENTRY_MODE_ERROR = GPGME_PINENTRY_MODE_ERROR
-  end
-  if defined?(GPGME_PINENTRY_MODE_LOOPBACK)
     PINENTRY_MODE_LOOPBACK = GPGME_PINENTRY_MODE_LOOPBACK
+    PINENTRY_MODE_NAMES = {
+      PINENTRY_MODE_DEFAULT  => :default,
+      PINENTRY_MODE_ASK      => :ask,
+      PINENTRY_MODE_CANCEL   => :cancel,
+      PINENTRY_MODE_ERROR    => :error,
+      PINENTRY_MODE_LOOPBACK => :loopback
+    }
   end
   PK_DSA = GPGME_PK_DSA
   PK_ELG = GPGME_PK_ELG
   PK_ELG_E = GPGME_PK_ELG_E
   PK_RSA = GPGME_PK_RSA
+  if defined?(GPGME_PK_ECC)
+    PK_ECC = GPGME_PK_ECC
+  end
   PROTOCOL_CMS = GPGME_PROTOCOL_CMS
   PROTOCOL_OpenPGP = GPGME_PROTOCOL_OpenPGP
-  if defined?(GPGME_PROTOCOL_ASSUAN)
-    PROTOCOL_ASSUAN = GPGME_PROTOCOL_ASSUAN
-  end
   SIGSUM_BAD_POLICY = GPGME_SIGSUM_BAD_POLICY
   SIGSUM_CRL_MISSING = GPGME_SIGSUM_CRL_MISSING
   SIGSUM_CRL_TOO_OLD = GPGME_SIGSUM_CRL_TOO_OLD
@@ -169,6 +171,24 @@ module GPGME
   if defined?(GPGME_STATUS_PKA_TRUST_GOOD)
     STATUS_PKA_TRUST_GOOD = GPGME_STATUS_PKA_TRUST_GOOD
   end
+  if defined?(GPGME_STATUS_PLAINTEXT_LENGTH)
+    STATUS_PLAINTEXT_LENGTH = GPGME_STATUS_PLAINTEXT_LENGTH
+  end
+  if defined?(GPGME_STATUS_MOUNTPOINT)
+    STATUS_MOUNTPOINT = GPGME_STATUS_MOUNTPOINT
+  end
+  if defined?(GPGME_STATUS_PINENTRY_LAUNCHED)
+    STATUS_PINENTRY_LAUNCHED = GPGME_STATUS_PINENTRY_LAUNCHED
+  end
+  if defined?(GPGME_STATUS_ATTRIBUTE)
+    STATUS_ATTRIBUTE = GPGME_STATUS_ATTRIBUTE
+  end
+  if defined?(GPGME_STATUS_BEGIN_SIGNING)
+    STATUS_BEGIN_SIGNING = GPGME_STATUS_BEGIN_SIGNING
+  end
+  if defined?(GPGME_STATUS_KEY_NOT_CREATED)
+    STATUS_KEY_NOT_CREATED = GPGME_STATUS_KEY_NOT_CREATED
+  end
   STATUS_POLICY_URL = GPGME_STATUS_POLICY_URL
   STATUS_PROGRESS = GPGME_STATUS_PROGRESS
   STATUS_RSA_OR_IDEA = GPGME_STATUS_RSA_OR_IDEA
@@ -201,6 +221,18 @@ module GPGME
     PROTOCOL_CMS      => :CMS
   }
 
+  if defined?(GPGME_PROTOCOL_ASSUAN)
+    PROTOCOL_ASSUAN = GPGME_PROTOCOL_ASSUAN
+    PROTOCOL_NAMES[PROTOCOL_ASSUAN] = :ASSUAN
+  end
+
+  if defined?(GPGME_PROTOCOL_SPAWN)
+    PROTOCOL_SPAWN = GPGME_PROTOCOL_SPAWN
+    PROTOCOL_NAMES[PROTOCOL_SPAWN] = :SPAWN
+    SPAWN_DETACHED = GPGME_SPAWN_DETACHED
+    SPAWN_ALLOW_SET_FG = GPGME_SPAWN_ALLOW_SET_FG
+  end
+
   KEYLIST_MODE_NAMES = {
     KEYLIST_MODE_LOCAL    => :local,
     KEYLIST_MODE_EXTERN   => :extern,
@@ -216,12 +248,4 @@ module GPGME
     VALIDITY_FULL       => :full,
     VALIDITY_ULTIMATE   => :ultimate
   }
-
-  PINENTRY_MODE_NAMES = {
-    PINENTRY_MODE_DEFAULT  => :default,
-    PINENTRY_MODE_ASK      => :ask,
-    PINENTRY_MODE_CANCEL   => :cancel,
-    PINENTRY_MODE_ERROR    => :error,
-    PINENTRY_MODE_LOOPBACK => :loopback
-  }
 end

data/lib/gpgme/ctx.rb

@@ -463,6 +463,13 @@ module GPGME
       cipher
     end
 
+    def spawn(file, argv, datain, dataout, dataerr, flags = 0)
+      err = GPGME::gpgme_op_spawn(self, file, argv, datain, dataout, dataerr,
+                                  flags)
+      exc = GPGME::error_to_exception(err)
+      raise exc if exc
+    end
+
     def inspect
       "#<#{self.class} protocol=#{PROTOCOL_NAMES[protocol] || protocol}, \
 armor=#{armor}, textmode=#{textmode}, \

data/lib/gpgme/engine.rb

@@ -71,6 +71,17 @@ module GPGME
         current = info.first
         set_info current.protocol, current.file_name, home_dir
       end
+
+      ##
+      # Return the default configuration.
+      #
+      # @example
+      #   GPGME::Engine.dirinfo('homedir')
+      #   # => '/home/user/.gnupg"
+      #
+      def dirinfo(what)
+        GPGME::gpgme_get_dirinfo(what)
+      end
     end # class << self
   end # class Engine
 end # module GPGME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpgme
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Daiki Ueno
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -142,8 +148,8 @@ files:
 - examples/genkey.rb
 - examples/keylist.rb
 - examples/edit.rb
-- ports/archives/libgpg-error-1.12.tar.bz2
-- ports/archives/gpgme-1.4.3.tar.bz2
+- ports/archives/libgpg-error-1.13.tar.bz2
+- ports/archives/gpgme-1.5.0.tar.bz2
 - ports/archives/libassuan-2.1.1.tar.bz2
 homepage: http://github.com/ueno/ruby-gpgme
 licenses: