From ee5944a1e68dba270936af899f3e7cdcd4322197 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Wed, 26 Oct 2022 14:00:08 -0500 Subject: [PATCH] Update to 0.101.0 Signed-off-by: W. Michael Petullo --- 0020-clbanning-mxj.patch | 42 ++++++++++++++++++++-------------------- hugo.spec | 6 ++++-- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/0020-clbanning-mxj.patch b/0020-clbanning-mxj.patch index ef154f2..4518b90 100644 --- a/0020-clbanning-mxj.patch +++ b/0020-clbanning-mxj.patch @@ -1,32 +1,32 @@ -diff -u --recursive hugo-0.98.0-vanilla/go.mod hugo-0.98.0/go.mod ---- hugo-0.98.0-vanilla/go.mod 2022-04-28 05:23:30.000000000 -0500 -+++ hugo-0.98.0/go.mod 2022-06-09 18:31:54.293987909 -0500 -@@ -14,7 +14,7 @@ +diff -u --recursive hugo-0.101.0-vanilla/go.mod hugo-0.101.0/go.mod +--- hugo-0.101.0-vanilla/go.mod 2022-06-16 02:09:16.000000000 -0500 ++++ hugo-0.101.0/go.mod 2022-08-02 18:02:52.200103077 -0500 +@@ -15,7 +15,7 @@ github.com/bep/gowebp v0.1.0 github.com/bep/overlayfs v0.6.0 github.com/bep/tmc v0.5.1 -- github.com/clbanning/mxj/v2 v2.5.5 -+ github.com/clbanning/mxj v2.5.5 +- github.com/clbanning/mxj/v2 v2.5.6 ++ github.com/clbanning/mxj v2.5.6 github.com/cli/safeexec v1.0.0 github.com/disintegration/gift v1.2.1 github.com/dustin/go-humanize v1.0.0 -diff -u --recursive hugo-0.98.0-vanilla/go.sum hugo-0.98.0/go.sum ---- hugo-0.98.0-vanilla/go.sum 2022-04-28 05:23:30.000000000 -0500 -+++ hugo-0.98.0/go.sum 2022-06-09 18:31:58.892499173 -0500 -@@ -239,8 +239,8 @@ +diff -u --recursive hugo-0.101.0-vanilla/go.sum hugo-0.101.0/go.sum +--- hugo-0.101.0-vanilla/go.sum 2022-06-16 02:09:16.000000000 -0500 ++++ hugo-0.101.0/go.sum 2022-08-02 18:03:03.506004512 -0500 +@@ -194,8 +194,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= --github.com/clbanning/mxj/v2 v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E= --github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= -+github.com/clbanning/mxj v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E= -+github.com/clbanning/mxj v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= +-github.com/clbanning/mxj/v2 v2.5.6 h1:Jm4VaCI/+Ug5Q57IzEoZbwx4iQFA6wkXv72juUSeK+g= +-github.com/clbanning/mxj/v2 v2.5.6/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= ++github.com/clbanning/mxj v2.5.6 h1:Jm4VaCI/+Ug5Q57IzEoZbwx4iQFA6wkXv72juUSeK+g= ++github.com/clbanning/mxj v2.5.6/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI= github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -diff -u --recursive hugo-0.98.0-vanilla/parser/frontmatter.go hugo-0.98.0/parser/frontmatter.go ---- hugo-0.98.0-vanilla/parser/frontmatter.go 2022-04-28 05:23:30.000000000 -0500 -+++ hugo-0.98.0/parser/frontmatter.go 2022-06-09 18:32:05.767224675 -0500 +diff -u --recursive hugo-0.101.0-vanilla/parser/frontmatter.go hugo-0.101.0/parser/frontmatter.go +--- hugo-0.101.0-vanilla/parser/frontmatter.go 2022-06-16 02:09:16.000000000 -0500 ++++ hugo-0.101.0/parser/frontmatter.go 2022-08-02 18:03:24.141824608 -0500 @@ -24,7 +24,7 @@ yaml "gopkg.in/yaml.v2" @@ -36,9 +36,9 @@ diff -u --recursive hugo-0.98.0-vanilla/parser/frontmatter.go hugo-0.98.0/parser ) const ( -diff -u --recursive hugo-0.98.0-vanilla/parser/metadecoders/decoder.go hugo-0.98.0/parser/metadecoders/decoder.go ---- hugo-0.98.0-vanilla/parser/metadecoders/decoder.go 2022-04-28 05:23:30.000000000 -0500 -+++ hugo-0.98.0/parser/metadecoders/decoder.go 2022-06-09 18:32:11.091217274 -0500 +diff -u --recursive hugo-0.101.0-vanilla/parser/metadecoders/decoder.go hugo-0.101.0/parser/metadecoders/decoder.go +--- hugo-0.101.0-vanilla/parser/metadecoders/decoder.go 2022-06-16 02:09:16.000000000 -0500 ++++ hugo-0.101.0/parser/metadecoders/decoder.go 2022-08-02 18:03:39.189693421 -0500 @@ -24,7 +24,7 @@ "github.com/gohugoio/hugo/common/herrors" "github.com/niklasfasching/go-org/org" @@ -46,5 +46,5 @@ diff -u --recursive hugo-0.98.0-vanilla/parser/metadecoders/decoder.go hugo-0.98 - xml "github.com/clbanning/mxj/v2" + xml "github.com/clbanning/mxj" toml "github.com/pelletier/go-toml/v2" - "github.com/pkg/errors" "github.com/spf13/afero" + "github.com/spf13/cast" diff --git a/hugo.spec b/hugo.spec index 73b0bca..91cb7d2 100644 --- a/hugo.spec +++ b/hugo.spec @@ -4,7 +4,7 @@ # https://github.com/gohugoio/hugo %global goipath github.com/gohugoio/hugo -Version: 0.98.0 +Version: 0.101.0 %gometa @@ -101,6 +101,7 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1 # releaser: We do not want to test upstream release process (needs git repo) # tpl/time: A test depends on the host timezone, we do now want to test it. # time_test.go:49: [3] DateFormat failed: Unable to Cast 1421733600 to Time # line 35 returns different results +# common/herrors: Terminal colors seem to affect this test. # common/text: Terminal colors seem to affect this test. # deploy: We do not want to test deployment process. # hugolib: We should run this one, but it presently fails. @@ -109,7 +110,8 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1 # langs/i18n: Patched gohugoio/go-i18n/ back to nicksnyder/go-i18n. # metrics: produces wrong quote. # minifiers: produces wrong quote. -%gocheck -d releaser -d tpl/time -d common/text -d deploy -d hugolib -d markup/goldmark/codeblocks -d markup/goldmark -d langs/i18n -d metrics -d minifiers +# resources/resource_transformers/js: error message formats have changed. +%gocheck -d releaser -d tpl/time -d common/herrors -d common/text -d deploy -d hugolib -d markup/goldmark/codeblocks -d markup/goldmark -d langs/i18n -d metrics -d minifiers -d resources/resource_transformers/js %endif