[DRE-commits] [schleuder] 05/07: debian/patches: Refresh for Debian schleuder release 3.0.0~beta17-1
Georg Faerber
georg-alioth-guest at moszumanska.debian.org
Thu Jan 12 19:01:20 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 63beb4feb268f088ea30dbe9908c5669265b7e63
Author: Georg Faerber <georg at riseup.net>
Date: Wed Jan 11 20:13:43 2017 +0100
debian/patches: Refresh for Debian schleuder release 3.0.0~beta17-1
---
debian/patches/0001-lib-fix-paths.patch | 20 +++++-----
debian/patches/0002-etc-fix-paths.patch | 54 ++++++++++++++++-----------
debian/patches/0003-bin-fix-require.patch | 4 +-
debian/patches/0004-spec-remove-bundler.patch | 7 ++--
debian/patches/0005-spec-fix-log-path.patch | 19 ----------
debian/patches/series | 1 -
6 files changed, 49 insertions(+), 56 deletions(-)
diff --git a/debian/patches/0001-lib-fix-paths.patch b/debian/patches/0001-lib-fix-paths.patch
index 0237527..5a0694f 100644
--- a/debian/patches/0001-lib-fix-paths.patch
+++ b/debian/patches/0001-lib-fix-paths.patch
@@ -2,20 +2,20 @@ Description: lib/: Fix paths
Upstream is aware of this patch and we're working on integrating it
upstream.
Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2016-12-06
+Last-Update: 2017-01-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/lib/schleuder/conf.rb
+++ b/lib/schleuder/conf.rb
-@@ -91,7 +91,7 @@
- end
+@@ -6,7 +6,7 @@
- def self.load_defaults(basename)
-- file = Pathname.new(ENV['SCHLEUDER_ROOT']).join("etc/#{basename}.yml")
-+ file = Pathname.new(ENV['SCHLEUDER_CONFIG'])
- if ! file.readable?
- raise RuntimeError, "Error: '#{file}' is not a readable file."
- end
+ DEFAULTS = {
+ 'lists_dir' => '/var/lib/schleuder/lists',
+- 'listlogs_dir' => '/var/lib/schleuder/lists',
++ 'listlogs_dir' => '/var/log/schleuder/lists',
+ 'plugins_dir' => '/etc/schleuder/plugins',
+ 'log_level' => 'warn',
+ 'smtp_settings' => {
--- a/lib/schleuder/cli.rb
+++ b/lib/schleuder/cli.rb
@@ -66,7 +66,7 @@
@@ -29,7 +29,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if Dir.glob("#{Conf.lists_dir}/*/*/members.conf").size > 0
--- a/lib/schleuder.rb
+++ b/lib/schleuder.rb
-@@ -73,6 +73,7 @@
+@@ -74,6 +74,7 @@
end
I18n.load_path += Dir["#{rootdir}/locales/*.yml"]
diff --git a/debian/patches/0002-etc-fix-paths.patch b/debian/patches/0002-etc-fix-paths.patch
index 30cb1c0..1ec6f46 100644
--- a/debian/patches/0002-etc-fix-paths.patch
+++ b/debian/patches/0002-etc-fix-paths.patch
@@ -1,31 +1,43 @@
-Description: etc/: Fix paths used by upstream
- Upstream uses default paths like '/var/schleuder' which obviously
- violate policies and common standards, like FHS for example. We need to
- fix this. Upstream is aware of this patch and we're working on
- integrating it.
+Description: Fix paths used by upstream
+ Logs should go into '/var/log/schleuder'.
+
+ Upstream recently switched the list data dir to '/var/lib/schleuder'.
+ However, this isn't fixed in the manpage yet, so let's take care of
+ this. This part of the patch can be dropped once the next upstream
+ version is released.
Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2016-12-06
+Reviewed-by: Sebastien Badia <sbadia at debian.org>
+Last-Update: 2017-01-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/etc/schleuder.yml
+++ b/etc/schleuder.yml
-@@ -1,8 +1,8 @@
- # Where are the list-directories stored (contain log-files and GnuPG-keyrings).
--lists_dir: /var/schleuder/lists
-+lists_dir: /var/lib/schleuder/lists
+@@ -2,7 +2,7 @@
+ lists_dir: /var/lib/schleuder/lists
# Where to write list-logs. The actual log-file will be <lists_logs_base_dir>/<hostname>/<listname>/list.log.
--listlogs_dir: /var/schleuder/lists
-+listlogs_dir: /var/log/schleuder
+-listlogs_dir: /var/lib/schleuder/lists
++listlogs_dir: /var/log/schleuder/lists
# Schleuder reads plugins also from this directory.
plugins_dir: /etc/schleuder/plugins
-@@ -25,7 +25,7 @@
- database:
- production:
- adapter: 'sqlite3'
-- database: /var/schleuder/db.sqlite
-+ database: /var/lib/schleuder/db.sqlite
-
- # Note: The API-daemon will bind only to localhost if no TLS-cert+keys are available.
- api:
+--- a/man/schleuder.8
++++ b/man/schleuder.8
+@@ -64,7 +64,7 @@
+ For more information on how to integrate Schleuder with your existing mail setup, please read the Schleuder documentation online (\fISEE ALSO\fR)\.
+ .
+ .SS "Data storage"
+-The keyrings for each list are standard GnuPG keyrings and sit in the filesystem under \fIlists_dir\fR/\fIhostname\fR/\fIlistname\fR/ (\fIlists_dir\fR is read from schleuder\.yml, by default it is </var/schleuder/lists>)\. They can be used manually using gpg2\. Please be careful to maintain proper file permissions if you touch the files\.
++The keyrings for each list are standard GnuPG keyrings and sit in the filesystem under \fIlists_dir\fR/\fIhostname\fR/\fIlistname\fR/ (\fIlists_dir\fR is read from schleuder\.yml, by default it is </var/lib/schleuder/lists>)\. They can be used manually using gpg2\. Please be careful to maintain proper file permissions if you touch the files\.
+ .
+ .P
+ In the list\-directory there’s also a list specific log\-file (might be missing if the log\-level is high and no error occurred yet)\.
+@@ -135,7 +135,7 @@
+ \fB/etc/schleuder/list\-defaults\.yml\fR: default path of default list settings
+ .
+ .IP "\(bu" 4
+-\fB/var/schleuder/\fR default path of lists_dir
++\fB/var/lib/schleuder/\fR default path of lists_dir
+ .
+ .IP "\(bu" 4
+ \fB<lists_dir>\fR/\fB<hostname>\fR/`\fIlistname\fR: list internal data
diff --git a/debian/patches/0003-bin-fix-require.patch b/debian/patches/0003-bin-fix-require.patch
index e353fd2..07c6bb6 100644
--- a/debian/patches/0003-bin-fix-require.patch
+++ b/debian/patches/0003-bin-fix-require.patch
@@ -3,7 +3,7 @@ Description: bin/: Use 'require' instead of 'require_relative'
'require_relative' as used by upstream doesn't work.
Upstream is aware of this patch and we're working on integrating it.
Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2016-12-06
+Last-Update: 2017-01-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/bin/schleuder
@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ require 'schleuder/cli'
Schleuder::Cli.start
rescue => exc
- $stderr.puts exc.to_s
+ $stderr.puts "Technical Error: #{exc}\n#{exc.backtrace.first}"
--- a/bin/schleuder-api-daemon
+++ b/bin/schleuder-api-daemon
@@ -7,7 +7,7 @@
diff --git a/debian/patches/0004-spec-remove-bundler.patch b/debian/patches/0004-spec-remove-bundler.patch
index 53c3be3..568a74e 100644
--- a/debian/patches/0004-spec-remove-bundler.patch
+++ b/debian/patches/0004-spec-remove-bundler.patch
@@ -2,16 +2,17 @@ Description: spec/: Remove bundler usage
We don't need bundler, because we're using packages.
Upstream is aware of this patch and we're working on integrating it.
Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2016-12-06
+Last-Update: 2017-01-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-@@ -1,7 +1,5 @@
+@@ -1,8 +1,6 @@
ENV['SCHLEUDER_ENV'] ||= 'test'
ENV['SCHLEUDER_CONFIG'] = 'spec/schleuder.yml'
+ ENV["SCHLEUDER_LIST_DEFAULTS"] = "etc/list-defaults.yml"
-require 'bundler/setup'
-Bundler.setup
require 'schleuder'
require 'database_cleaner'
-
+ require 'factory_girl'
diff --git a/debian/patches/0005-spec-fix-log-path.patch b/debian/patches/0005-spec-fix-log-path.patch
deleted file mode 100644
index 3437e40..0000000
--- a/debian/patches/0005-spec-fix-log-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: spec/: Comment (to disable) failing test
- One of the test provided by upstream is currently failing. This is
- fixed already in the master upstream branch, and will be included in
- the next release. Up until then, we're disabling the test.
-Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2016-12-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/schleuder/list_spec.rb
-+++ b/spec/schleuder/list_spec.rb
-@@ -270,7 +270,7 @@
- fingerprint: "aaaadddd0000999",
- )
-
-- expect(list.logfile).to eq "/var/schleuder/lists/bar.org/foo/list.log"
-+ #expect(list.logfile).to eq File.join(Schleuder::Conf.listlogs_dir, "bar.org/foo/list.log")
- end
- end
-
diff --git a/debian/patches/series b/debian/patches/series
index ee0b7b4..035e489 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0001-lib-fix-paths.patch
-0005-spec-fix-log-path.patch
0004-spec-remove-bundler.patch
0003-bin-fix-require.patch
0002-etc-fix-paths.patch
--
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