Update to 4.0.3

3 files changed, 6 insertions, 198 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3d34b06a4f1..7d21e907820d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = schleuder
 	pkgdesc = An encrypting mailing list manager with remailing-capabilities
-	pkgver = 4.0.2
+	pkgver = 4.0.3
 	pkgrel = 1
 	url = https://schleuder.org
 	arch = any
@@ -28,15 +28,13 @@ pkgbase = schleuder
 	depends = ruby-thin
 	depends = ruby-thor
 	options = !emptydirs
-	source = https://0xacab.org/schleuder/schleuder/-/archive/schleuder-4.0.2/schleuder-schleuder-4.0.2.tar.gz
+	source = https://0xacab.org/schleuder/schleuder/-/archive/schleuder-4.0.3/schleuder-schleuder-4.0.3.tar.gz
 	source = sysuser_schleuder.conf
 	source = tmpfile_schleuder.conf
 	source = log_gpg_warnings.patch
-	source = dirnmngr_standard_resolver.patch
-	sha512sums = 4ffb2571b935ffc2fe8d348fafb2c01d96f04e9611797ebf104b72834c6026a70d2ec51879ba63b0d00a6c3154a33db39856a9f55d0fc1642b20933d9fa2c20c
+	sha512sums = faf442ecb01829fc74b7c10748405164b13f231be1f562313a3800118af084f0b0d8b2d01dea5f113c04a924cb2bb1c3218beb7c0a66728a2e68132705b0e136
 	sha512sums = 91e37c2b35512ce0633d7c720ba3f16c2c077771308a7fe9d009d382b9ca4c57dba230f0ed4e7d2eab11f785cbf288b85bb1e5e32e03b0beee97a338019348d3
 	sha512sums = 5a355d32c12ef4598d2ce7b8812666d9ba415d1b1e935a5da5ddb528883acb5ec1d73cf3f1ca2df4b222126495356a55ce649943818e606876734fcf7ba8d8d7
 	sha512sums = a99571e9f1bb979eff3648b22b53f8deb8eac767502f30b6aa2d81525aeea4619c0d148b4509b3f020ca8a1c8d08994c08963c1fff09ea8ab885b6c05c1c7ec3
-	sha512sums = 3d68960a157bd8c5cafcf142713a65336ac683acebadfb4f060fdf2898b9adf3d691d1dd524f53d358c0513a5bb890bd347e5fc486b22ae09a04c9c33d17b3a7
 
 pkgname = schleuder
diff --git a/PKGBUILD b/PKGBUILD
index 5727b6c9a49d..d4b4936a39e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: annotat <post@annotat.net>
 
 pkgname='schleuder'
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=1
 pkgdesc='An encrypting mailing list manager with remailing-capabilities'
 arch=(any)
@@ -18,20 +18,16 @@ source=("https://0xacab.org/schleuder/schleuder/-/archive/schleuder-${pkgver}/sc
         # these patches are planned to be included in the next major release in schleuder
         # this patch is based on https://0xacab.org/schleuder/schleuder/-/merge_requests/377 (without CHANGELOG.md changes)
         "log_gpg_warnings.patch"
-        # this patch is based on https://salsa.debian.org/ruby-team/schleuder/-/raw/master/debian/patches/0008-dirmngr-no-tor-standard-resolver.patch
-        "dirnmngr_standard_resolver.patch"
 )
-sha512sums=('4ffb2571b935ffc2fe8d348fafb2c01d96f04e9611797ebf104b72834c6026a70d2ec51879ba63b0d00a6c3154a33db39856a9f55d0fc1642b20933d9fa2c20c'
+sha512sums=('faf442ecb01829fc74b7c10748405164b13f231be1f562313a3800118af084f0b0d8b2d01dea5f113c04a924cb2bb1c3218beb7c0a66728a2e68132705b0e136'
             '91e37c2b35512ce0633d7c720ba3f16c2c077771308a7fe9d009d382b9ca4c57dba230f0ed4e7d2eab11f785cbf288b85bb1e5e32e03b0beee97a338019348d3'
             '5a355d32c12ef4598d2ce7b8812666d9ba415d1b1e935a5da5ddb528883acb5ec1d73cf3f1ca2df4b222126495356a55ce649943818e606876734fcf7ba8d8d7'
-            'a99571e9f1bb979eff3648b22b53f8deb8eac767502f30b6aa2d81525aeea4619c0d148b4509b3f020ca8a1c8d08994c08963c1fff09ea8ab885b6c05c1c7ec3'
-            '3d68960a157bd8c5cafcf142713a65336ac683acebadfb4f060fdf2898b9adf3d691d1dd524f53d358c0513a5bb890bd347e5fc486b22ae09a04c9c33d17b3a7')
+            'a99571e9f1bb979eff3648b22b53f8deb8eac767502f30b6aa2d81525aeea4619c0d148b4509b3f020ca8a1c8d08994c08963c1fff09ea8ab885b6c05c1c7ec3')
 
 prepare() {
   cd "${pkgname}-${pkgname}-${pkgver}"
 
   patch --verbose --strip=1 --input=../log_gpg_warnings.patch
-  patch --verbose --strip=1 --input=../dirnmngr_standard_resolver.patch
 
   # we built based on a tar archive, not a git repo
   sed --in-place 's/git ls-files/find/' "${pkgname}.gemspec"
diff --git a/dirnmngr_standard_resolver.patch b/dirnmngr_standard_resolver.patch
deleted file mode 100644
index c1861cd71ed2..000000000000
--- a/dirnmngr_standard_resolver.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff --git a/spec/schleuder/integration/cli_spec.rb b/spec/schleuder/integration/cli_spec.rb
-index 9dccf8e..e0fd441 100644
---- a/spec/schleuder/integration/cli_spec.rb
-+++ b/spec/schleuder/integration/cli_spec.rb
-@@ -8,6 +8,9 @@ describe 'cli' do
-       list.import_key(File.read('spec/fixtures/expired_key.txt'))
-       list.import_key(File.read('spec/fixtures/olduid_key.txt'))
- 
-+      dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       with_sks_mock(list.listdir) do
-         Cli.new.refresh_keys
-         dirmngr_pid = `pgrep -a dirmngr | grep #{list.listdir}`.split(' ', 2).first
-@@ -31,6 +34,9 @@ describe 'cli' do
-         list.import_key(File.read('spec/fixtures/olduid_key.txt'))
-       end
- 
-+      dirmngr_conf = "#{list1.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       with_sks_mock(list1.listdir) do
-         Cli.new.refresh_keys list1.email
-       end
-diff --git a/spec/schleuder/integration/keywords_spec.rb b/spec/schleuder/integration/keywords_spec.rb
-index 27ced63..4943dde 100644
---- a/spec/schleuder/integration/keywords_spec.rb
-+++ b/spec/schleuder/integration/keywords_spec.rb
-@@ -1276,6 +1276,9 @@ describe 'user sends keyword' do
-     encrypted_mail = Mail::TestMailer.deliveries.first
-     Mail::TestMailer.deliveries.clear
- 
-+    dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+    `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-     with_sks_mock(list.listdir) do
-       begin
-         Schleuder::Runner.new().run(encrypted_mail.to_s, list.request_address)
-@@ -1312,6 +1315,9 @@ describe 'user sends keyword' do
-     encrypted_mail = Mail::TestMailer.deliveries.first
-     Mail::TestMailer.deliveries.clear
- 
-+    dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+    `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-     with_sks_mock(list.listdir) do
-       begin
-         Schleuder::Runner.new().run(encrypted_mail.to_s, list.request_address)
-@@ -1348,6 +1354,9 @@ describe 'user sends keyword' do
-     encrypted_mail = Mail::TestMailer.deliveries.first
-     Mail::TestMailer.deliveries.clear
- 
-+    dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+    `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-     with_sks_mock(list.listdir) do
-       begin
-         Schleuder::Runner.new().run(encrypted_mail.to_s, list.request_address)
-@@ -1385,6 +1394,9 @@ describe 'user sends keyword' do
-     encrypted_mail = Mail::TestMailer.deliveries.first
-     Mail::TestMailer.deliveries.clear
- 
-+    dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+    `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-     with_sks_mock(list.listdir) do
-       begin
-         Schleuder::Runner.new().run(encrypted_mail.to_s, list.request_address)
-@@ -1421,6 +1433,9 @@ describe 'user sends keyword' do
-     encrypted_mail = Mail::TestMailer.deliveries.first
-     Mail::TestMailer.deliveries.clear
- 
-+    dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+    `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-     with_sks_mock(list.listdir) do
-       begin
-         Schleuder::Runner.new().run(encrypted_mail.to_s, list.request_address)
-@@ -1457,6 +1472,9 @@ describe 'user sends keyword' do
-     encrypted_mail = Mail::TestMailer.deliveries.first
-     Mail::TestMailer.deliveries.clear
- 
-+    dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+    `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-     with_sks_mock(list.listdir) do
-       begin
-         Schleuder::Runner.new().run(encrypted_mail.to_s, list.request_address)
-@@ -1493,6 +1511,9 @@ describe 'user sends keyword' do
-     encrypted_mail = Mail::TestMailer.deliveries.first
-     Mail::TestMailer.deliveries.clear
- 
-+    dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+    `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-     with_sks_mock(list.listdir) do
-       begin
-         Schleuder::Runner.new().run(encrypted_mail.to_s, list.request_address)
-@@ -1529,6 +1550,9 @@ describe 'user sends keyword' do
-     encrypted_mail = Mail::TestMailer.deliveries.first
-     Mail::TestMailer.deliveries.clear
- 
-+    dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+    `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-     with_sks_mock(list.listdir) do
-       begin
-         Schleuder::Runner.new().run(encrypted_mail.to_s, list.request_address)
-diff --git a/spec/schleuder/unit/gpgme_ctx_spec.rb b/spec/schleuder/unit/gpgme_ctx_spec.rb
-index 288fd70..677756b 100644
---- a/spec/schleuder/unit/gpgme_ctx_spec.rb
-+++ b/spec/schleuder/unit/gpgme_ctx_spec.rb
-@@ -189,6 +189,9 @@ describe GPGME::Ctx do
-       list.import_key(File.read('spec/fixtures/expired_key.txt'))
-       list.import_key(File.read('spec/fixtures/olduid_key.txt'))
- 
-+      dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       res = ''
-       with_sks_mock(list.listdir) do
-         res = list.gpg.refresh_keys(list.keys)
-@@ -202,6 +205,9 @@ describe GPGME::Ctx do
-       list.subscribe('admin@example.org', nil, true)
-       list.import_key(File.read('spec/fixtures/expired_key.txt'))
- 
-+      dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       res = list.gpg.refresh_keys(list.keys)
- 
-       expect(res).to match(/keyserver refresh failed: Connection refused/)
-@@ -213,6 +219,9 @@ describe GPGME::Ctx do
-       list.subscribe('admin@example.org', nil, true)
-       list.import_key(File.read('spec/fixtures/bla_foo_key.txt'))
- 
-+      dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       res = ''
-       with_sks_mock(list.listdir) do
-         res = list.gpg.refresh_keys(list.keys)
-diff --git a/spec/schleuder/unit/list_spec.rb b/spec/schleuder/unit/list_spec.rb
-index 69792c2..7e8c312 100644
---- a/spec/schleuder/unit/list_spec.rb
-+++ b/spec/schleuder/unit/list_spec.rb
-@@ -514,6 +514,9 @@ describe Schleuder::List do
-       list.subscribe('admin@example.org', nil, true)
-       output = ''
- 
-+      dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       with_sks_mock(list.listdir) do
-         output = list.fetch_keys('98769E8A1091F36BD88403ECF71A3F8412D83889')
-       end
-@@ -528,6 +531,9 @@ describe Schleuder::List do
-       list.subscribe('admin@example.org', nil, true)
-       output = ''
- 
-+      dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       with_sks_mock(list.listdir) do
-         output = list.fetch_keys('http://localhost:9999/keys/example.asc')
-       end
-@@ -542,6 +548,9 @@ describe Schleuder::List do
-       list.subscribe('admin@example.org', nil, true)
-       output = ''
- 
-+      dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       with_sks_mock(list.listdir) do
-         output = list.fetch_keys('admin@example.org')
-       end
-@@ -557,6 +566,9 @@ describe Schleuder::List do
-       list.subscribe('admin@example.org', nil, true)
-       output = ''
- 
-+      dirmngr_conf = "#{list.listdir}/dirmngr.conf"
-+      `printf "no-use-tor\nstandard-resolver" >> "#{dirmngr_conf}"`
-+
-       with_sks_mock(list.listdir) do
-         output = list.fetch_keys('87E65ED2081AE3D16BE4F0A5EBDBE899251F2412')
-       end