October 2024 - gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: redmine: upgrade our docker container to redmine 5.1.3
by laforge 12 Oct '24

12 Oct '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/38418?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: redmine: upgrade our docker container to redmine 5.1.3 ...................................................................... redmine: upgrade our docker container to redmine 5.1.3 Change-Id: Ie65cfa0cfb4b1914966525be0d8db77dc98b7fa0 --- M redmine/Dockerfile R redmine/commitlog-references-oshash-5.1.3.diff D redmine/hmac.diff 3 files changed, 9 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/18/38418/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38418?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie65cfa0cfb4b1914966525be0d8db77dc98b7fa0 Gerrit-Change-Number: 38418 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder

1 0

[XS] Change in docker-playground[master]: upgrade gerrit to 3.9.5
by laforge 12 Oct '24

12 Oct '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38419?usp=email ) Change subject: upgrade gerrit to 3.9.5 ...................................................................... upgrade gerrit to 3.9.5 Change-Id: I5d82853c8c533f055ff0590bfef343e601280520 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/19/38419/1 diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index c1c3777..175a58b 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.8.6 +FROM gerritcodereview/gerrit:3.9.5 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38419?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5d82853c8c533f055ff0590bfef343e601280520 Gerrit-Change-Number: 38419 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in docker-playground[master]: upgrade gerrit to 3.8.6
by laforge 12 Oct '24

12 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/38417?usp=email ) Change subject: upgrade gerrit to 3.8.6 ...................................................................... upgrade gerrit to 3.8.6 Change-Id: I794db60131534619c0de85eeab7f493bcd4e9106 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index 2e27e3b..c1c3777 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.7.6 +FROM gerritcodereview/gerrit:3.8.6 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38417?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I794db60131534619c0de85eeab7f493bcd4e9106 Gerrit-Change-Number: 38417 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in docker-playground[master]: upgrade gerrit to 3.8.6
by laforge 12 Oct '24

12 Oct '24

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/docker-playground/+/38417?usp=email ) Change subject: upgrade gerrit to 3.8.6 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38417?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I794db60131534619c0de85eeab7f493bcd4e9106 Gerrit-Change-Number: 38417 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 12 Oct 2024 16:46:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in docker-playground[master]: upgrade gerrit to 3.8.6
by laforge 12 Oct '24

12 Oct '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38417?usp=email ) Change subject: upgrade gerrit to 3.8.6 ...................................................................... upgrade gerrit to 3.8.6 Change-Id: I794db60131534619c0de85eeab7f493bcd4e9106 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/17/38417/1 diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index 2e27e3b..c1c3777 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.7.6 +FROM gerritcodereview/gerrit:3.8.6 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38417?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I794db60131534619c0de85eeab7f493bcd4e9106 Gerrit-Change-Number: 38417 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[S] Change in docker-playground[master]: redmine: upgrae our docker container to 5.1.3
by laforge 12 Oct '24

12 Oct '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38418?usp=email ) Change subject: redmine: upgrae our docker container to 5.1.3 ...................................................................... redmine: upgrae our docker container to 5.1.3 Change-Id: Ie65cfa0cfb4b1914966525be0d8db77dc98b7fa0 --- M gerrit/Dockerfile M redmine/Dockerfile R redmine/commitlog-references-oshash-5.1.3.diff D redmine/hmac.diff 4 files changed, 10 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/18/38418/1 diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index c1c3777..175a58b 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.8.6 +FROM gerritcodereview/gerrit:3.9.5 USER root RUN yum -y install zip unzip patch diff --git a/redmine/Dockerfile b/redmine/Dockerfile index d6125cb..d48977f 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,4 +1,4 @@ -FROM redmine:4.2-passenger +FROM redmine:5.1.3 RUN apt-get update && \ apt-get -y upgrade && \ @@ -9,16 +9,15 @@ patch && \ apt-get clean -# no longer needed after ruby-openid-2.9.2 is used -#ADD hmac.diff /tmp/hmac.diff -#RUN cd / && patch -p0 < /tmp/hmac.diff +# needed after 5.0.0 removes openID [client] support +RUN gem install ruby-openid rack-openid 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 +ADD commitlog-references-oshash-5.1.3.diff /tmp/commitlog-references-oshash-5.1.3.diff +RUN cd /usr/src/redmine && patch -p1 < /tmp/commitlog-references-oshash-5.1.3.diff ADD docker-entrypoint-osmo.sh / ENTRYPOINT ["/docker-entrypoint-osmo.sh"] -CMD ["passenger", "start"] +CMD ["rails", "server", "-b", "0.0.0.0"] diff --git a/redmine/commitlog-references-oshash.diff b/redmine/commitlog-references-oshash-5.1.3.diff similarity index 82% rename from redmine/commitlog-references-oshash.diff rename to redmine/commitlog-references-oshash-5.1.3.diff index e7b4cf8..11004c7 100644 --- a/redmine/commitlog-references-oshash.diff +++ b/redmine/commitlog-references-oshash-5.1.3.diff @@ -1,5 +1,5 @@ diff --git a/app/models/changeset.rb b/app/models/changeset.rb -index f1580ce33..748c66ddc 100644 +index 9ee758128..cc92217e5 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -136,7 +136,7 @@ class Changeset < ActiveRecord::Base @@ -15,8 +15,8 @@ refs = match[3] next unless action.present? || ref_keywords_any -- refs.scan(/#(\d+)(\s+(a)#{TIMELOG_RE})?/).each do |m| -+ refs.scan(/OS#(\d+)(\s+(a)#{TIMELOG_RE})?/).each do |m| +- refs.scan(/#(\d+)(\s+(a)#{TIMELOG_RE})?/o).each do |m| ++ refs.scan(/OS#(\d+)(\s+(a)#{TIMELOG_RE})?/o).each do |m| issue = find_referenced_issue_by_id(m[0].to_i) hours = m[2] if issue && !issue_linked_to_same_commit?(issue) diff --git a/redmine/hmac.diff b/redmine/hmac.diff deleted file mode 100644 index 197960b..0000000 --- a/redmine/hmac.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- usr/local/bundle/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb.old 2018-10-07 08:53:33.612724431 +0000 -+++ usr/local/bundle/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb 2018-10-07 08:54:03.016525355 +0000 -@@ -39,6 +39,6 @@ - def CryptUtil.hmac_sha1(key, text) -- if Digest.const_defined? :HMAC -- Digest::HMAC.new(key,Digest::SHA1).update(text).digest -+ if defined? OpenSSL -+ OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, key, text) - else - return HMAC::SHA1.digest(key, text) - end -@@ -50,7 +50,7 @@ - - def CryptUtil.hmac_sha256(key, text) -- if Digest.const_defined? :HMAC -- Digest::HMAC.new(key,Digest::SHA256).update(text).digest -+ if defined? OpenSSL -+ OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, key, text) - else - return HMAC::SHA256.digest(key, text) - end -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38418?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie65cfa0cfb4b1914966525be0d8db77dc98b7fa0 Gerrit-Change-Number: 38418 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: BSSGP_ConnHdlr.ttcn: Service Request: expect a CommonId when stopping...
by lynxis lazus 12 Oct '24

12 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38415?usp=email ) Change subject: BSSGP_ConnHdlr.ttcn: Service Request: expect a CommonId when stopping on SecurityCommand Complete ...................................................................... BSSGP_ConnHdlr.ttcn: Service Request: expect a CommonId when stopping on SecurityCommand Complete The SGSN will transmit a CommonId after the Security Command Complete has been received. Change-Id: Ie81c5eb01eb695d0399770b8a7feb9b4549148b3 --- M sgsn/BSSGP_ConnHdlr.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/38415/1 diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index b38bb89..680c673 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -700,6 +700,8 @@ var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 = standard_UMTS_integrity_algorithm_UIA1 */ BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen)); if (ue_in_pmm_idle) { + /* Because we stop processing early, we need to consume the CommonID */ + BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))); setverdict(pass); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie81c5eb01eb695d0399770b8a7feb9b4549148b3 Gerrit-Change-Number: 38415 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: TC_attach_pdp_act_pmm_idle: use correct Service Request type
by lynxis lazus 12 Oct '24

12 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38416?usp=email ) Change subject: SGSN: TC_attach_pdp_act_pmm_idle: use correct Service Request type ...................................................................... SGSN: TC_attach_pdp_act_pmm_idle: use correct Service Request type When the UE requests data service, it must use the data service request type. Change-Id: I9301e7a37d96c3f93e77f7618d6c13dfa1fbe46b --- M sgsn/SGSN_Tests_Iu.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/38416/1 diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index f5339d4..f1eede3 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -166,7 +166,7 @@ /* Now UE tries to send new data after a while of being IDLE. * SGSN recreates the Iu ctx and recovers the Direct Tunnel RNC<->GGSN: */ - f_service_request(apars, pdp_status := '2000'O /*NSAPI=5*/, ran_index := 3); + f_service_request(apars, service_type := SERVICE_TYPE_Data, pdp_status := '2000'O /*NSAPI=5*/, ran_index := 3); as_ranap_rab_ass_req(apars); as_ggsn_gtp_ctx_upd_req(apars, exp_dir_tun := true, ran_index := 3); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9301e7a37d96c3f93e77f7618d6c13dfa1fbe46b Gerrit-Change-Number: 38416 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: fix encoding of IMEISV in Auth and Ciphering Response
by pespin 12 Oct '24

12 Oct '24

Attention is currently required from: lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38414?usp=email ) Change subject: SGSN: fix encoding of IMEISV in Auth and Ciphering Response ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38414?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79dd79840de58f450c1a05e704fd9bd831455716 Gerrit-Change-Number: 38414 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 11 Oct 2024 22:49:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: BSSGP_ConnHdlr: f_gmm_attach(): allow the SGSN to request the IMEI
by pespin 12 Oct '24

12 Oct '24

Attention is currently required from: lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38398?usp=email ) Change subject: SGSN: BSSGP_ConnHdlr: f_gmm_attach(): allow the SGSN to request the IMEI ...................................................................... Patch Set 2: (1 comment) File sgsn/BSSGP_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38398/comment/131d4bce_bdb2… : PS2, Line 561: f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept, ran_index); Now it becomes clearer. This should imho be refactored to an alt { [] as_mm_identity(ran_index) { repeat; } [] as_attach_accept() { f_process_attach_accept()} } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38398?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id49c9e6ef7517a6a831315ac1f9915c50b88beb6 Gerrit-Change-Number: 38398 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 11 Oct 2024 22:46:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0