New Upstream Release - tdiary
Ready changes
Summary
Merged new upstream version: 5.2.4 (was: 5.2.3).
Resulting package
Built on 2023-06-09T20:35 (took 7m57s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases tdiary-coreapt install -t fresh-releases tdiary
Lintian Result
Diff
diff --git a/ChangeLog b/ChangeLog
index cd74c3f..f167154 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-29 Tada, Tadashi <t@tdtds.jp>
+ * support rack 3.x
+ * support dalli 3.x
+ * release 5.2.4
+
2022-08-29 Tada, Tadashi <t@tdtds.jp>
* remove Heroku button from README
* release 5.2.3
diff --git a/Dockerfile b/Dockerfile
index 4fb8ef1..eb9d03a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,4 +23,5 @@ VOLUME [ "/usr/src/app/data", "/usr/src/app/public" ]
EXPOSE 9292
ENV PORT=9292
ENV HTPASSWD=data/.htpasswd
+ENV RACK_ENV=deployment
CMD bundle exec rackup -o 0.0.0.0 -p ${PORT}
diff --git a/Gemfile b/Gemfile
index 503c277..ef27da2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
source 'https://rubygems.org'
gem 'rack'
+gem 'rackup'
gem 'hikidoc'
gem 'fastimage'
gem 'emot'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5613e5f..d184d21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
specs:
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
- capybara (3.37.1)
+ capybara (3.36.0)
addressable
matrix
mini_mime (>= 0.1.3)
@@ -20,11 +20,10 @@ GEM
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
date (3.2.2)
- debug (1.6.2)
+ debug (1.6.3)
irb (>= 1.3.6)
reline (>= 0.3.1)
diff-lcs (1.5.0)
- digest (3.1.0)
docile (1.4.0)
emot (0.0.4)
thor
@@ -35,7 +34,7 @@ GEM
fastimage (2.2.6)
hikidoc (0.1.0)
io-console (0.5.11)
- irb (1.4.1)
+ irb (1.4.2)
reline (>= 0.3.0)
jasmine (2.99.0)
jasmine-core (>= 2.99.0, < 3.0.0)
@@ -56,16 +55,14 @@ GEM
mini_portile2 (2.8.0)
net-protocol (0.1.3)
timeout
- net-smtp (0.3.1)
- digest
+ net-smtp (0.3.3)
net-protocol
- timeout
- nokogiri (1.13.8)
+ nokogiri (1.13.9)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
- nokogiri (1.13.8-x86_64-linux)
+ nokogiri (1.13.9-x86_64-linux)
racc (~> 1.4)
- octokit (5.3.0)
+ octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
phantomjs (2.1.1.0)
@@ -73,59 +70,62 @@ GEM
power_assert (2.0.1)
public_suffix (5.0.0)
racc (1.6.0)
- rack (2.2.4)
+ rack (3.0.1)
rack-test (2.0.2)
rack (>= 1.3)
racksh (1.0.0)
rack (>= 1.0)
rack-test (>= 0.5)
+ rackup (0.2.3)
+ rack (>= 3.0.0.beta1)
+ webrick
rake (13.0.6)
redcarpet (3.5.1)
regexp_parser (2.5.0)
reline (0.3.1)
io-console (~> 0.5)
rexml (3.2.5)
- rspec (3.11.0)
- rspec-core (~> 3.11.0)
- rspec-expectations (~> 3.11.0)
- rspec-mocks (~> 3.11.0)
- rspec-core (3.11.0)
- rspec-support (~> 3.11.0)
- rspec-expectations (3.11.0)
+ rspec (3.12.0)
+ rspec-core (~> 3.12.0)
+ rspec-expectations (~> 3.12.0)
+ rspec-mocks (~> 3.12.0)
+ rspec-core (3.12.0)
+ rspec-support (~> 3.12.0)
+ rspec-expectations (3.12.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.11.0)
- rspec-mocks (3.11.1)
+ rspec-support (~> 3.12.0)
+ rspec-mocks (3.12.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.11.0)
- rspec-support (3.11.0)
+ rspec-support (~> 3.12.0)
+ rspec-support (3.12.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
- selenium-webdriver (4.4.0)
+ selenium-webdriver (4.1.0)
childprocess (>= 0.5, < 5.0)
rexml (~> 3.2, >= 3.2.5)
- rubyzip (>= 1.2.2, < 3.0)
- websocket (~> 1.0)
- sequel (5.59.0)
+ rubyzip (>= 1.2.2)
+ sequel (5.62.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
- sqlite3 (1.4.4)
+ sqlite3 (1.5.4)
+ mini_portile2 (~> 2.8.0)
+ sqlite3 (1.5.4-x86_64-linux)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
- test-unit (3.5.3)
+ test-unit (3.5.5)
power_assert
thor (1.2.1)
timeout (0.3.0)
tins (1.31.1)
sync
webrick (1.7.0)
- websocket (1.2.9)
xpath (3.2.0)
nokogiri (~> 1.8)
@@ -150,6 +150,7 @@ DEPENDENCIES
pit
rack
racksh
+ rackup
rake
redcarpet
rexml
diff --git a/debian/changelog b/debian/changelog
index f6f857f..d118915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tdiary (5.2.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 09 Jun 2023 20:27:55 -0000
+
tdiary (5.2.3-2) unstable; urgency=medium
[ Debian Janitor ]
diff --git a/debian/patches/0001-10_core.patch b/debian/patches/0001-10_core.patch
index 1d1885d..f0e529b 100644
--- a/debian/patches/0001-10_core.patch
+++ b/debian/patches/0001-10_core.patch
@@ -7,23 +7,23 @@ Forwarded: not-needed
dot.htaccess | 8 ++++++++
1 file changed, 8 insertions(+)
-diff --git a/dot.htaccess b/dot.htaccess
-index b8d452d..a344352 100644
---- a/dot.htaccess
-+++ b/dot.htaccess
+Index: tdiary.git/dot.htaccess
+===================================================================
+--- tdiary.git.orig/dot.htaccess
++++ tdiary.git/dot.htaccess
@@ -1,6 +1,8 @@
Options +ExecCGI
-
+
# if you run tDiary with symbolic link, use settings below.
+# Confirm that /etc/apache/httpd.conf allows these options
+# with AllowOverride.
#Options +FollowSymLinks
-
+
# if making anchor style as 'YYYYMMDD.html', add some settings below.
@@ -25,3 +27,9 @@ AddType application/xml .rdf
Require user foo
</Files>
-
+
+<Files squeeze.rb>
+ AuthName tDiary
+ AuthType Basic
diff --git a/debian/patches/0002-020_runnable_tdiary_convert2.patch b/debian/patches/0002-020_runnable_tdiary_convert2.patch
index 56d417e..9f016fd 100644
--- a/debian/patches/0002-020_runnable_tdiary_convert2.patch
+++ b/debian/patches/0002-020_runnable_tdiary_convert2.patch
@@ -7,10 +7,10 @@ Forwarded: not-needed
misc/convert2.rb | 1 +
1 file changed, 1 insertion(+)
-diff --git a/misc/convert2.rb b/misc/convert2.rb
-index 299c015..84cf816 100755
---- a/misc/convert2.rb
-+++ b/misc/convert2.rb
+Index: tdiary.git/misc/convert2.rb
+===================================================================
+--- tdiary.git.orig/misc/convert2.rb
++++ tdiary.git/misc/convert2.rb
@@ -1,4 +1,5 @@
#!/usr/bin/env ruby
+# -*- coding: utf-8; -*-
diff --git a/debian/patches/0003-Add-Rack-Dependencies-for-CGI-mode.patch b/debian/patches/0003-Add-Rack-Dependencies-for-CGI-mode.patch
index 280b42c..044ee70 100644
--- a/debian/patches/0003-Add-Rack-Dependencies-for-CGI-mode.patch
+++ b/debian/patches/0003-Add-Rack-Dependencies-for-CGI-mode.patch
@@ -8,10 +8,10 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
lib/tdiary/request.rb | 1 +
1 file changed, 1 insertion(+)
-diff --git a/lib/tdiary/request.rb b/lib/tdiary/request.rb
-index 214d99b..7287d64 100644
---- a/lib/tdiary/request.rb
-+++ b/lib/tdiary/request.rb
+Index: tdiary.git/lib/tdiary/request.rb
+===================================================================
+--- tdiary.git.orig/lib/tdiary/request.rb
++++ tdiary.git/lib/tdiary/request.rb
@@ -1,4 +1,5 @@
# stolen from okkez http://github.com/hiki/hiki/blob/rack/hiki/request.rb
+require 'rack'
diff --git a/debian/patches/0004-Add-Pathname-Dependencies.patch b/debian/patches/0004-Add-Pathname-Dependencies.patch
index fa55d5c..9a5d63d 100644
--- a/debian/patches/0004-Add-Pathname-Dependencies.patch
+++ b/debian/patches/0004-Add-Pathname-Dependencies.patch
@@ -8,8 +8,10 @@ Forwarded: not-needed
lib/tdiary/io/plugin_pstore.rb | 1 +
1 file changed, 1 insertion(+)
---- a/lib/tdiary/io/plugin_pstore.rb
-+++ b/lib/tdiary/io/plugin_pstore.rb
+Index: tdiary.git/lib/tdiary/io/plugin_pstore.rb
+===================================================================
+--- tdiary.git.orig/lib/tdiary/io/plugin_pstore.rb
++++ tdiary.git/lib/tdiary/io/plugin_pstore.rb
@@ -2,6 +2,7 @@
# module io/plugin_pstore
# default plugin storage implemented by PStore
diff --git a/debian/patches/0005-Add-Shebang.patch b/debian/patches/0005-Add-Shebang.patch
index 9ec187b..93cdc94 100644
--- a/debian/patches/0005-Add-Shebang.patch
+++ b/debian/patches/0005-Add-Shebang.patch
@@ -8,10 +8,10 @@ Forwarded: not-needed
lib/tdiary/tasks/server.rake | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/lib/tdiary/tasks/server.rake b/lib/tdiary/tasks/server.rake
-index 90b6c72..d369515 100755
---- a/lib/tdiary/tasks/server.rake
-+++ b/lib/tdiary/tasks/server.rake
+Index: tdiary.git/lib/tdiary/tasks/server.rake
+===================================================================
+--- tdiary.git.orig/lib/tdiary/tasks/server.rake
++++ tdiary.git/lib/tdiary/tasks/server.rake
@@ -1,3 +1,5 @@
+#! /usr/bin/ruby
+# -*- coding: utf-8; -*-
diff --git a/debian/patches/0006-Replace-git-execution-from-gemspec.patch b/debian/patches/0006-Replace-git-execution-from-gemspec.patch
index 03c2c6e..01db84f 100644
--- a/debian/patches/0006-Replace-git-execution-from-gemspec.patch
+++ b/debian/patches/0006-Replace-git-execution-from-gemspec.patch
@@ -8,9 +8,11 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
tdiary.gemspec | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
---- a/tdiary.gemspec
-+++ b/tdiary.gemspec
-@@ -12,24 +12,7 @@
+Index: tdiary.git/tdiary.gemspec
+===================================================================
+--- tdiary.git.orig/tdiary.gemspec
++++ tdiary.git/tdiary.gemspec
+@@ -12,24 +12,7 @@ Gem::Specification.new do |spec|
spec.homepage = "http://www.tdiary.org/"
spec.license = "GPL2"
diff --git a/debian/patches/0007-Drop-bundler-setup-for-backward-compatibility.patch b/debian/patches/0007-Drop-bundler-setup-for-backward-compatibility.patch
index 2fecc00..ee05bce 100644
--- a/debian/patches/0007-Drop-bundler-setup-for-backward-compatibility.patch
+++ b/debian/patches/0007-Drop-bundler-setup-for-backward-compatibility.patch
@@ -9,14 +9,14 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
spec/spec_helper.rb | 1 +
2 files changed, 1 insertion(+), 31 deletions(-)
-diff --git a/lib/tdiary/environment.rb b/lib/tdiary/environment.rb
-index ebbdd05..4785432 100644
---- a/lib/tdiary/environment.rb
-+++ b/lib/tdiary/environment.rb
+Index: tdiary.git/lib/tdiary/environment.rb
+===================================================================
+--- tdiary.git.orig/lib/tdiary/environment.rb
++++ tdiary.git/lib/tdiary/environment.rb
@@ -2,36 +2,5 @@
module TDiary; end
module TDiary::Cache; end
-
+
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __FILE__)
-
@@ -50,15 +50,15 @@ index ebbdd05..4785432 100644
- end
- }
-end
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 55759ae..666d904 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -3,6 +3,7 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..'))
+Index: tdiary.git/spec/spec_helper.rb
+===================================================================
+--- tdiary.git.orig/spec/spec_helper.rb
++++ tdiary.git/spec/spec_helper.rb
+@@ -3,6 +3,7 @@ $:.unshift File.expand_path(File.join(Fi
ENV['RACK_ENV'] = "test"
-
+
require 'tdiary/environment'
+require 'capybara/rspec'
-
+
if ENV['COVERAGE'] = 'simplecov'
require 'simplecov'
diff --git a/debian/patches/0008-Drop-coverall-and-simplecov.patch b/debian/patches/0008-Drop-coverall-and-simplecov.patch
index 1bdf9e5..5b9bb4b 100644
--- a/debian/patches/0008-Drop-coverall-and-simplecov.patch
+++ b/debian/patches/0008-Drop-coverall-and-simplecov.patch
@@ -10,9 +10,11 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
spec/spec_helper.rb | 12 ------------
3 files changed, 19 deletions(-)
---- a/Gemfile
-+++ b/Gemfile
-@@ -26,8 +26,6 @@
+Index: tdiary.git/Gemfile
+===================================================================
+--- tdiary.git.orig/Gemfile
++++ tdiary.git/Gemfile
+@@ -27,8 +27,6 @@ group :development do
gem 'sequel'
gem 'sqlite3'
gem 'jasmine', '< 3'
@@ -21,12 +23,14 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
gem "rexml"
gem "webrick"
end
---- a/lib/tdiary/tasks/rspec.rake
-+++ b/lib/tdiary/tasks/rspec.rake
-@@ -22,11 +22,6 @@
+Index: tdiary.git/lib/tdiary/tasks/rspec.rake
+===================================================================
+--- tdiary.git.orig/lib/tdiary/tasks/rspec.rake
++++ tdiary.git/lib/tdiary/tasks/rspec.rake
+@@ -22,11 +22,6 @@ if defined? RSpec
end
end
-
+
- desc 'Displayed code coverage with SimpleCov'
- task :coverage do
- ENV['COVERAGE'] = 'simplecov'
@@ -34,13 +38,15 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
- end
end
end
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -5,18 +5,6 @@
+
+Index: tdiary.git/spec/spec_helper.rb
+===================================================================
+--- tdiary.git.orig/spec/spec_helper.rb
++++ tdiary.git/spec/spec_helper.rb
+@@ -5,18 +5,6 @@ ENV['RACK_ENV'] = "test"
require 'tdiary/environment'
require 'capybara/rspec'
-
+
-if ENV['COVERAGE'] = 'simplecov'
- require 'simplecov'
- require 'coveralls'
@@ -54,5 +60,5 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
-end
-
require 'tdiary'
-
+
RSpec.configure do |config|
diff --git a/debian/patches/0009-Disable-online-test.patch b/debian/patches/0009-Disable-online-test.patch
index 2341878..df1c85a 100644
--- a/debian/patches/0009-Disable-online-test.patch
+++ b/debian/patches/0009-Disable-online-test.patch
@@ -9,17 +9,17 @@ Changed-by: Daniel Leidert <dleidert@debian.org>
spec/plugin/amp_spec.rb | 7 +++++++
1 file changed, 7 insertions(+)
-diff --git a/spec/plugin/amp_spec.rb b/spec/plugin/amp_spec.rb
-index f713b25..c537f63 100644
---- a/spec/plugin/amp_spec.rb
-+++ b/spec/plugin/amp_spec.rb
+Index: tdiary.git/spec/plugin/amp_spec.rb
+===================================================================
+--- tdiary.git.orig/spec/plugin/amp_spec.rb
++++ tdiary.git/spec/plugin/amp_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
require File.expand_path('../plugin_helper', __FILE__)
require 'tdiary/plugin'
-
+
@@ -55,6 +56,12 @@ describe "amp plugin w/" do
-
+
describe "when online theme" do
before {
+ begin
diff --git a/index.rb b/index.rb
index 5d8d3d8..51eef53 100755
--- a/index.rb
+++ b/index.rb
@@ -32,7 +32,7 @@ begin
status, headers, body = TDiary::Dispatcher.index.dispatch_cgi( request, @cgi )
TDiary::Dispatcher.send_headers( status, headers )
- ::Rack::Handler::CGI.send_body(body)
+ ::Rackup::Handler::CGI.send_body(body)
rescue Exception
if @cgi then
print @cgi.header( 'status' => CGI::HTTP_STATUS['SERVER_ERROR'], 'type' => 'text/html' )
diff --git a/lib/tdiary/cli.rb b/lib/tdiary/cli.rb
index 2441ab2..264d8a4 100644
--- a/lib/tdiary/cli.rb
+++ b/lib/tdiary/cli.rb
@@ -126,7 +126,7 @@ module TDiary
if options[:log]
opts[:AccessLog] = [[File.open(options[:log], 'a'), WEBrick::AccessLog::CLF]]
end
- ::Rack::Server.start( opts )
+ ::Rackup::Server.start( opts )
end
end
diff --git a/lib/tdiary/rack/session.rb b/lib/tdiary/rack/session.rb
index eadcf15..cc6e1da 100644
--- a/lib/tdiary/rack/session.rb
+++ b/lib/tdiary/rack/session.rb
@@ -20,7 +20,6 @@ module TDiary
if ::Rack::Session.const_defined? :Dalli
::Rack::Session::Dalli.new(
app,
- cache: Dalli::Client.new,
expire_after: 2592000
)
else
diff --git a/lib/tdiary/version.rb b/lib/tdiary/version.rb
index 8d87df1..24f6b8e 100644
--- a/lib/tdiary/version.rb
+++ b/lib/tdiary/version.rb
@@ -1,3 +1,3 @@
module TDiary
- VERSION = '5.2.3'
+ VERSION = '5.2.4'
end
diff --git a/misc/paas/heroku/Gemfile.local b/misc/paas/heroku/Gemfile.local
index c5d87e0..16ac2ff 100644
--- a/misc/paas/heroku/Gemfile.local
+++ b/misc/paas/heroku/Gemfile.local
@@ -6,6 +6,7 @@ gem 'tdiary-style-gfm'
gem 'tdiary-style-rd'
gem 'omniauth'
gem 'omniauth-twitter'
-gem 'dalli', '< 3'
+gem 'dalli'
+gem 'connection_pool'
gem 'memcachier'
gem 'octokit'
diff --git a/update.rb b/update.rb
index 2c2ff19..1bb884e 100755
--- a/update.rb
+++ b/update.rb
@@ -32,7 +32,7 @@ begin
status, headers, body = TDiary::Dispatcher.update.dispatch_cgi( request, @cgi )
TDiary::Dispatcher.send_headers( status, headers )
- ::Rack::Handler::CGI.send_body(body)
+ ::Rackup::Handler::CGI.send_body(body)
rescue Exception
if @cgi then
print @cgi.header( 'status' => '500 Internal Server Error', 'type' => 'text/html' )
Debdiff
File lists identical (after any substitutions)
No differences were encountered between the control files of package tdiary
No differences were encountered between the control files of package tdiary-core