[DRE-commits] [schleuder] 52/52: New upstream version 3.0.2

Georg Faerber georg-alioth-guest at moszumanska.debian.org
Mon Feb 6 11:21:23 UTC 2017


This is an automated email from the git hooks/post-receive script.

georg-alioth-guest pushed a commit to branch master
in repository schleuder.

commit 28b4b0164c9e898943ad25e5011de90cb2dcd900
Author: Georg Faerber <georg at riseup.net>
Date:   Mon Feb 6 02:53:09 2017 +0100

    New upstream version 3.0.2
---
 CHANGELOG.md                                | 19 +++++++++++++++++++
 Gemfile.lock                                |  2 +-
 README.md                                   |  8 ++++----
 etc/schleuder.cron.weekly                   |  4 +---
 lib/schleuder/cli.rb                        |  4 ++--
 lib/schleuder/version.rb                    |  2 +-
 locales/en.yml                              |  2 +-
 schleuder.gemspec                           |  2 +-
 spec/schleuder.yml                          |  2 +-
 spec/schleuder/integration/keywords_spec.rb |  2 +-
 spec/sks-mock.rb                            |  5 ++---
 spec/spec_helper.rb                         |  1 +
 12 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40a7194..bc9bd4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format of this file is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [3.0.2] / 2017-02-01
+
+### Changed
+
+* Use less usual IP and port number for mock SKS-server. Previously this conflicted with actual SKS-servers running on the same machine.
+
+
+### Added
+
+* Call refresh_keys in provided crontab-script.
+
+
+### Fixed
+
+* Fixed importing member-fingerprints when migrating a list.
+* Fix clearing passphrase during list-migration with GnuPG 2.0.x by actually shipping the required pinentry-script.
+* Corrected english phrasing and spelling for error message in case of wrong argument to listname-keyword. (Thanks, dkg!)
+
+
 ## [3.0.1] / 2017-01-26
 
 ### Fixed
diff --git a/Gemfile.lock b/Gemfile.lock
index 7de45c4..70ddaca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    schleuder (3.0.1)
+    schleuder (3.0.2)
       activerecord (~> 4.1)
       mail-gpg (~> 0.3.0)
       rake (~> 10)
diff --git a/README.md b/README.md
index b528b18..79d1ed8 100644
--- a/README.md
+++ b/README.md
@@ -43,15 +43,15 @@ Additionally these **rubygems** are required (will be installed automatically un
 Installing Schleuder
 ------------
 
-1. Download [the gem](https://0xacab.org/schleuder/schleuder/raw/master/gems/schleuder-3.0.1.gem) and [the OpenPGP-signature](https://0xacab.org/schleuder/schleuder/raw/master/gems/schleuder-3.0.1.gem.sig) and verify:
+1. Download [the gem](https://0xacab.org/schleuder/schleuder/raw/master/gems/schleuder-3.0.2.gem) and [the OpenPGP-signature](https://0xacab.org/schleuder/schleuder/raw/master/gems/schleuder-3.0.2.gem.sig) and verify:
    ```
    gpg --recv-key 0xB3D190D5235C74E1907EACFE898F2C91E2E6E1F3
-   gpg --verify schleuder-3.0.1.gem.sig
+   gpg --verify schleuder-3.0.2.gem.sig
    ```
 
 2. If all went well install the gem:
    ```
-   gem install schleuder-3.0.1.gem
+   gem install schleuder-3.0.2.gem
    ```
 
 3. Set up schleuder:
@@ -131,4 +131,4 @@ GNU GPL 3.0. Please see [LICENSE.txt](LICENSE.txt).
 Alternative Download
 --------------------
 
-Alternatively to the gem-files you can download the latest release as [a tarball](https://0xacab.org/schleuder/schleuder/raw/master/gems/schleuder-3.0.1.tar.gz) and [its OpenPGP-signature](https://0xacab.org/schleuder/schleuder/raw/master/gems/schleuder-3.0.1.tar.gz.sig).
+Alternatively to the gem-files you can download the latest release as [a tarball](https://0xacab.org/schleuder/schleuder/raw/master/gems/schleuder-3.0.2.tar.gz) and [its OpenPGP-signature](https://0xacab.org/schleuder/schleuder/raw/master/gems/schleuder-3.0.2.tar.gz.sig).
diff --git a/etc/schleuder.cron.weekly b/etc/schleuder.cron.weekly
index 2e0b3a1..5f71cc0 100644
--- a/etc/schleuder.cron.weekly
+++ b/etc/schleuder.cron.weekly
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-set -e
 test -x /usr/local/bin/schleuder || exit 0
 
+su -s /bin/sh schleuder -c "/usr/local/bin/schleuder refresh_keys"
 su -s /bin/sh schleuder -c "/usr/local/bin/schleuder check_keys"
-
-exit 0
diff --git a/lib/schleuder/cli.rb b/lib/schleuder/cli.rb
index 87622a3..23df004 100644
--- a/lib/schleuder/cli.rb
+++ b/lib/schleuder/cli.rb
@@ -214,7 +214,7 @@ module Schleuder
 
       # Subscribe members
       YAML.load(File.read(dir + 'members.conf')).each do |member|
-        list.subscribe(member['email'], member['fingerprint'])
+        list.subscribe(member['email'], member['key_fingerprint'])
       end
 
       # Subscribe or flag admins
@@ -224,7 +224,7 @@ module Schleuder
           sub.admin = true
           sub.save!
         else
-          adminfpr = member['fingerprint'] || list.keys(member['email']).first.fingerprint
+          adminfpr = member['key_fingerprint'] || list.keys(member['email']).first.fingerprint
           list.subscribe(member['email'], adminfpr, true)
         end
       end
diff --git a/lib/schleuder/version.rb b/lib/schleuder/version.rb
index 318c12d..ff771b2 100644
--- a/lib/schleuder/version.rb
+++ b/lib/schleuder/version.rb
@@ -1,3 +1,3 @@
 module Schleuder
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end
diff --git a/locales/en.yml b/locales/en.yml
index b1c5758..bfbb090 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -113,7 +113,7 @@ en:
   owner_forward_prefix: The following message was received for the list-owners.
   no_keywords_error: Your message didn't contain any keywords, thus there was nothing to do.
   missing_listname_keyword_error: Your message didn't contain the mandatory X-LISTNAME-keyword, thus it was rejected.
-  wrong_listname_keyword_error: Your message didn't contain a wrong X-LISTNAME-keyword. The value of that keyword muss match the email address of this list.
+  wrong_listname_keyword_error: Your message contained a wrong X-LISTNAME-keyword. The value of that keyword must match the email address of this list.
   bounces_drop_all: The attached message should have been bounced but was dropped without further notice because the list's configuration defines that no message should ever be bounced.
   bounces_drop_on_headers: "The attached message should have been bounced but was dropped without further notice because it matched this header-line: %{key}: %{value}"
   bounces_notify_admins: "The attached message was bounced with the following notice:"
diff --git a/schleuder.gemspec b/schleuder.gemspec
index f9b5844..cb1b506 100644
--- a/schleuder.gemspec
+++ b/schleuder.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage     = "https://schleuder.nadir.org/"
   s.summary      = "Schleuder is a gpg-enabled mailinglist with remailing-capabilities."
   s.description  = "Schleuder is a group's email-gateway: subscribers can exchange encrypted emails among themselves, receive emails from non-subscribers and send emails to non-subscribers via the list.\n\nSchleuder takes care of all decryption and (re-)encryption, stripping of headers, and more. Schleuder can also send out its own public key upon request and process administrative commands by email."
-  s.files        = `git ls-files lib locales etc db/schema.rb README.md Rakefile`.split
+  s.files        = `git ls-files lib locales etc db/schema.rb README.md Rakefile bin/pinentry-clearpassphrase`.split
   s.executables =  %w[schleuder schleuder-api-daemon]
   s.platform     = Gem::Platform::RUBY
   s.require_path = 'lib'
diff --git a/spec/schleuder.yml b/spec/schleuder.yml
index abb0e30..b40dabe 100644
--- a/spec/schleuder.yml
+++ b/spec/schleuder.yml
@@ -6,4 +6,4 @@ lists_dir: /tmp/schleuder-test/
 listlogs_dir: /tmp/schleuder-test/
 smtp_settings:
   port: 2523
-keyserver: hkp://127.0.0.1:11371
+keyserver: hkp://127.9.9.9:9999
diff --git a/spec/schleuder/integration/keywords_spec.rb b/spec/schleuder/integration/keywords_spec.rb
index 703b34b..f132272 100644
--- a/spec/schleuder/integration/keywords_spec.rb
+++ b/spec/schleuder/integration/keywords_spec.rb
@@ -259,7 +259,7 @@ describe "user sends keyword" do
 
     expect(message.to).to eql(['schleuder at example.org'])
     expect(message.to_s).not_to include("Resent: Unencrypted to someone at example.org")
-    expect(message.to_s).to include("Your message didn't contain a wrong X-LISTNAME-keyword. The value of that keyword muss match the email address of this list.")
+    expect(message.to_s).to include("Your message contained a wrong X-LISTNAME-keyword. The value of that keyword must match the email address of this list.")
 
     teardown_list_and_mailer(list)
   end
diff --git a/spec/sks-mock.rb b/spec/sks-mock.rb
index 6d7bd17..b1e6701 100755
--- a/spec/sks-mock.rb
+++ b/spec/sks-mock.rb
@@ -4,9 +4,8 @@ require 'sinatra/base'
 
 class SksMock < Sinatra::Base
   set :environment, :production
-  set :port, 11371
-  set :bind, '127.0.0.1'
-  set :logging, true
+  set :port, 9999
+  set :bind, '127.9.9.9'
 
   get '/status' do
     'ok'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ec293f8..82848ab 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,6 +26,7 @@ RSpec.configure do |config|
   end
 
   config.around(:each) do |example|
+    Mail::TestMailer.deliveries.clear
     DatabaseCleaner.cleaning do
       example.run
     end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/schleuder.git



More information about the Pkg-ruby-extras-commits mailing list