[Buildroot] [git commit] package/containerd: security bump to version 1.5.11

Peter Korsgaard peter at korsgaard.com
Mon Apr 11 20:34:55 UTC 2022


>>>>> "Peter" == Peter Korsgaard <peter at korsgaard.com> writes:

Hi,

 > @@ -55,7 +55,7 @@ var (
 >         // NOTE: The $Format strings are replaced during 'git archive' thanks to the
 >         // companion .gitattributes file containing 'export-subst' in this same
 >         // directory.  See also https://git-scm.com/docs/gitattributes
 > -       gitVersion   string = "v0.0.0-master+3df54a85234"
 > +       gitVersion   string = "v0.0.0-master+3df54a8523"
 >         gitCommit string = "3df54a852345ae127d1fa3092b95168e4a88e2f8"
 > // sha1 from git, output of $(git rev-parse HEAD)
 >         gitTreeState string = ""            // state of git tree, either "clean" or "dirty"

 > So the gitVersion field lost a digit. No idea how this could
 > happen. Looking at the file in the git repo I see that this is listed
 > as:

 > 	gitVersion   string = "v0.0.0-master+$Format:%H$"
 > 	gitCommit    string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)

 > https://github.com/containerd/containerd/blob/main/vendor/k8s.io/client-go/pkg/version/base.go

 > So I guess something in github is wrongly expanding this $Format?

The format logic itself is part of git, as the export-subst attibute has
been set for base.go:

https://git-scm.com/docs/gitattributes

But why the two $Format:%H$ lines expand to different things and why it
has changed over time is unclear to me.

In any case, I've pushed a commit to 2022.02.x to adjust the hash to
what Github is now serving.

-- 
Bye, Peter Korsgaard



More information about the buildroot mailing list