Test page updates

- Update poweredby logos - Add symlink for system_noindex_logo.png on EL9 - Symlink directly to fedora-testpage directory on Fedora
Update create-vendor-tarball.sh script to match rawhide
2023-10-30 18:29:58 -05:00 · 2023-08-24 01:13:36 -05:00 · 2023-08-15 18:04:10 -05:00 · 2023-08-15 18:03:01 -05:00 · 2023-08-15 18:02:11 -05:00 · 2023-08-15 17:07:33 -05:00
8 changed files with 358 additions and 1484 deletions
--- a/0001-Disable-commands-that-can-alter-the-binary.patch
+++ b/0001-Disable-commands-that-can-alter-the-binary.patch
@ -1,4 +1,4 @@
-From 7bf03a1414b1ebc1a9ef573369fe8e7ee9956a33 Mon Sep 17 00:00:00 2001
+From 08a40c6b09cf5e649c82829724b858b385b3cd66 Mon Sep 17 00:00:00 2001
 From: Carl George <carl@george.computer>
 Date: Wed, 16 Feb 2022 11:45:03 -0600
 Subject: [PATCH] Disable commands that can alter the binary
@ -8,10 +8,10 @@ Subject: [PATCH] Disable commands that can alter the binary
 1 file changed, 48 deletions(-)

 diff --git a/cmd/commands.go b/cmd/commands.go
-index 1e2c40de..cc091bce 100644
+index 9216b898..85f7bc7d 100644
 --- a/cmd/commands.go
 +++ b/cmd/commands.go
-@@ -289,54 +289,6 @@ is always printed to stdout.`,
+@@ -333,54 +333,6 @@ is always printed to stdout.`,
 		}(),
 	})
 
@ -63,9 +63,9 @@ index 1e2c40de..cc091bce 100644
 -		}(),
 -	})
 -
- }
- 
- // RegisterCommand registers the command cmd.
+ 	RegisterCommand(Command{
+ 		Name: "manpage",
+ 		Func: func(fl Flags) (int, error) {
 -- 
-2.35.1
+2.41.0

--- a/1210
+++ b/1210
--- a/caddy.spec
+++ b/caddy.spec
@ -1,55 +1,24 @@
-# https://github.com/caddyserver/caddy
 %global goipath         github.com/caddyserver/caddy
-%global basever         2.5.2
-#global prerel          rc
-#global prerelnum       3
-Version:                %{basever}%{?prerel:~%{prerel}%{prerelnum}}
-
-%gometa -f
-
-%global common_description %{expand:
-Caddy is the web server with automatic HTTPS.}

 Name:           caddy
-Release:        4%{?dist}
+Version:        2.6.4
+Release:        2%{?dist}
 Summary:        Web server with automatic HTTPS
-# github.com/caddyserver/caddy ASL 2.0
-# github.com/BurntSushi/toml MIT
-# github.com/Masterminds/sprig/v3 MIT
-# github.com/alecthomas/chroma MIT
-# github.com/aryann/difflib MIT
-# github.com/caddyserver/certmagic ASL 2.0
-# github.com/dustin/go-humanize MIT
-# github.com/go-chi/chi MIT
-# github.com/google/cel-go ASL 2.0
-# github.com/google/uuid BSD
-# github.com/klauspost/compress BSD and ASL 2.0
-# github.com/klauspost/cpuid/v2 MIT
-# github.com/lucas-clemente/quic-go MIT
-# github.com/mholt/acmez ASL 2.0
-# github.com/prometheus/client_golang ASL 2.0
-# github.com/smallstep/certificates ASL 2.0
-# github.com/smallstep/cli ASL 2.0
-# github.com/smallstep/nosql ASL 2.0
-# github.com/smallstep/truststore ASL 2.0
-# github.com/tailscale/tscert BSD
-# github.com/yuin/goldmark MIT
-# github.com/yuin/goldmark-highlighting MIT
-# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp ASL 2.0
-# go.opentelemetry.io/otel ASL 2.0
-# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc ASL 2.0
-# go.opentelemetry.io/otel/sdk ASL 2.0
-# go.uber.org/zap MIT
-# golang.org/x/crypto BSD
-# golang.org/x/net BSD
-# golang.org/x/term BSD
-# google.golang.org/genproto ASL 2.0
-# google.golang.org/protobuf BSD
-# gopkg.in/natefinch/lumberjack.v2 MIT
-# gopkg.in/yaml.v3 ASL 2.0 and MIT
-License:        ASL 2.0 and MIT and BSD
+# main source code is Apache-2.0
+# see comments above provides tags for bundled license breakdown
+License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND BSD-2-Clause-Views AND ISC AND CC0-1.0 AND MPL-2.0
 URL:            https://caddyserver.com

+%if %{defined fedora}
+ExclusiveArch:  %{golang_arches_future}
+%else
+ExclusiveArch:  %{golang_arches}
+%endif
+
+%if %{undefined el8}
+BuildRequires:  go-rpm-macros
+%endif
+
 # see create-vendor-tarball.sh in this distgit repo
 Source0:        caddy-%{version}-vendored.tar.gz

@ -60,48 +29,269 @@ Source20:       caddy.service
 Source21:       caddy-api.service
 Source30:       poweredby-white.png
 Source31:       poweredby-black.png
-Source40:       bash-completion
-Source41:       zsh-completion

 # downstream only patch to disable commands that can alter the binary
 Patch:          0001-Disable-commands-that-can-alter-the-binary.patch

-# https://github.com/caddyserver/caddy/commit/b4f1a713978f44b6f26721bd4eaa355164e3e6f4
-BuildRequires:  golang >= 1.17
+# https://github.com/caddyserver/caddy/commit/141872ed80d6323505e7543628c259fdae8506d3
+BuildRequires:  golang >= 1.18

-Provides:       bundled(golang(github.com/BurntSushi/toml)) = 1.1.0
-Provides:       bundled(golang(github.com/Masterminds/sprig/v3)) = 3.2.2
-Provides:       bundled(golang(github.com/alecthomas/chroma)) = 0.10.0
-Provides:       bundled(golang(github.com/aryann/difflib))
-Provides:       bundled(golang(github.com/caddyserver/certmagic)) = 0.16.1
-Provides:       bundled(golang(github.com/dustin/go-humanize))
-Provides:       bundled(golang(github.com/go-chi/chi)) = 4.1.2
-Provides:       bundled(golang(github.com/google/cel-go)) = 0.11.4
+# BSD-3-Clause
+Provides:       bundled(golang(filippo.io/edwards25519)) = 1.0.0
+# MIT AND CC0-1.0
+Provides:       bundled(golang(github.com/AndreasBriese/bbloom)) = 46b345b
+# MIT
+Provides:       bundled(golang(github.com/BurntSushi/toml)) = 1.2.1
+# Apache-2.0
+Provides:       bundled(golang(github.com/Masterminds/goutils)) = 1.1.1
+# MIT
+Provides:       bundled(golang(github.com/Masterminds/semver/v3)) = 3.2.0
+# MIT
+Provides:       bundled(golang(github.com/Masterminds/sprig/v3)) = 3.2.3
+# MIT
+Provides:       bundled(golang(github.com/Microsoft/go-winio)) = 0.6.0
+# MIT
+Provides:       bundled(golang(github.com/alecthomas/chroma/v2)) = 2.5.0
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/antlr/antlr4/runtime/Go/antlr)) = 1.4.10
+# MIT
+Provides:       bundled(golang(github.com/aryann/difflib)) = ff5ff6d
+# MIT
+Provides:       bundled(golang(github.com/beorn7/perks)) = 1.0.1
+# Apache-2.0
+Provides:       bundled(golang(github.com/caddyserver/certmagic)) = 0.17.2
+# MIT
+Provides:       bundled(golang(github.com/cenkalti/backoff/v4)) = 4.1.2
+# MIT
+Provides:       bundled(golang(github.com/cespare/xxhash)) = 1.1.0
+# MIT
+Provides:       bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.2
+# MIT
+Provides:       bundled(golang(github.com/chzyer/readline)) = 2972be2
+# MIT
+Provides:       bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.2
+# ISC
+Provides:       bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
+# Apache-2.0
+Provides:       bundled(golang(github.com/dgraph-io/badger)) = 1.6.2
+# Apache-2.0
+Provides:       bundled(golang(github.com/dgraph-io/badger/v2)) = 2.2007.4
+# Apache-2.0 AND MIT
+Provides:       bundled(golang(github.com/dgraph-io/ristretto)) = 0.1.0
+# MIT
+Provides:       bundled(golang(github.com/dgryski/go-farm)) = a6ae236
+# MIT
+Provides:       bundled(golang(github.com/dlclark/regexp2)) = 1.7.0
+# MIT
+Provides:       bundled(golang(github.com/dustin/go-humanize)) = 1.0.1
+# MIT
+Provides:       bundled(golang(github.com/felixge/httpsnoop)) = 1.0.3
+# MIT
+Provides:       bundled(golang(github.com/fxamacker/cbor/v2)) = 2.4.0
+# MIT
+Provides:       bundled(golang(github.com/go-chi/chi)) = 4.1.2+incompatible
+# MIT
+Provides:       bundled(golang(github.com/go-kit/kit)) = 0.10.0
+# MIT
+Provides:       bundled(golang(github.com/go-logfmt/logfmt)) = 0.5.1
+# Apache-2.0
+Provides:       bundled(golang(github.com/go-logr/logr)) = 1.2.3
+# Apache-2.0
+Provides:       bundled(golang(github.com/go-logr/stdr)) = 1.2.2
+# MPL-2.0
+Provides:       bundled(golang(github.com/go-sql-driver/mysql)) = 1.6.0
+# MIT
+Provides:       bundled(golang(github.com/go-task/slim-sprig)) = 348f09d
+# Apache-2.0
+Provides:       bundled(golang(github.com/golang/glog)) = 1.0.0
+# Apache-2.0
+Provides:       bundled(golang(github.com/golang/mock)) = 1.6.0
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/golang/protobuf)) = 1.5.2
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/golang/snappy)) = 0.0.4
+# Apache-2.0
+Provides:       bundled(golang(github.com/google/cel-go)) = 0.13.0
+# Apache-2.0
+Provides:       bundled(golang(github.com/google/pprof)) = 94a9f03
+# BSD-3-Clause
 Provides:       bundled(golang(github.com/google/uuid)) = 1.3.0
-Provides:       bundled(golang(github.com/klauspost/compress)) = 1.15.6
-Provides:       bundled(golang(github.com/klauspost/cpuid/v2)) = 2.0.13
-Provides:       bundled(golang(github.com/lucas-clemente/quic-go)) = 0.28.0
-Provides:       bundled(golang(github.com/mholt/acmez)) = 1.0.2
-Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.12.1
-Provides:       bundled(golang(github.com/smallstep/certificates)) = 0.19.0
-Provides:       bundled(golang(github.com/smallstep/cli)) = 0.18.0
-Provides:       bundled(golang(github.com/smallstep/nosql)) = 0.4.0
-Provides:       bundled(golang(github.com/smallstep/truststore)) = 0.11.0
-Provides:       bundled(golang(github.com/tailscale/tscert))
-Provides:       bundled(golang(github.com/yuin/goldmark)) = 1.4.12
-Provides:       bundled(golang(github.com/yuin/goldmark-highlighting))
-Provides:       bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.29.0
-Provides:       bundled(golang(go.opentelemetry.io/otel)) = 1.4.0
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/grpc-ecosystem/grpc-gateway)) = 1.16.0
+# MIT
+Provides:       bundled(golang(github.com/huandu/xstrings)) = 1.3.3
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/imdario/mergo)) = 0.3.12
+# Apache-2.0
+Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 1.0.1
+# MIT
+Provides:       bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1
+# MIT
+Provides:       bundled(golang(github.com/jackc/pgconn)) = 1.13.0
+# MIT
+Provides:       bundled(golang(github.com/jackc/pgio)) = 1.0.0
+# MIT
+Provides:       bundled(golang(github.com/jackc/pgpassfile)) = 1.0.0
+# MIT
+Provides:       bundled(golang(github.com/jackc/pgproto3/v2)) = 2.3.1
+# MIT
+Provides:       bundled(golang(github.com/jackc/pgservicefile)) = 2b9c447
+# MIT
+Provides:       bundled(golang(github.com/jackc/pgtype)) = 1.12.0
+# MIT
+Provides:       bundled(golang(github.com/jackc/pgx/v4)) = 4.17.2
+# BSD-3-Clause AND Apache-2.0 AND MIT
+Provides:       bundled(golang(github.com/klauspost/compress)) = 1.15.15
+# MIT
+Provides:       bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.3
+# MIT
+Provides:       bundled(golang(github.com/libdns/libdns)) = 0.2.1
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/manifoldco/promptui)) = 0.9.0
+# MIT
+Provides:       bundled(golang(github.com/mattn/go-colorable)) = 0.1.8
+# MIT
+Provides:       bundled(golang(github.com/mattn/go-isatty)) = 0.0.13
+# Apache-2.0
+Provides:       bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.1
+# MIT
+Provides:       bundled(golang(github.com/mgutz/ansi)) = d51e80e
+# Apache-2.0
+Provides:       bundled(golang(github.com/mholt/acmez)) = 1.1.0
+# MIT
+Provides:       bundled(golang(github.com/micromdm/scep/v2)) = 2.1.0
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/miekg/dns)) = 1.1.50
+# MIT
+Provides:       bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0
+# MIT
+Provides:       bundled(golang(github.com/mitchellh/go-ps)) = 1.0.0
+# MIT
+Provides:       bundled(golang(github.com/mitchellh/reflectwalk)) = 1.0.2
+# MIT
+Provides:       bundled(golang(github.com/onsi/ginkgo/v2)) = 2.2.0
+# BSD-2-Clause
+Provides:       bundled(golang(github.com/pkg/errors)) = 0.9.1
+# Apache-2.0
+Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.14.0
+# Apache-2.0
+Provides:       bundled(golang(github.com/prometheus/client_model)) = 0.3.0
+# Apache-2.0
+Provides:       bundled(golang(github.com/prometheus/common)) = 0.37.0
+# Apache-2.0
+Provides:       bundled(golang(github.com/prometheus/procfs)) = 0.8.0
+# MIT
+Provides:       bundled(golang(github.com/quic-go/qpack)) = 0.4.0
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/quic-go/qtls-go1-18)) = 0.2.0
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/quic-go/qtls-go1-19)) = 0.2.0
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.1.0
+# MIT
+Provides:       bundled(golang(github.com/quic-go/quic-go)) = 0.32.0
+# MIT
+Provides:       bundled(golang(github.com/rs/xid)) = 1.4.0
+# BSD-2-Clause
+Provides:       bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0
+# MIT
+Provides:       bundled(golang(github.com/shopspring/decimal)) = 1.2.0
+# MIT
+Provides:       bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0
+# MIT
+Provides:       bundled(golang(github.com/sirupsen/logrus)) = 1.9.0
+# MIT
+Provides:       bundled(golang(github.com/slackhq/nebula)) = 1.6.1
+# Apache-2.0
+Provides:       bundled(golang(github.com/smallstep/certificates)) = 0.23.2
+# Apache-2.0
+Provides:       bundled(golang(github.com/smallstep/nosql)) = 0.5.0
+# Apache-2.0
+Provides:       bundled(golang(github.com/smallstep/truststore)) = 0.12.1
+# MIT
+Provides:       bundled(golang(github.com/spf13/cast)) = 1.4.1
+# Apache-2.0
+Provides:       bundled(golang(github.com/spf13/cobra)) = 1.6.1
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/spf13/pflag)) = 1.0.5
+# MIT
+Provides:       bundled(golang(github.com/stoewer/go-strcase)) = 1.2.0
+# BSD-3-Clause
+Provides:       bundled(golang(github.com/tailscale/tscert)) = c6dc1f4
+# MIT
+Provides:       bundled(golang(github.com/urfave/cli)) = 1.22.12
+# MIT
+Provides:       bundled(golang(github.com/x448/float16)) = 0.8.4
+# MIT
+Provides:       bundled(golang(github.com/yuin/goldmark)) = 1.5.4
+# MIT
+Provides:       bundled(golang(github.com/yuin/goldmark-highlighting/v2)) = 1513624
+# MIT
+Provides:       bundled(golang(go.etcd.io/bbolt)) = 1.3.6
+# MIT
+Provides:       bundled(golang(go.mozilla.org/pkcs7)) = 33d0574
+# Apache-2.0
+Provides:       bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.39.0
+# Apache-2.0
+Provides:       bundled(golang(go.opentelemetry.io/otel)) = 1.13.0
+# Apache-2.0
+Provides:       bundled(golang(go.opentelemetry.io/otel/exporters/otlp/internal/retry)) = 1.4.0
+# Apache-2.0
+Provides:       bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.4.0
+# Apache-2.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.4.0
-Provides:       bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.4.0
-Provides:       bundled(golang(go.uber.org/zap)) = 1.21.0
-Provides:       bundled(golang(golang.org/x/crypto))
-Provides:       bundled(golang(golang.org/x/net))
-Provides:       bundled(golang(golang.org/x/term))
-Provides:       bundled(golang(google.golang.org/genproto))
-Provides:       bundled(golang(google.golang.org/protobuf)) = 1.28.0
-Provides:       bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = 2.0.0
+# Apache-2.0
+Provides:       bundled(golang(go.opentelemetry.io/otel/metric)) = 0.36.0
+# Apache-2.0
+Provides:       bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.13.0
+# Apache-2.0
+Provides:       bundled(golang(go.opentelemetry.io/otel/trace)) = 1.13.0
+# Apache-2.0
+Provides:       bundled(golang(go.opentelemetry.io/proto/otlp)) = 0.12.0
+# Apache-2.0 AND BSD-2-Clause
+Provides:       bundled(golang(go.step.sm/cli-utils)) = 0.7.5
+# Apache-2.0 AND BSD-2-Clause
+Provides:       bundled(golang(go.step.sm/crypto)) = 0.23.2
+# Apache-2.0
+Provides:       bundled(golang(go.step.sm/linkedca)) = 0.19.0
+# MIT
+Provides:       bundled(golang(go.uber.org/atomic)) = 1.9.0
+# MIT
+Provides:       bundled(golang(go.uber.org/multierr)) = 1.6.0
+# MIT
+Provides:       bundled(golang(go.uber.org/zap)) = 1.24.0
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/crypto)) = 0.5.0
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/exp)) = 47842c8
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/mod)) = 0.6.0
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/net)) = 0.7.0
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/sync)) = 0.1.0
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/sys)) = 0.5.0
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/term)) = 0.5.0
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/text)) = 0.7.0
+# BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/tools)) = 0.2.0
+# Apache-2.0
+Provides:       bundled(golang(google.golang.org/genproto)) = 008b390
+# Apache-2.0
+Provides:       bundled(golang(google.golang.org/grpc)) = 1.52.3
+# BSD-3-Clause
+Provides:       bundled(golang(google.golang.org/protobuf)) = 1.28.1
+# MIT
+Provides:       bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = 2.2.1
+# Apache-2.0 AND BSD-3-Clause
+Provides:       bundled(golang(gopkg.in/square/go-jose.v2)) = 2.6.0
+# Apache-2.0 AND MIT
 Provides:       bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
+# BSD-2-Clause-Views AND BSD-3-Clause
+Provides:       bundled(golang(howett.net/plist)) = 1.0.0

 BuildRequires:  systemd-rpm-macros
 %{?systemd_requires}
@ -109,23 +299,29 @@ Requires:       system-logos-httpd
 Provides:       webserver


-%description %{common_description}
+%description
+Caddy is the web server with automatic HTTPS.


 %prep
-%goprep -k
-%autopatch -p 1
-
-sed -e '/mod.Version/ s/unknown/%{version}-%{release}/' -i caddy.go
+%autosetup -p 1
+mkdir -p src/$(dirname %{goipath})
+ln -s $PWD src/%{goipath}


 %build
-%gobuild -o %{gobuilddir}/bin/caddy %{goipath}/cmd/caddy
+export GO111MODULE=off
+export GOPATH=$PWD
+export LDFLAGS="-X %{goipath}.CustomVersion=v%{version}"
+%gobuild -o bin/caddy %{goipath}/cmd/caddy


 %install
 # command
-install -D -p -m 0755 %{gobuilddir}/bin/caddy %{buildroot}%{_bindir}/caddy
+install -D -p -m 0755 bin/caddy %{buildroot}%{_bindir}/caddy
+
+# man pages
+./bin/caddy manpage --directory %{buildroot}%{_mandir}/man8

 # config
 install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/caddy/Caddyfile
@ -141,20 +337,35 @@ install -d -m 0750 %{buildroot}%{_sharedstatedir}/caddy
 # welcome page
 %if %{defined fedora}
 install -D -p -m 0644 %{S:30} %{buildroot}%{_datadir}/caddy/poweredby.png
+ln -s ../fedora-testpage/index.html %{buildroot}%{_datadir}/caddy/index.html
 %else
 install -D -p -m 0644 %{S:31} %{buildroot}%{_datadir}/caddy/poweredby.png
-%endif
 ln -s ../testpage/index.html %{buildroot}%{_datadir}/caddy/index.html
+%endif
 install -d -m 0755 %{buildroot}%{_datadir}/caddy/icons
 ln -s ../../pixmaps/poweredby.png %{buildroot}%{_datadir}/caddy/icons/poweredby.png
+%if %{defined rhel} && 0%{?rhel} >= 9
+ln -s ../pixmaps/system-noindex-logo.png %{buildroot}%{_datadir}/caddy/system_noindex_logo.png
+%endif

-# shell completion
-install -D -p -m 0644 %{S:40} %{buildroot}%{_datadir}/bash-completion/completions/caddy
-install -D -p -m 0644 %{S:41} %{buildroot}%{_datadir}/zsh/site-functions/_caddy
+# shell completions
+install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions
+./bin/caddy completion bash > %{buildroot}%{_datadir}/bash-completion/completions/caddy
+install -d -m 0755 %{buildroot}%{_datadir}/zsh/site-functions
+./bin/caddy completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_caddy
+install -d -m 0755 %{buildroot}%{_datadir}/fish/vendor_completions.d
+./bin/caddy completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/caddy.fish


 %check
-%gocheck
+# ensure that the version was embedded correctly
+[[ "$(./bin/caddy version)" == "v%{version}" ]] || exit 1
+
+# run the upstream tests
+export GO111MODULE=off
+export GOPATH=$PWD
+cd src/%{goipath}
+%gotest ./...


 %pre
@ -220,6 +431,7 @@ fi
 %license LICENSE
 %doc README.md AUTHORS
 %{_bindir}/caddy
+%{_mandir}/man8/caddy*.8*
 %{_datadir}/caddy
 %{_unitdir}/caddy.service
 %{_unitdir}/caddy-api.service
@ -233,9 +445,24 @@ fi
 %dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_caddy
+# own parent directories in case fish is not installed
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/vendor_completions.d
+%{_datadir}/fish/vendor_completions.d/caddy.fish


 %changelog
+* Mon Oct 30 2023 Carl George <carlwgeorge@fedoraproject.org> - 2.6.4-2
+- Update poweredby logos
+- Add symlink for system_noindex_logo.png on EL9
+- Symlink directly to fedora-testpage directory on Fedora
+
+* Tue Aug 15 2023 Carl George <carlwgeorge@fedoraproject.org> - 2.6.4-1
+- Update to version 2.6.4
+- Add man pages
+- Use generated shell completion files instead of static ones
+- Add fish shell completions
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

--- a/create-vendor-tarball.sh
+++ b/create-vendor-tarball.sh
@ -1,15 +1,38 @@
 #!/usr/bin/bash

-version=$1
+tag=$1

-if [[ -z ${version} ]]; then
-    echo "This script requires the version as an argument."
+if [[ -z $tag ]]; then
+    echo "This script requires the tag as an argument."
    exit 1
 fi

-git clone --branch v${version} --depth 1 https://github.com/caddyserver/caddy.git caddy-${version}
-pushd caddy-${version}
-go mod vendor
+set -euo pipefail
+
+# transform tag into version
+case $tag in
+    *beta*)
+        # v2.0.0-beta.1 -> 2.0.0~beta1
+        temp=${tag#v}
+        version=${temp/-beta./~beta}
+        ;;
+    *rc*)
+        # v2.0.0-rc.1 -> 2.0.0~rc1
+        temp=${tag#v}
+        version=${temp/-rc./~rc}
+        ;;
+    *)
+        # v2.0.0 -> 2.0.0
+        version=${tag#v}
+        ;;
+esac
+
+echo "Using tag: $tag"
+echo "Using version: $version"
+
+git -c advice.detachedHead=false clone --branch $tag --depth 1 https://github.com/caddyserver/caddy.git caddy-$version
+pushd caddy-$version
+GOPROXY='https://proxy.golang.org,direct' go mod vendor
 popd
-tar --exclude .git -czf caddy-${version}-vendored.tar.gz caddy-${version}
-rm -r caddy-${version}
+tar --exclude .git -czf caddy-$version-vendored.tar.gz caddy-$version
+rm -r caddy-$version
--- a/poweredby-black.png
+++ b/poweredby-black.png
--- a/poweredby-white.png
+++ b/poweredby-white.png
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (caddy-2.5.2-vendored.tar.gz) = 2b7eb72552c8ae3d5ba4240bf3593fa9374d3863ee93c4f3718f57781987548f0f163458396c18d93d72d8dd81d5ab7e66ccf65cd4ea97c76948bad174e2ba3a
+SHA512 (caddy-2.6.4-vendored.tar.gz) = 877e5975eab7315f3327fa381f2361563b3e8711f66240029768a9d0b4b7d0b961973a7a67e5baf4ba8039659bc708a408482442b3dba9b51822bb196f3cf2e0
--- a/166
+++ b/166
@ -1,166 +0,0 @@
-#compdef caddy
-
-function _caddy {
-  local _line
-
-  _arguments -C \
-    "1: :(adapt build-info environ file-server fmt hash-password help list-modules reload reverse-proxy run start stop trust untrust validate version)" \
-  "*::arg:->args"
-
-    case $line[1] in
-      adapt)
-        __caddy_adapt
-      ;;
-      build-info)
-        __caddy_build-info
-      ;;
-      environ)
-        __caddy_environ
-      ;;
-      file-server)
-        __caddy_file-server
-      ;;
-      fmt)
-        __caddy_fmt
-      ;;
-      hash-password)
-        __caddy_hash-password
-      ;;
-      help)
-        __caddy_help
-      ;;
-      list-modules)
-        __caddy_list-modules
-      ;;
-      reload)
-        __caddy_reload
-      ;;
-      reverse-proxy)
-        __caddy_reverse-proxy
-      ;;
-      run)
-        __caddy_run
-      ;;
-      start)
-        __caddy_start
-      ;;
-      stop)
-        __caddy_stop
-      ;;
-      trust)
-        __caddy_trust
-      ;;
-      untrust)
-        __caddy_untrust
-      ;;
-      validate)
-        __caddy_validate
-      ;;
-      version)
-        __caddy_version
-      ;;
-    esac
-}
-
-function __caddy_adapt {
-  _arguments \
-      "--pretty: :"  \
-      "--validate: :"  \
-      "--adapter: :_files"  \
-      "--config: :_files"  \
-
-}
-function __caddy_build-info {
-
-}
-function __caddy_environ {
-
-}
-function __caddy_file-server {
-  _arguments \
-      "--browse: :"  \
-      "--templates: :"  \
-      "--domain: :_files"  \
-      "--listen: :_files"  \
-      "--root: :_dirs"  \
-
-}
-function __caddy_fmt {
-  _arguments \
-      "--overwrite: :"  \
-
-}
-function __caddy_hash-password {
-  _arguments \
-      "--algorithm: :_files"  \
-      "--plaintext: :_files"  \
-      "--salt: :_files"  \
-
-}
-function __caddy_help {
-
-}
-function __caddy_list-modules {
-  _arguments \
-      "--versions: :"  \
-
-}
-function __caddy_reload {
-  _arguments \
-      "--adapter: :_files"  \
-      "--config: :_files"  \
-      "--address: :_files"  \
-
-}
-function __caddy_reverse-proxy {
-  _arguments \
-      "--change-host-header: :"  \
-      "--from: :_files"  \
-      "--to: :_files"  \
-
-}
-function __caddy_run {
-  _arguments \
-      "--environ: :"  \
-      "--resume: :"  \
-      "--watch: :"  \
-      "--adapter: :_files"  \
-      "--config: :_files"  \
-      "--pingback: :_files"  \
-      "--pidfile: :_files"  \
-
-}
-function __caddy_start {
-  _arguments \
-      "--watch: :"  \
-      "--adapter: :_files"  \
-      "--config: :_files"  \
-      "--pidfile: :_files"  \
-
-}
-function __caddy_stop {
-  _arguments \
-      "--address: :_files"  \
-
-}
-function __caddy_trust {
-
-}
-function __caddy_untrust {
-  _arguments \
-      "--ca: :_files"  \
-      "--cert: :_files"  \
-
-}
-function __caddy_validate {
-  _arguments \
-      "--config: :_files"  \
-      "--adapter: :_files"  \
-
-}
-function __caddy_version {
-
-}
-
-_caddy
-
Author	SHA1	Message	Date
Carl George	a3decf2e65	Test page updates - Update poweredby logos - Add symlink for system_noindex_logo.png on EL9 - Symlink directly to fedora-testpage directory on Fedora	2023-10-30 18:29:58 -05:00
Carl George	c37ccf685b	Update create-vendor-tarball.sh script to match rawhide	2023-08-24 01:13:36 -05:00
Carl George	e241718bf1	Add fish shell completions	2023-08-15 18:04:10 -05:00
Carl George	464053139e	Use generated shell completion files instead of static ones	2023-08-15 18:03:01 -05:00
Carl George	947aa45605	Add man pages	2023-08-15 18:02:11 -05:00
Carl George	838a382f4f	Update to version 2.6.4 I'm targeting this version specifically for EPEL 8, because RHEL 8 currently has golang 1.19, and 2.6.4 is the newest version of caddy that doesn't require a higher golang version.	2023-08-15 17:07:33 -05:00
Carl George	19e9b39c34	Remove usage of %gometa, %goprep, %gobuilddir, and %gocheck These macros are inconsistent across EPEL branches.	2023-08-15 16:14:40 -05:00