From owner-svn-ports-all@freebsd.org Sat Jan 23 19:37:59 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5968A4DC312; Sat, 23 Jan 2021 19:37:59 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DNRHW2591z4rry; Sat, 23 Jan 2021 19:37:59 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 38D8516A5F; Sat, 23 Jan 2021 19:37:59 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10NJbx1N056872; Sat, 23 Jan 2021 19:37:59 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10NJbw7B056870; Sat, 23 Jan 2021 19:37:58 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202101231937.10NJbw7B056870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Sat, 23 Jan 2021 19:37:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562416 - in head/www/gohugo: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/www/gohugo: . files X-SVN-Commit-Revision: 562416 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jan 2021 19:37:59 -0000 Author: fernape Date: Sat Jan 23 19:37:58 2021 New Revision: 562416 URL: https://svnweb.freebsd.org/changeset/ports/562416 Log: www/gohugo: Allow arbitrary Asciidoc extension in unsafe mode Include change from this pull request[1] as per carlavilla@ request. This allows us to build the new documentation and website without having to create custom scripts. Maintainer notified via e-mail. [1] https://github.com/gohugoio/hugo/pull/8131/files Added: head/www/gohugo/files/ head/www/gohugo/files/patch-markup_asciidocext_convert.go (contents, props changed) head/www/gohugo/files/patch-markup_asciidocext_convert__test.go (contents, props changed) Modified: head/www/gohugo/Makefile Modified: head/www/gohugo/Makefile ============================================================================== --- head/www/gohugo/Makefile Sat Jan 23 19:35:57 2021 (r562415) +++ head/www/gohugo/Makefile Sat Jan 23 19:37:58 2021 (r562416) @@ -3,6 +3,7 @@ PORTNAME= hugo DISTVERSIONPREFIX= v DISTVERSION= 0.80.0 +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= go DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} Added: head/www/gohugo/files/patch-markup_asciidocext_convert.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/gohugo/files/patch-markup_asciidocext_convert.go Sat Jan 23 19:37:58 2021 (r562416) @@ -0,0 +1,11 @@ +--- markup/asciidocext/convert.go.orig 2021-01-23 16:42:36 UTC ++++ markup/asciidocext/convert.go +@@ -105,7 +105,7 @@ func (a *asciidocConverter) parseArgs(ctx converter.Do + args = a.appendArg(args, "-b", cfg.Backend, asciidocext_config.CliDefault.Backend, asciidocext_config.AllowedBackend) + + for _, extension := range cfg.Extensions { +- if !asciidocext_config.AllowedExtensions[extension] { ++ if cfg.SafeMode != "unsafe" && !asciidocext_config.AllowedExtensions[extension] { + a.cfg.Logger.Errorln("Unsupported asciidoctor extension was passed in. Extension `" + extension + "` ignored.") + continue + } Added: head/www/gohugo/files/patch-markup_asciidocext_convert__test.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/gohugo/files/patch-markup_asciidocext_convert__test.go Sat Jan 23 19:37:58 2021 (r562416) @@ -0,0 +1,34 @@ +--- markup/asciidocext/convert_test.go.orig 2021-01-23 16:44:14 UTC ++++ markup/asciidocext/convert_test.go +@@ -115,6 +115,31 @@ func TestAsciidoctorDisallowedArgs(t *testing.T) { + c.Assert(args, qt.DeepEquals, expected) + } + ++func TestAsciidoctorArbitraryExtension(t *testing.T) { ++ c := qt.New(t) ++ cfg := viper.New() ++ mconf := markup_config.Default ++ mconf.AsciidocExt.Extensions = []string{"arbitrary-extension"} ++ p, err := Provider.New( ++ converter.ProviderConfig{ ++ Cfg: cfg, ++ MarkupConfig: mconf, ++ Logger: loggers.NewErrorLogger(), ++ }, ++ ) ++ c.Assert(err, qt.IsNil) ++ ++ conv, err := p.New(converter.DocumentContext{}) ++ c.Assert(err, qt.IsNil) ++ ++ ac := conv.(*asciidocConverter) ++ c.Assert(ac, qt.Not(qt.IsNil)) ++ ++ args := ac.parseArgs(converter.DocumentContext{}) ++ expected := []string{"-r", "arbitrary-extension", "--no-header-footer"} ++ c.Assert(args, qt.DeepEquals, expected) ++} ++ + func TestAsciidoctorDiagramArgs(t *testing.T) { + c := qt.New(t) + cfg := viper.New()