upgrade to redmine 4.1

this requires a local patch to ruby-openid, as it apparently doesn't
suppor rails 5.x (Paramters are not a hash anymore, hence lenth
method cannot be used)

Change-Id: I028d6d72757abf5d990ca2e8327e5f0a9fe3d333
This commit is contained in:
Harald Welte 2021-10-27 18:49:16 +02:00
parent d03adb8afd
commit a07f803328
2 changed files with 17 additions and 1 deletions

View File

@ -1,4 +1,4 @@
FROM redmine:3.4-passenger
FROM redmine:4.1-passenger
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@ -12,5 +12,8 @@ RUN apt-get update && \
#ADD hmac.diff /tmp/hmac.diff
#RUN cd / && patch -p0 < /tmp/hmac.diff
ADD openid_server_length_empty.diff /tmp/openid_server_length_empty.diff
RUN cd /usr/local/bundle/gems/ruby-openid-2.9.2 && patch -p1 < /tmp/openid_server_length_empty.diff
ADD commitlog-references-oshash.diff /tmp/commitlog-references-oshash.diff
RUN cd /usr/src/redmine && patch -p1 < /tmp/commitlog-references-oshash.diff

View File

@ -0,0 +1,13 @@
diff --git a/lib/openid/server.rb b/lib/openid/server.rb
index 8fa1513..3a86e7d 100644
--- a/lib/openid/server.rb
+++ b/lib/openid/server.rb
@@ -1240,7 +1240,7 @@ module OpenID
# Raises ProtocolError when the query does not seem to be a valid
# OpenID request.
def decode(query)
- if query.nil? or query.length == 0
+ if query.nil? or query.empty? == 0
return nil
end