diff -Nru golang-github-canonical-candid-1.12.2/debian/changelog golang-github-canonical-candid-1.12.2/debian/changelog --- golang-github-canonical-candid-1.12.2/debian/changelog 2023-08-18 16:01:34.000000000 +0000 +++ golang-github-canonical-candid-1.12.2/debian/changelog 2024-01-19 22:14:18.000000000 +0000 @@ -1,3 +1,12 @@ +golang-github-canonical-candid (1.12.2-4) unstable; urgency=medium + + * Update Build-Depends and Depends to use golang-github-go-webauthn- + webauthn-dev rather than golang-github-duo-labs-webauthn-dev and + add a patch to update import paths (See #1025857) + * Update years in d/copyright + + -- Mathias Gibbens Fri, 19 Jan 2024 22:14:18 +0000 + golang-github-canonical-candid (1.12.2-3) unstable; urgency=medium * Fix FTBFS with golang 1.21 diff -Nru golang-github-canonical-candid-1.12.2/debian/control golang-github-canonical-candid-1.12.2/debian/control --- golang-github-canonical-candid-1.12.2/debian/control 2023-08-18 14:51:58.000000000 +0000 +++ golang-github-canonical-candid-1.12.2/debian/control 2024-01-19 21:50:20.000000000 +0000 @@ -8,10 +8,10 @@ dh-golang, golang-any, golang-github-coreos-go-oidc-dev, - golang-github-duo-labs-webauthn-dev, golang-github-frankban-quicktest-dev, golang-github-go-ldap-ldap-dev (>= 3.4.5), golang-github-go-macaroon-bakery-macaroon-bakery-dev, + golang-github-go-webauthn-webauthn-dev, golang-github-gomodule-oauth1-dev, golang-github-google-go-cmp-dev, golang-github-google-uuid-dev, @@ -61,10 +61,10 @@ Breaks: lxd (<< 5.0.1) Depends: ${misc:Depends}, golang-github-coreos-go-oidc-dev, - golang-github-duo-labs-webauthn-dev, golang-github-frankban-quicktest-dev, golang-github-go-ldap-ldap-dev (>= 3.4.5), golang-github-go-macaroon-bakery-macaroon-bakery-dev, + golang-github-go-webauthn-webauthn-dev, golang-github-gomodule-oauth1-dev, golang-github-google-go-cmp-dev, golang-github-google-uuid-dev, diff -Nru golang-github-canonical-candid-1.12.2/debian/copyright golang-github-canonical-candid-1.12.2/debian/copyright --- golang-github-canonical-candid-1.12.2/debian/copyright 2023-08-18 14:51:58.000000000 +0000 +++ golang-github-canonical-candid-1.12.2/debian/copyright 2024-01-19 21:51:14.000000000 +0000 @@ -29,7 +29,7 @@ License: Apache-2.0 Files: debian/* -Copyright: 2022 Mathias Gibbens +Copyright: 2022-2024 Mathias Gibbens License: AGPL-3.0 Comment: Debian packaging is licensed under the same terms as upstream diff -Nru golang-github-canonical-candid-1.12.2/debian/patches/014-switch-webauthn-library.patch golang-github-canonical-candid-1.12.2/debian/patches/014-switch-webauthn-library.patch --- golang-github-canonical-candid-1.12.2/debian/patches/014-switch-webauthn-library.patch 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-canonical-candid-1.12.2/debian/patches/014-switch-webauthn-library.patch 2024-01-19 21:54:30.000000000 +0000 @@ -0,0 +1,18 @@ +From: Mathias Gibbens +Description: Switch webauthn library +Forwarded: https://github.com/canonical/candid/issues/161 +diff --git a/internal/mfa/webauthn.go b/internal/mfa/webauthn.go +index 36449e7..c72b317 100644 +--- a/internal/mfa/webauthn.go ++++ b/internal/mfa/webauthn.go +@@ -12,8 +12,8 @@ import ( + "net/url" + "strings" + +- "github.com/duo-labs/webauthn/protocol" +- "github.com/duo-labs/webauthn/webauthn" ++ "github.com/go-webauthn/webauthn/protocol" ++ "github.com/go-webauthn/webauthn/webauthn" + "github.com/juju/loggo" + "gopkg.in/errgo.v1" + "gopkg.in/httprequest.v1" diff -Nru golang-github-canonical-candid-1.12.2/debian/patches/series golang-github-canonical-candid-1.12.2/debian/patches/series --- golang-github-canonical-candid-1.12.2/debian/patches/series 2023-08-18 16:00:18.000000000 +0000 +++ golang-github-canonical-candid-1.12.2/debian/patches/series 2024-01-19 21:54:49.000000000 +0000 @@ -6,3 +6,4 @@ 011-fix-mgo-import.patch 012-fix-ldap-api.patch 013-skip-test-broken-go-121.patch +014-switch-webauthn-library.patch