From 5f3a91af68016e86f2295ba1422ed1ec0b3da69b Mon Sep 17 00:00:00 2001 From: Martina Ferrari Date: Thu, 20 Feb 2025 20:27:34 +0000 Subject: [PATCH 1/2] Update dependencies to match versions in sid --- go.mod | 10 ++++------ go.sum | 6 ++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8348f1a..87b4e4b 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,16 @@ module github.com/Debian/dh-make-golang -go 1.21 - -toolchain go1.22.1 +go 1.24.0 require ( github.com/charmbracelet/glamour v0.8.0 github.com/google/go-github/v60 v60.0.0 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 github.com/mattn/go-isatty v0.0.20 - golang.org/x/mod v0.15.0 + golang.org/x/mod v0.19.0 golang.org/x/net v0.27.0 - golang.org/x/sync v0.6.0 - golang.org/x/tools v0.13.0 + golang.org/x/sync v0.7.0 + golang.org/x/tools v0.23.0 golang.org/x/tools/go/vcs v0.1.0-deprecated pault.ag/go/debian v0.16.0 ) diff --git a/go.sum b/go.sum index aa049b5..20b0f7b 100644 --- a/go.sum +++ b/go.sum @@ -59,10 +59,14 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= @@ -70,6 +74,8 @@ golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= +golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/tools/go/vcs v0.1.0-deprecated h1:cOIJqWBl99H1dH5LWizPa+0ImeeJq3t3cJjaeOWUAL4= golang.org/x/tools/go/vcs v0.1.0-deprecated/go.mod h1:zUrvATBAvEI9535oC0yWYsLsHIV4Z7g63sNPVMtuBy8= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 643beff610952885b38c7918693118d19aaaabd8 Mon Sep 17 00:00:00 2001 From: Martina Ferrari Date: Thu, 20 Feb 2025 20:38:12 +0000 Subject: [PATCH 2/2] Fix `non-constant format string` errors --- template.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/template.go b/template.go index 9cd5edf..7520f6f 100644 --- a/template.go +++ b/template.go @@ -266,19 +266,19 @@ func writeDebianCopyright(dir, gopkg string, vendorDirs []string, hasGodeps bool if len(vendorDirs) > 0 || hasGodeps { fmt.Fprintf(f, "Files-Excluded:\n") for _, dir := range vendorDirs { - fmt.Fprintf(f, indent+"%s\n", dir) + fmt.Fprintf(f, "%s%s\n", indent, dir) } if hasGodeps { - fmt.Fprintf(f, indent+"Godeps/_workspace\n") + fmt.Fprintf(f, "%sGodeps/_workspace\n", indent) } } fmt.Fprintf(f, "\n") - fmt.Fprintf(f, "Files:"+linebreak+" *\n") - fmt.Fprintf(f, "Copyright:"+linebreak+" %s\n", copyright) + fmt.Fprintf(f, "Files:%s *\n", linebreak) + fmt.Fprintf(f, "Copyright:%s %s\n", linebreak, copyright) fmt.Fprintf(f, "License: %s\n", license) fmt.Fprintf(f, "\n") - fmt.Fprintf(f, "Files:"+linebreak+" debian/*\n") - fmt.Fprintf(f, "Copyright:"+linebreak+" %s %s <%s>\n", time.Now().Format("2006"), getDebianName(), getDebianEmail()) + fmt.Fprintf(f, "Files:%s debian/*\n", linebreak) + fmt.Fprintf(f, "Copyright:%s %s %s <%s>\n", linebreak, time.Now().Format("2006"), getDebianName(), getDebianEmail()) fmt.Fprintf(f, "License: %s\n", license) fmt.Fprintf(f, "Comment: Debian packaging is licensed under the same terms as upstream\n") fmt.Fprintf(f, "\n")