gpgme 2.0.22 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4dc4765cd73bfd27c0ebdfff8749106341f2dd7a6c0118a4e3307798b753e84
-  data.tar.gz: 6b929a3f84144a4fdcc40382129bd6ad409e9a819c956f33941a8d650000c70c
+  metadata.gz: 4d6acceab7f41eb6f3921f566fc2bf394658cd2a0a42e84024e3dda8ce19c9a6
+  data.tar.gz: a2e3adb3405cecfa249173693a12a552ed5b13eaeb09c5b4ef45c7fca8af2699
 SHA512:
-  metadata.gz: 387806727ae8b6d8da14fc23ce7c9a24c58373b52f79b4bce8ca1f7de2337e715c488c7af65e30ac8e6e73a18c8d31589b00f80c682f0dcbcce1f4d234cc58a3
-  data.tar.gz: bbfa653feac228f87c430fa61524625d373ff6dd0a33d5c824c50d94db59233ab6161d8ac1b6e475db21ce9908f22b45bce17fff5c6cba92f9bb959b49b297b8
+  metadata.gz: 7ec1990d20648deeaed5c10d1eff1737b96a3b8f9d7dbb7001c21efb8f78ead507429d7e34d1219db2556f0f2fd584bb18362a42fadeaca47fc340153a304261
+  data.tar.gz: ccd721826ffe1077351628f083ece7894fe03c4a754f53eddab814dc4c1642a314dddfeb7157fc0117d9b5ea8f1fc2aad7aba447d377eb755201c625825f92a8

data/ext/gpgme/extconf.rb

@@ -37,13 +37,16 @@ if arg_config('--clean')
 end
 
 if arg_config('--use-system-libraries', ENV['RUBY_GPGME_USE_SYSTEM_LIBRARIES'])
-  unless find_executable('pkg-config')
-    $stderr.puts("pkg-config not found")
+  if find_executable('pkg-config') && system('pkg-config gpgme --exists')
+    $CFLAGS += ' ' << `pkg-config --cflags gpgme`.chomp
+    $libs += ' ' << `pkg-config --libs gpgme`.chomp
+  elsif find_executable('gpgme-config')
+    $CFLAGS += ' ' << `gpgme-config --cflags`.chomp
+    $libs += ' ' << `gpgme-config --libs`.chomp
+  else
+    $stderr.puts("pkg-config with gpgme.pc and gpgme-config not found")
     exit(1)
   end
-
-  $CFLAGS += ' ' << `pkg-config --cflags gpgme`.chomp
-  $libs += ' ' << `pkg-config --libs gpgme`.chomp
 else
   message <<-'EOS'
 ************************************************************************
@@ -62,11 +65,11 @@ EOS
   require 'rubygems'
   require 'mini_portile2'
 
-  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.46').tap do |recipe|
+  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.47').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = [{
       :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
-      :sha256 => 'b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d'
+      :sha256 => '9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb'
     }]
     recipe.configure_options = [
       '--enable-install-gpg-error-config',
@@ -83,11 +86,11 @@ EOS
     recipe.activate
   end
 
-  libassuan_recipe = MiniPortile.new('libassuan', '2.5.5').tap do |recipe|
+  libassuan_recipe = MiniPortile.new('libassuan', '2.5.6').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = [{
       :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
-      :sha256 => '8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4'
+      :sha256 => 'e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426'
     }]
     recipe.configure_options = [
       '--disable-shared',
@@ -103,11 +106,11 @@ EOS
     recipe.activate
   end
 
-  gpgme_recipe = MiniPortile.new('gpgme', '1.18.0').tap do |recipe|
+  gpgme_recipe = MiniPortile.new('gpgme', '1.21.0').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = [{
       :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
-      :sha256 => '361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e'
+      :sha256 => '416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88'
     }]
     recipe.configure_options = [
       '--disable-shared',

data/ext/gpgme/gpgme_n.c

@@ -876,6 +876,7 @@ rb_s_gpgme_op_keylist_start (VALUE dummy, VALUE vctx, VALUE vpattern,
   return LONG2NUM(err);
 }
 
+// https://github.com/rwinlib/gpgme/blob/v1.16.0/include/gpgme.h#L2013-L2015
 static VALUE
 rb_s_gpgme_op_keylist_ext_start (VALUE dummy, VALUE vctx, VALUE vpattern,
                                  VALUE vsecret_only)
@@ -2423,7 +2424,7 @@ Init_gpgme_n (void)
   rb_define_module_function (mGPGME, "gpgme_op_keylist_start",
                              rb_s_gpgme_op_keylist_start, 3);
   rb_define_module_function (mGPGME, "gpgme_op_keylist_ext_start",
-                             rb_s_gpgme_op_keylist_ext_start, 4);
+                             rb_s_gpgme_op_keylist_ext_start, 3);
   rb_define_module_function (mGPGME, "gpgme_op_keylist_next",
                              rb_s_gpgme_op_keylist_next, 2);
   rb_define_module_function (mGPGME, "gpgme_op_keylist_end",

data/lib/gpgme/version.rb

@@ -1,4 +1,4 @@
 module GPGME
   # The version of GPGME ruby binding you are using
-  VERSION = "2.0.22"
+  VERSION = "2.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpgme
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.23
 platform: ruby
 authors:
 - Daiki Ueno
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -131,9 +131,9 @@ files:
 - lib/gpgme/sub_key.rb
 - lib/gpgme/user_id.rb
 - lib/gpgme/version.rb
-- ports/archives/gpgme-1.18.0.tar.bz2
-- ports/archives/libassuan-2.5.5.tar.bz2
-- ports/archives/libgpg-error-1.46.tar.bz2
+- ports/archives/gpgme-1.21.0.tar.bz2
+- ports/archives/libassuan-2.5.6.tar.bz2
+- ports/archives/libgpg-error-1.47.tar.bz2
 - test/crypto_test.rb
 - test/ctx_test.rb
 - test/data_test.rb
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby binding of GPGME.