From 89d91d6b3db389690a1f6aaedec36fe54ff95993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Mart=C3=ADnez=20Fay=C3=B3?= Date: Wed, 8 May 2024 12:03:50 -0300 Subject: [PATCH] Bump SPIRE to v1.9.6 (#5130) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Agustín Martínez Fayó --- .go-version | 2 +- CHANGELOG.md | 12 ++++++++++++ go.mod | 2 +- pkg/common/version/version.go | 2 +- pkg/server/datastore/sqlstore/migration.go | 4 ++++ test/integration/suites/upgrade/versions.txt | 2 ++ 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.go-version b/.go-version index 6fee2fedb0..89144dbc38 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.2 +1.22.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 237a3c061f..32d19209c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [1.9.5] - 2024-05-07 + +### Security + +- Updated to Go 1.21.10 to address CVE-2024-24788 + ## [1.9.4] - 2023-04-05 ### Security @@ -65,6 +71,12 @@ - X509-SVIDs issued by the server no longer have the x509UniqueIdentifier attribute as part of the subject (#4862) +## [1.8.11] - 2024-05-07 + +### Security + +- Updated to Go 1.21.10 to address CVE-2024-24788 + ## [1.8.10] - 2023-04-05 ### Security diff --git a/go.mod b/go.mod index b12e478dbe..ebb9512172 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/spiffe/spire -go 1.22.2 +go 1.22.3 require ( cloud.google.com/go/iam v1.1.7 diff --git a/pkg/common/version/version.go b/pkg/common/version/version.go index 39e4cb3ca1..804f8356c1 100644 --- a/pkg/common/version/version.go +++ b/pkg/common/version/version.go @@ -8,7 +8,7 @@ const ( // IMPORTANT: When updating, make sure to reconcile the versions list that // is part of the upgrade integration test. See // test/integration/suites/upgrade/README.md for details. - Base = "1.9.5" + Base = "1.9.6" ) var ( diff --git a/pkg/server/datastore/sqlstore/migration.go b/pkg/server/datastore/sqlstore/migration.go index 403544e8dc..03af16eb02 100644 --- a/pkg/server/datastore/sqlstore/migration.go +++ b/pkg/server/datastore/sqlstore/migration.go @@ -220,6 +220,8 @@ import ( // | v1.8.9 | | | // |---------| | | // | v1.8.10 | | | +// |---------| | | +// | v1.8.11 | | | // |*********|********|***************************************************************************| // | v1.9.0 | | | // |---------| | | @@ -230,6 +232,8 @@ import ( // | v1.9.3 | | | // |---------| | | // | v1.9.4 | | | +// |---------| | | +// | v1.9.5 | | | // ================================================================================================ const ( diff --git a/test/integration/suites/upgrade/versions.txt b/test/integration/suites/upgrade/versions.txt index d01984a5ea..27d345772d 100644 --- a/test/integration/suites/upgrade/versions.txt +++ b/test/integration/suites/upgrade/versions.txt @@ -9,8 +9,10 @@ 1.8.8 1.8.9 1.8.10 +1.8.11 1.9.0 1.9.1 1.9.2 1.9.3 1.9.4 +1.9.5