From 6ea59b80626f062480963cf3a3241cdb8b1b895a Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Wed, 26 Feb 2020 20:28:12 +0100 Subject: [PATCH 1/3] Typos in yaml-comments in stack snapshot. (It's safe to change these, since the machine-readable meaning doesn't change.) --- snapshots/wire-2.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapshots/wire-2.0.yaml b/snapshots/wire-2.0.yaml index 7a657dac3d5..4c98e7bb3a4 100644 --- a/snapshots/wire-2.0.yaml +++ b/snapshots/wire-2.0.yaml @@ -59,7 +59,7 @@ packages: commit: 7546a1a25635ef65183e3d44c1052285e8401608 # master (Jul 21, 2016) - git: https://github.com/wireapp/hsaml2 - commit: 2d56f432464e9bf6be8ee214d7f5bb28639457ac # master (Feb 4, 20202) + commit: 2d56f432464e9bf6be8ee214d7f5bb28639457ac # master (Feb 4, 2020) - git: https://github.com/wireapp/http-client commit: a160cef95d9daaff7d9cfe616d95754c2f8202bf # master (Feb 4, 2020) @@ -102,4 +102,4 @@ packages: - pattern-trie-0.1.0 # Not latest as latst one breaks wai-routing -- wai-route-0.4.0 +- wai-route-0.4.0 From 926c1e3f43e5b019ebd78d538cf411ae5edf9074 Mon Sep 17 00:00:00 2001 From: fisx Date: Thu, 27 Feb 2020 10:13:18 +0100 Subject: [PATCH 2/3] Upgrade hsaml2 (fixes utf8 handling in bytestrings). (#995) --- snapshots/wire-2.2.yaml | 8 ++++++++ stack.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 snapshots/wire-2.2.yaml diff --git a/snapshots/wire-2.2.yaml b/snapshots/wire-2.2.yaml new file mode 100644 index 00000000000..26b49c246a1 --- /dev/null +++ b/snapshots/wire-2.2.yaml @@ -0,0 +1,8 @@ +# DO NOT MODIFY THIS FILE. See README.md to learn why. + +resolver: https://raw.githubusercontent.com/wireapp/wire-server/develop/snapshots/wire-2.1.yaml +name: wire-2.2 + +packages: +- git: https://github.com/wireapp/hsaml2 + commit: cc47da1d097b0b26595b8889e40c33c6c0c1c551 # master (Feb 27, 2020) diff --git a/stack.yaml b/stack.yaml index d4c423ce0ea..29508b85331 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: snapshots/wire-2.1.yaml +resolver: snapshots/wire-2.2.yaml packages: - libs/api-bot From 5f560ed97b9e710d686c359277a6e2a24223c367 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Thu, 27 Feb 2020 10:24:32 +0100 Subject: [PATCH 3/3] CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0b4b58da20..8822cc59ab4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 2020-02-27 + +## Hotfix + +- Fix encoding bug in SAML SSO (#995) + + # 2020-02-06 ## New features