From 343b0c4c2444d463474d758adf21f587b0385359 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 21:41:15 +0000 Subject: [PATCH 01/18] Rebuild for golang 1.22.0 --- caddy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/caddy.spec b/caddy.spec index f0e2aee..468f148 100644 --- a/caddy.spec +++ b/caddy.spec @@ -2,7 +2,7 @@ Name: caddy Version: 2.7.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web server with automatic HTTPS # main source code is Apache-2.0 # see comments above provides tags for bundled license breakdown @@ -469,6 +469,9 @@ fi %changelog +* Sun Feb 11 2024 Maxwell G - 2.7.6-2 +- Rebuild for golang 1.22.0 + * Fri Feb 09 2024 Carl George - 2.7.6-1 - Update to version 2.7.6 rhbz#2253698 - Includes fix for CVE-2023-45142 rhbz#2246587 From db85180819e77a5780e2d0ae050c3b8ab954820e Mon Sep 17 00:00:00 2001 From: Carl George Date: Fri, 5 Jul 2024 19:04:22 -0500 Subject: [PATCH 02/18] Update to version 2.8.4 rhbz#2278549 - Resolves CVE-2023-49295 rhbz#2257829 - Resolves CVE-2024-27304 rhbz#2268278 - Resolves CVE-2024-27289 rhbz#2268468 - Resolves CVE-2024-28180 rhbz#2268877 - Resolves CVE-2024-22189 rhbz#2273517 --- ...e-commands-that-can-alter-the-binary.patch | 6 +- ...hat-fail-in-an-RPM-build-environment.patch | 189 ++++++++++++++++++ caddy.spec | 183 +++++++++-------- sources | 2 +- 4 files changed, 292 insertions(+), 88 deletions(-) create mode 100644 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch diff --git a/0001-Disable-commands-that-can-alter-the-binary.patch b/0001-Disable-commands-that-can-alter-the-binary.patch index 07f25a5..f733ed0 100644 --- a/0001-Disable-commands-that-can-alter-the-binary.patch +++ b/0001-Disable-commands-that-can-alter-the-binary.patch @@ -1,7 +1,7 @@ -From 4f771cd0f5f1a1a66bc142a98d3356296fa656a5 Mon Sep 17 00:00:00 2001 +From 0ccec11094eeb39666cb3395a40cc425c5f38107 Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 16 Feb 2022 11:45:03 -0600 -Subject: [PATCH] Disable commands that can alter the binary +Subject: [PATCH 1/2] Disable commands that can alter the binary --- cmd/commands.go | 44 -------------------------------------------- @@ -63,5 +63,5 @@ index e5e1265e..972d24dc 100644 Name: "manpage", Usage: "--directory ", -- -2.41.0 +2.45.2 diff --git a/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch b/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch new file mode 100644 index 0000000..3749dab --- /dev/null +++ b/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch @@ -0,0 +1,189 @@ +From 181946293299d605d287e0c650e89cd9ace4222b Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Thu, 30 May 2024 21:48:09 -0500 +Subject: [PATCH 2/2] Skip ACME integration tests that fail in an RPM build + environment + +--- + caddytest/integration/acme_test.go | 7 +++++++ + caddytest/integration/acmeserver_test.go | 10 ++++++++++ + caddytest/integration/caddyfile_test.go | 7 +++++++ + caddytest/integration/handler_test.go | 4 ++++ + caddytest/integration/leafcertloaders_test.go | 4 ++++ + caddytest/integration/listener_test.go | 4 ++++ + 6 files changed, 36 insertions(+) + +diff --git a/caddytest/integration/acme_test.go b/caddytest/integration/acme_test.go +index ceacd1db..af087a27 100644 +--- a/caddytest/integration/acme_test.go ++++ b/caddytest/integration/acme_test.go +@@ -8,6 +8,7 @@ import ( + "fmt" + "net" + "net/http" ++ "os" + "strings" + "testing" + +@@ -23,6 +24,9 @@ const acmeChallengePort = 9081 + + // Test the basic functionality of Caddy's ACME server + func TestACMEServerWithDefaults(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + ctx := context.Background() + logger, err := zap.NewDevelopment() + if err != nil { +@@ -94,6 +98,9 @@ func TestACMEServerWithDefaults(t *testing.T) { + } + + func TestACMEServerWithMismatchedChallenges(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + ctx := context.Background() + logger := caddy.Log().Named("acmez") + +diff --git a/caddytest/integration/acmeserver_test.go b/caddytest/integration/acmeserver_test.go +index 22b716f8..df418741 100644 +--- a/caddytest/integration/acmeserver_test.go ++++ b/caddytest/integration/acmeserver_test.go +@@ -5,6 +5,7 @@ import ( + "crypto/ecdsa" + "crypto/elliptic" + "crypto/rand" ++ "os" + "strings" + "testing" + +@@ -15,6 +16,9 @@ import ( + ) + + func TestACMEServerDirectory(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := caddytest.NewTester(t) + tester.InitServer(` + { +@@ -41,6 +45,9 @@ func TestACMEServerDirectory(t *testing.T) { + } + + func TestACMEServerAllowPolicy(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := caddytest.NewTester(t) + tester.InitServer(` + { +@@ -131,6 +138,9 @@ func TestACMEServerAllowPolicy(t *testing.T) { + } + + func TestACMEServerDenyPolicy(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := caddytest.NewTester(t) + tester.InitServer(` + { +diff --git a/caddytest/integration/caddyfile_test.go b/caddytest/integration/caddyfile_test.go +index 11ffc08a..25aed784 100644 +--- a/caddytest/integration/caddyfile_test.go ++++ b/caddytest/integration/caddyfile_test.go +@@ -3,6 +3,7 @@ package integration + import ( + "net/http" + "net/url" ++ "os" + "testing" + + "github.com/caddyserver/caddy/v2/caddytest" +@@ -73,6 +74,9 @@ func TestDuplicateHosts(t *testing.T) { + } + + func TestReadCookie(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + localhost, _ := url.Parse("http://localhost") + cookie := http.Cookie{ + Name: "clientname", +@@ -106,6 +110,9 @@ func TestReadCookie(t *testing.T) { + } + + func TestReplIndex(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := caddytest.NewTester(t) + tester.InitServer(` + { +diff --git a/caddytest/integration/handler_test.go b/caddytest/integration/handler_test.go +index afc700b0..93d07bb9 100644 +--- a/caddytest/integration/handler_test.go ++++ b/caddytest/integration/handler_test.go +@@ -3,6 +3,7 @@ package integration + import ( + "bytes" + "net/http" ++ "os" + "testing" + + "github.com/caddyserver/caddy/v2/caddytest" +@@ -32,6 +33,9 @@ func TestBrowse(t *testing.T) { + } + + func TestRespondWithJSON(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := caddytest.NewTester(t) + tester.InitServer(` + { +diff --git a/caddytest/integration/leafcertloaders_test.go b/caddytest/integration/leafcertloaders_test.go +index 4399902e..de8539dd 100644 +--- a/caddytest/integration/leafcertloaders_test.go ++++ b/caddytest/integration/leafcertloaders_test.go +@@ -1,12 +1,16 @@ + package integration + + import ( ++ "os" + "testing" + + "github.com/caddyserver/caddy/v2/caddytest" + ) + + func TestLeafCertLoaders(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := caddytest.NewTester(t) + tester.InitServer(` + { +diff --git a/caddytest/integration/listener_test.go b/caddytest/integration/listener_test.go +index 30642b1a..f1d8d07e 100644 +--- a/caddytest/integration/listener_test.go ++++ b/caddytest/integration/listener_test.go +@@ -6,6 +6,7 @@ import ( + "math/rand" + "net" + "net/http" ++ "os" + "strings" + "testing" + +@@ -51,6 +52,9 @@ func setupListenerWrapperTest(t *testing.T, handlerFunc http.HandlerFunc) *caddy + } + + func TestHTTPRedirectWrapperWithLargeUpload(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + const uploadSize = (1024 * 1024) + 1 // 1 MB + 1 byte + // 1 more than an MB + body := make([]byte, uploadSize) +-- +2.45.2 + diff --git a/caddy.spec b/caddy.spec index 468f148..7e85999 100644 --- a/caddy.spec +++ b/caddy.spec @@ -1,8 +1,8 @@ %global goipath github.com/caddyserver/caddy Name: caddy -Version: 2.7.6 -Release: 2%{?dist} +Version: 2.8.4 +Release: 1%{?dist} Summary: Web server with automatic HTTPS # main source code is Apache-2.0 # see comments above provides tags for bundled license breakdown @@ -33,12 +33,14 @@ Source100: create-vendor-tarball.sh # downstream only patch to disable commands that can alter the binary Patch: 0001-Disable-commands-that-can-alter-the-binary.patch +# downstream only patch to skip ACME integration tests +Patch: 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch -# https://github.com/caddyserver/caddy/commit/f45a6de20dd19e82e58c85b37e03957b2203b544 -BuildRequires: golang >= 1.20 +# https://github.com/caddyserver/caddy/commit/697cc593a17fcb39087161b058fc1dba8b767060 +BuildRequires: golang >= 1.21 # BSD-3-Clause -Provides: bundled(golang(filippo.io/edwards25519)) = 1.0.0 +Provides: bundled(golang(filippo.io/edwards25519)) = 1.1.0 # MIT AND CC0-1.0 Provides: bundled(golang(github.com/AndreasBriese/bbloom)) = 46b345b # MIT @@ -52,15 +54,17 @@ 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.9.1 +Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.13.0 # BSD-3-Clause -Provides: bundled(golang(github.com/antlr/antlr4/runtime/Go/antlr/v4)) = 8188dc5 +Provides: bundled(golang(github.com/antlr4-go/antlr/v4)) = 4.13.0 # 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.20.0 +Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.21.3 +# MIT +Provides: bundled(golang(github.com/caddyserver/zerossl)) = 0.1.3 # MIT Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.2.1 # MIT @@ -70,7 +74,7 @@ Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.2.0 # MIT Provides: bundled(golang(github.com/chzyer/readline)) = 1.5.1 # MIT -Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.2 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.3 # ISC Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 # Apache-2.0 @@ -82,21 +86,25 @@ 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.10.0 +Provides: bundled(golang(github.com/dlclark/regexp2)) = 1.11.0 # MIT Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.1 # MIT -Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.3 +Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4 # MIT -Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = 2.5.0 +Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = 2.6.0 # MIT -Provides: bundled(golang(github.com/go-chi/chi/v5)) = 5.0.10 +Provides: bundled(golang(github.com/go-chi/chi/v5)) = 5.0.12 +# Apache-2.0 AND BSD-3-Clause +Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.3 # MIT -Provides: bundled(golang(github.com/go-kit/kit)) = 0.10.0 +Provides: bundled(golang(github.com/go-kit/kit)) = 0.13.0 # MIT -Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.5.1 +Provides: bundled(golang(github.com/go-kit/log)) = 0.2.1 +# MIT +Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.6.0 # Apache-2.0 -Provides: bundled(golang(github.com/go-logr/logr)) = 1.3.0 +Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.1 # Apache-2.0 Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2 # MPL-2.0 @@ -104,23 +112,23 @@ Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.7.1 # MIT Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 # Apache-2.0 -Provides: bundled(golang(github.com/golang/glog)) = 1.1.2 +Provides: bundled(golang(github.com/golang/glog)) = 1.2.0 # BSD-3-Clause -Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 +Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.4 # 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.15.1 +Provides: bundled(golang(github.com/google/cel-go)) = 0.20.1 # Apache-2.0 -Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 1.1.6 +Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 74a5dd3 # Apache-2.0 Provides: bundled(golang(github.com/google/go-tpm)) = 0.9.0 # Apache-2.0 Provides: bundled(golang(github.com/google/go-tspi)) = 0.3.0 # Apache-2.0 -Provides: bundled(golang(github.com/google/pprof)) = 4bb14d4 +Provides: bundled(golang(github.com/google/pprof)) = ec68065 # BSD-3-Clause -Provides: bundled(golang(github.com/google/uuid)) = 1.3.1 +Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 # BSD-3-Clause Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway/v2)) = 2.18.0 # MIT @@ -132,43 +140,37 @@ Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 # MIT Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1 # MIT -Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.0 +Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.3 # 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.2 +Provides: bundled(golang(github.com/jackc/pgproto3/v2)) = 2.3.3 # MIT Provides: bundled(golang(github.com/jackc/pgservicefile)) = 091c0ba # MIT Provides: bundled(golang(github.com/jackc/pgtype)) = 1.14.0 # MIT -Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.0 +Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.3 # BSD-3-Clause AND Apache-2.0 AND MIT -Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.0 +Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.8 # MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.5 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.7 # MIT -Provides: bundled(golang(github.com/libdns/libdns)) = 0.2.1 +Provides: bundled(golang(github.com/libdns/libdns)) = 0.2.2 # BSD-3-Clause Provides: bundled(golang(github.com/manifoldco/promptui)) = 0.9.0 -# Apache-2.0 -Provides: bundled(golang(github.com/mastercactapus/proxyprotocol)) = 0.0.4 # MIT -Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.8 +Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.13 # MIT -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.16 -# Apache-2.0 -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.4 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 # MIT Provides: bundled(golang(github.com/mgutz/ansi)) = d51e80e -# Apache-2.0 -Provides: bundled(golang(github.com/mholt/acmez)) = 1.2.0 -# MIT -Provides: bundled(golang(github.com/micromdm/scep/v2)) = 2.1.0 +# Apache-2.0 AND BSD-3-Clause +Provides: bundled(golang(github.com/mholt/acmez/v2)) = 2.0.1 # BSD-3-Clause -Provides: bundled(golang(github.com/miekg/dns)) = 1.1.55 +Provides: bundled(golang(github.com/miekg/dns)) = 1.1.59 # MIT Provides: bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0 # MIT @@ -176,25 +178,25 @@ 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.9.5 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.2 +# Apache-2.0 +Provides: bundled(golang(github.com/pires/go-proxyproto)) = 0.7.0 # BSD-2-Clause Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 # BSD-3-Clause Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 # Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.15.1 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.19.1 # Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.4.0 +Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 # Apache-2.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.42.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.48.0 # Apache-2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.9.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.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-20)) = 0.4.1 # MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.40.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.44.0 # MIT Provides: bundled(golang(github.com/rs/xid)) = 1.5.0 # BSD-2-Clause @@ -208,41 +210,43 @@ Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3 # MIT Provides: bundled(golang(github.com/slackhq/nebula)) = 1.6.1 # Apache-2.0 -Provides: bundled(golang(github.com/smallstep/certificates)) = 0.25.0 +Provides: bundled(golang(github.com/smallstep/certificates)) = 0.26.1 # Apache-2.0 -Provides: bundled(golang(github.com/smallstep/go-attestation)) = cf579e5 +Provides: bundled(golang(github.com/smallstep/go-attestation)) = 413678f # Apache-2.0 -Provides: bundled(golang(github.com/smallstep/nosql)) = 0.6.0 +Provides: bundled(golang(github.com/smallstep/nosql)) = 0.6.1 +# MIT +Provides: bundled(golang(github.com/smallstep/pkcs7)) = 3b98ecc +# MIT +Provides: bundled(golang(github.com/smallstep/scep)) = aee96d7 # Apache-2.0 -Provides: bundled(golang(github.com/smallstep/truststore)) = 0.12.1 +Provides: bundled(golang(github.com/smallstep/truststore)) = 0.13.0 # MIT Provides: bundled(golang(github.com/spf13/cast)) = 1.4.1 # Apache-2.0 -Provides: bundled(golang(github.com/spf13/cobra)) = 1.7.0 +Provides: bundled(golang(github.com/spf13/cobra)) = 1.8.0 # 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 # MIT -Provides: bundled(golang(github.com/stretchr/testify)) = 1.8.4 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.9.0 # BSD-3-Clause -Provides: bundled(golang(github.com/tailscale/tscert)) = 28a91b6 +Provides: bundled(golang(github.com/tailscale/tscert)) = bbccfbf # MIT Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 # MIT Provides: bundled(golang(github.com/x448/float16)) = 0.8.4 # MIT -Provides: bundled(golang(github.com/yuin/goldmark)) = 1.5.6 +Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.1 # MIT Provides: bundled(golang(github.com/yuin/goldmark-highlighting/v2)) = 37449ab # CC0-1.0 Provides: bundled(golang(github.com/zeebo/blake3)) = 0.2.3 # MIT -Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.7 -# MIT -Provides: bundled(golang(go.mozilla.org/pkcs7)) = 33d0574 +Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.9 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.45.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.49.0 # Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/autoprop)) = 0.42.0 # Apache-2.0 @@ -254,61 +258,67 @@ Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/jaeger)) # Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/ot)) = 1.17.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.21.0 +Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.24.0 # Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.21.0 # Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.21.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.21.0 +Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.24.0 # Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.21.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.21.0 +Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.24.0 # Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/proto/otlp)) = 1.0.0 # Apache-2.0 AND BSD-2-Clause -Provides: bundled(golang(go.step.sm/cli-utils)) = 0.8.0 +Provides: bundled(golang(go.step.sm/cli-utils)) = 0.9.0 # Apache-2.0 AND BSD-2-Clause -Provides: bundled(golang(go.step.sm/crypto)) = 0.35.1 +Provides: bundled(golang(go.step.sm/crypto)) = 0.45.0 # Apache-2.0 Provides: bundled(golang(go.step.sm/linkedca)) = 0.20.1 +# MIT +Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.5.3 # Apache-2.0 -Provides: bundled(golang(go.uber.org/mock)) = 0.3.0 +Provides: bundled(golang(go.uber.org/mock)) = 0.4.0 # MIT Provides: bundled(golang(go.uber.org/multierr)) = 1.11.0 # MIT -Provides: bundled(golang(go.uber.org/zap)) = 1.25.0 +Provides: bundled(golang(go.uber.org/zap)) = 1.27.0 +# MIT +Provides: bundled(golang(go.uber.org/zap/exp)) = 0.2.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.14.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.23.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 522b1b5 +Provides: bundled(golang(golang.org/x/crypto/x509roots/fallback)) = 67b1361 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.11.0 +Provides: bundled(golang(golang.org/x/exp)) = 9bf2ced # BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.17.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.17.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/sync)) = 0.4.0 +Provides: bundled(golang(golang.org/x/net)) = 0.25.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.14.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.7.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/term)) = 0.13.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.20.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.13.0 +Provides: bundled(golang(golang.org/x/term)) = 0.20.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.10.0 +Provides: bundled(golang(golang.org/x/text)) = 0.15.0 +# BSD-3-Clause +Provides: bundled(golang(golang.org/x/time)) = 0.5.0 +# BSD-3-Clause +Provides: bundled(golang(golang.org/x/tools)) = 0.21.0 # Apache-2.0 -Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 49dd2c1 +Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = b8a5c65 # Apache-2.0 -Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 49dd2c1 +Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 8cf5692 # Apache-2.0 -Provides: bundled(golang(google.golang.org/grpc)) = 1.59.0 +Provides: bundled(golang(google.golang.org/grpc)) = 1.63.2 # BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.31.0 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.34.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 @@ -386,9 +396,6 @@ install -d -m 0755 %{buildroot}%{fish_completions_dir} # ensure that the version was embedded correctly [[ "$(./bin/caddy version)" == "v%{version}" ]] || exit 1 -# some tests fail in mock for unknown reasons -%global gotestflags %{gotestflags} -skip 'TestACMEServerDirectory|TestHTTPRedirectWrapperWithLargeUpload' - # run the upstream tests export GOPATH=$PWD cd src/%{goipath} @@ -469,6 +476,14 @@ fi %changelog +* Fri Jul 05 2024 Carl George - 2.8.4-1 +- Update to version 2.8.4 rhbz#2278549 +- Resolves CVE-2023-49295 rhbz#2257829 +- Resolves CVE-2024-27304 rhbz#2268278 +- Resolves CVE-2024-27289 rhbz#2268468 +- Resolves CVE-2024-28180 rhbz#2268877 +- Resolves CVE-2024-22189 rhbz#2273517 + * Sun Feb 11 2024 Maxwell G - 2.7.6-2 - Rebuild for golang 1.22.0 diff --git a/sources b/sources index 56548e2..aa0786d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (caddy-2.7.6-vendored.tar.gz) = de21b1b59e20ce54a8d39f6035a7d931f2ee54cd6d47b9f88f0b5b43550ec3bfd49403061d06c9dbffd6c614b257bfb9841581e00fe5ffba14caba48d2753c31 +SHA512 (caddy-2.8.4-vendored.tar.gz) = 4519da995327c1b5adc006267f352acf9452df1002c6545565a6679795e8dff162b6b702f218d805b25930461ec938cbd67b7e2a33111a9a96a3ea6d798cccf6 From 78fd2309e3315d055c21a51657ad7508132cfda1 Mon Sep 17 00:00:00 2001 From: Carl George Date: Fri, 5 Jul 2024 19:05:44 -0500 Subject: [PATCH 03/18] Remove LimitNPROC from systemd unit files https://github.com/caddyserver/dist/issues/107 --- caddy-api.service | 1 - caddy.service | 1 - caddy.spec | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/caddy-api.service b/caddy-api.service index bf60c0a..255a289 100644 --- a/caddy-api.service +++ b/caddy-api.service @@ -19,7 +19,6 @@ Group=caddy ExecStart=/usr/bin/caddy run --environ --resume TimeoutStopSec=5s LimitNOFILE=1048576 -LimitNPROC=512 PrivateTmp=true ProtectHome=true ProtectSystem=full diff --git a/caddy.service b/caddy.service index f2f75cb..c6b6851 100644 --- a/caddy.service +++ b/caddy.service @@ -22,7 +22,6 @@ ExecStart=/usr/bin/caddy run --environ --config /etc/caddy/Caddyfile ExecReload=/usr/bin/caddy reload --config /etc/caddy/Caddyfile TimeoutStopSec=5s LimitNOFILE=1048576 -LimitNPROC=512 PrivateTmp=true ProtectHome=true ProtectSystem=full diff --git a/caddy.spec b/caddy.spec index 7e85999..f965007 100644 --- a/caddy.spec +++ b/caddy.spec @@ -483,6 +483,7 @@ fi - Resolves CVE-2024-27289 rhbz#2268468 - Resolves CVE-2024-28180 rhbz#2268877 - Resolves CVE-2024-22189 rhbz#2273517 +- Remove LimitNPROC from systemd unit files * Sun Feb 11 2024 Maxwell G - 2.7.6-2 - Rebuild for golang 1.22.0 From 74bfbd277597ce2afc91f690886a197091a94caa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:50:47 +0000 Subject: [PATCH 04/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- caddy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/caddy.spec b/caddy.spec index f965007..f6f3c1a 100644 --- a/caddy.spec +++ b/caddy.spec @@ -2,7 +2,7 @@ Name: caddy Version: 2.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web server with automatic HTTPS # main source code is Apache-2.0 # see comments above provides tags for bundled license breakdown @@ -476,6 +476,9 @@ fi %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jul 05 2024 Carl George - 2.8.4-1 - Update to version 2.8.4 rhbz#2278549 - Resolves CVE-2023-49295 rhbz#2257829 From 3da83887d45ed76761729532f46d191a25dc9d08 Mon Sep 17 00:00:00 2001 From: Carl George Date: Sat, 9 Nov 2024 02:57:22 -0600 Subject: [PATCH 05/18] Update to version 2.9.0 rhbz#2316289 --- ...e-commands-that-can-alter-the-binary.patch | 25 ++-- ...hat-fail-in-an-RPM-build-environment.patch | 26 ++-- caddy.spec | 117 +++++++++--------- sources | 2 +- 4 files changed, 88 insertions(+), 82 deletions(-) diff --git a/0001-Disable-commands-that-can-alter-the-binary.patch b/0001-Disable-commands-that-can-alter-the-binary.patch index f733ed0..6f1671b 100644 --- a/0001-Disable-commands-that-can-alter-the-binary.patch +++ b/0001-Disable-commands-that-can-alter-the-binary.patch @@ -1,17 +1,17 @@ -From 0ccec11094eeb39666cb3395a40cc425c5f38107 Mon Sep 17 00:00:00 2001 +From e2f7bc1fb84f8611562ef4275bfbda55b77100a7 Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 16 Feb 2022 11:45:03 -0600 Subject: [PATCH 1/2] Disable commands that can alter the binary --- - cmd/commands.go | 44 -------------------------------------------- - 1 file changed, 44 deletions(-) + cmd/commands.go | 45 --------------------------------------------- + 1 file changed, 45 deletions(-) diff --git a/cmd/commands.go b/cmd/commands.go -index e5e1265e..972d24dc 100644 +index 259dd358..31b85a18 100644 --- a/cmd/commands.go +++ b/cmd/commands.go -@@ -394,50 +394,6 @@ is always printed to stdout. +@@ -395,51 +395,6 @@ is always printed to stdout. }, }) @@ -30,12 +30,13 @@ index e5e1265e..972d24dc 100644 - - RegisterCommand(Command{ - Name: "add-package", -- Usage: "", +- Usage: "", - Short: "Adds Caddy packages (EXPERIMENTAL)", - Long: ` -Downloads an updated Caddy binary with the specified packages (module/plugin) --added. Retains existing packages. Returns an error if the any of packages are --already included. EXPERIMENTAL: May be changed or removed. +-added, with an optional version specified (e.g., "package@version"). Retains +-existing packages. Returns an error if any of the specified packages are already +-included. EXPERIMENTAL: May be changed or removed. -`, - CobraFunc: func(cmd *cobra.Command) { - cmd.Flags().BoolP("keep-backup", "k", false, "Keep the backed up binary, instead of deleting it") @@ -59,9 +60,9 @@ index e5e1265e..972d24dc 100644 - }, - }) - - RegisterCommand(Command{ - Name: "manpage", - Usage: "--directory ", + defaultFactory.Use(func(rootCmd *cobra.Command) { + rootCmd.AddCommand(caddyCmdToCobra(Command{ + Name: "manpage", -- -2.45.2 +2.47.1 diff --git a/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch b/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch index 3749dab..57758b0 100644 --- a/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch +++ b/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch @@ -1,4 +1,4 @@ -From 181946293299d605d287e0c650e89cd9ace4222b Mon Sep 17 00:00:00 2001 +From bd8f9d326f50a62cabf01a1de06c082cfbe8e4d1 Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 30 May 2024 21:48:09 -0500 Subject: [PATCH 2/2] Skip ACME integration tests that fail in an RPM build @@ -14,18 +14,18 @@ Subject: [PATCH 2/2] Skip ACME integration tests that fail in an RPM build 6 files changed, 36 insertions(+) diff --git a/caddytest/integration/acme_test.go b/caddytest/integration/acme_test.go -index ceacd1db..af087a27 100644 +index d7e4c296..203dd9bc 100644 --- a/caddytest/integration/acme_test.go +++ b/caddytest/integration/acme_test.go -@@ -8,6 +8,7 @@ import ( - "fmt" +@@ -9,6 +9,7 @@ import ( + "log/slog" "net" "net/http" + "os" "strings" "testing" -@@ -23,6 +24,9 @@ const acmeChallengePort = 9081 +@@ -25,6 +26,9 @@ const acmeChallengePort = 9081 // Test the basic functionality of Caddy's ACME server func TestACMEServerWithDefaults(t *testing.T) { @@ -35,7 +35,7 @@ index ceacd1db..af087a27 100644 ctx := context.Background() logger, err := zap.NewDevelopment() if err != nil { -@@ -94,6 +98,9 @@ func TestACMEServerWithDefaults(t *testing.T) { +@@ -96,6 +100,9 @@ func TestACMEServerWithDefaults(t *testing.T) { } func TestACMEServerWithMismatchedChallenges(t *testing.T) { @@ -46,18 +46,18 @@ index ceacd1db..af087a27 100644 logger := caddy.Log().Named("acmez") diff --git a/caddytest/integration/acmeserver_test.go b/caddytest/integration/acmeserver_test.go -index 22b716f8..df418741 100644 +index ca5845f8..6bc13fed 100644 --- a/caddytest/integration/acmeserver_test.go +++ b/caddytest/integration/acmeserver_test.go -@@ -5,6 +5,7 @@ import ( - "crypto/ecdsa" +@@ -6,6 +6,7 @@ import ( "crypto/elliptic" "crypto/rand" + "log/slog" + "os" "strings" "testing" -@@ -15,6 +16,9 @@ import ( +@@ -17,6 +18,9 @@ import ( ) func TestACMEServerDirectory(t *testing.T) { @@ -67,7 +67,7 @@ index 22b716f8..df418741 100644 tester := caddytest.NewTester(t) tester.InitServer(` { -@@ -41,6 +45,9 @@ func TestACMEServerDirectory(t *testing.T) { +@@ -43,6 +47,9 @@ func TestACMEServerDirectory(t *testing.T) { } func TestACMEServerAllowPolicy(t *testing.T) { @@ -77,7 +77,7 @@ index 22b716f8..df418741 100644 tester := caddytest.NewTester(t) tester.InitServer(` { -@@ -131,6 +138,9 @@ func TestACMEServerAllowPolicy(t *testing.T) { +@@ -133,6 +140,9 @@ func TestACMEServerAllowPolicy(t *testing.T) { } func TestACMEServerDenyPolicy(t *testing.T) { @@ -185,5 +185,5 @@ index 30642b1a..f1d8d07e 100644 // 1 more than an MB body := make([]byte, uploadSize) -- -2.45.2 +2.47.1 diff --git a/caddy.spec b/caddy.spec index f6f3c1a..9c5b910 100644 --- a/caddy.spec +++ b/caddy.spec @@ -1,8 +1,8 @@ %global goipath github.com/caddyserver/caddy Name: caddy -Version: 2.8.4 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Web server with automatic HTTPS # main source code is Apache-2.0 # see comments above provides tags for bundled license breakdown @@ -36,25 +36,27 @@ Patch: 0001-Disable-commands-that-can-alter-the-binary.patch # downstream only patch to skip ACME integration tests Patch: 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch -# https://github.com/caddyserver/caddy/commit/697cc593a17fcb39087161b058fc1dba8b767060 -BuildRequires: golang >= 1.21 +# https://github.com/caddyserver/caddy/commit/2028da4e74cd41f0f7f94222c6599da1a371d4b8 +BuildRequires: golang >= 1.22.3 +# BSD-3-Clause +Provides: bundled(golang(dario.cat/mergo)) = 1.0.1 # BSD-3-Clause Provides: bundled(golang(filippo.io/edwards25519)) = 1.1.0 # MIT AND CC0-1.0 Provides: bundled(golang(github.com/AndreasBriese/bbloom)) = 46b345b # MIT -Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.3.2 +Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.4.0 # 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 +Provides: bundled(golang(github.com/Masterminds/semver/v3)) = 3.3.0 # MIT -Provides: bundled(golang(github.com/Masterminds/sprig/v3)) = 3.2.3 +Provides: bundled(golang(github.com/Masterminds/sprig/v3)) = 3.3.0 # MIT Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.6.0 # MIT -Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.13.0 +Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.14.0 # BSD-3-Clause Provides: bundled(golang(github.com/antlr4-go/antlr/v4)) = 4.13.0 # MIT @@ -62,19 +64,19 @@ 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.21.3 +Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.21.5 # MIT Provides: bundled(golang(github.com/caddyserver/zerossl)) = 0.1.3 # MIT -Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.2.1 +Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.3.0 # MIT Provides: bundled(golang(github.com/cespare/xxhash)) = 1.1.0 # MIT -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.2.0 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.3.0 # MIT Provides: bundled(golang(github.com/chzyer/readline)) = 1.5.1 # MIT -Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.3 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.4 # ISC Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 # Apache-2.0 @@ -92,6 +94,8 @@ Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.1 # MIT Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4 # MIT +Provides: bundled(golang(github.com/francoispqt/gojay)) = 1.2.13 +# MIT Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = 2.6.0 # MIT Provides: bundled(golang(github.com/go-chi/chi/v5)) = 5.0.12 @@ -104,7 +108,7 @@ Provides: bundled(golang(github.com/go-kit/log)) = 0.2.1 # MIT Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.6.0 # Apache-2.0 -Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.1 +Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.2 # Apache-2.0 Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2 # MPL-2.0 @@ -112,13 +116,13 @@ Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.7.1 # MIT Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 # Apache-2.0 -Provides: bundled(golang(github.com/golang/glog)) = 1.2.0 +Provides: bundled(golang(github.com/golang/glog)) = 1.2.2 # BSD-3-Clause Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.4 # 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.20.1 +Provides: bundled(golang(github.com/google/cel-go)) = 0.21.0 # Apache-2.0 Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 74a5dd3 # Apache-2.0 @@ -130,11 +134,9 @@ Provides: bundled(golang(github.com/google/pprof)) = ec68065 # BSD-3-Clause Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 # BSD-3-Clause -Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway/v2)) = 2.18.0 +Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway/v2)) = 2.22.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 +Provides: bundled(golang(github.com/huandu/xstrings)) = 1.5.0 # Apache-2.0 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 # MIT @@ -154,9 +156,9 @@ Provides: bundled(golang(github.com/jackc/pgtype)) = 1.14.0 # MIT Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.3 # BSD-3-Clause AND Apache-2.0 AND MIT -Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.8 +Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.11 # MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.7 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.9 # MIT Provides: bundled(golang(github.com/libdns/libdns)) = 0.2.2 # BSD-3-Clause @@ -168,9 +170,9 @@ Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 # MIT Provides: bundled(golang(github.com/mgutz/ansi)) = d51e80e # Apache-2.0 AND BSD-3-Clause -Provides: bundled(golang(github.com/mholt/acmez/v2)) = 2.0.1 +Provides: bundled(golang(github.com/mholt/acmez/v3)) = 3.0.0 # BSD-3-Clause -Provides: bundled(golang(github.com/miekg/dns)) = 1.1.59 +Provides: bundled(golang(github.com/miekg/dns)) = 1.1.62 # MIT Provides: bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0 # MIT @@ -180,7 +182,7 @@ Provides: bundled(golang(github.com/mitchellh/reflectwalk)) = 1.0.2 # MIT Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.2 # Apache-2.0 -Provides: bundled(golang(github.com/pires/go-proxyproto)) = 0.7.0 +Provides: bundled(golang(github.com/pires/go-proxyproto)) = b718e7c # BSD-2-Clause Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 # BSD-3-Clause @@ -194,15 +196,15 @@ Provides: bundled(golang(github.com/prometheus/common)) = 0.48.0 # Apache-2.0 Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 # MIT -Provides: bundled(golang(github.com/quic-go/qpack)) = 0.4.0 +Provides: bundled(golang(github.com/quic-go/qpack)) = 0.5.1 # MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.44.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.48.2 # MIT Provides: bundled(golang(github.com/rs/xid)) = 1.5.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 +Provides: bundled(golang(github.com/shopspring/decimal)) = 1.4.0 # MIT Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0 # MIT @@ -222,9 +224,9 @@ Provides: bundled(golang(github.com/smallstep/scep)) = aee96d7 # Apache-2.0 Provides: bundled(golang(github.com/smallstep/truststore)) = 0.13.0 # MIT -Provides: bundled(golang(github.com/spf13/cast)) = 1.4.1 +Provides: bundled(golang(github.com/spf13/cast)) = 1.7.0 # Apache-2.0 -Provides: bundled(golang(github.com/spf13/cobra)) = 1.8.0 +Provides: bundled(golang(github.com/spf13/cobra)) = 1.8.1 # BSD-3-Clause Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5 # MIT @@ -232,21 +234,21 @@ Provides: bundled(golang(github.com/stoewer/go-strcase)) = 1.2.0 # MIT Provides: bundled(golang(github.com/stretchr/testify)) = 1.9.0 # BSD-3-Clause -Provides: bundled(golang(github.com/tailscale/tscert)) = bbccfbf +Provides: bundled(golang(github.com/tailscale/tscert)) = d3f8340 # MIT Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 # MIT Provides: bundled(golang(github.com/x448/float16)) = 0.8.4 # MIT -Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.1 +Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.8 # MIT Provides: bundled(golang(github.com/yuin/goldmark-highlighting/v2)) = 37449ab # CC0-1.0 -Provides: bundled(golang(github.com/zeebo/blake3)) = 0.2.3 +Provides: bundled(golang(github.com/zeebo/blake3)) = 0.2.4 # MIT Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.9 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.49.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.56.0 # Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/autoprop)) = 0.42.0 # Apache-2.0 @@ -258,19 +260,19 @@ Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/jaeger)) # Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/ot)) = 1.17.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.24.0 +Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.31.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.21.0 +Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.31.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.21.0 +Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.31.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.24.0 +Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.31.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.21.0 +Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.31.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.24.0 +Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.31.0 # Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/proto/otlp)) = 1.0.0 +Provides: bundled(golang(go.opentelemetry.io/proto/otlp)) = 1.3.1 # Apache-2.0 AND BSD-2-Clause Provides: bundled(golang(go.step.sm/cli-utils)) = 0.9.0 # Apache-2.0 AND BSD-2-Clause @@ -278,7 +280,7 @@ Provides: bundled(golang(go.step.sm/crypto)) = 0.45.0 # Apache-2.0 Provides: bundled(golang(go.step.sm/linkedca)) = 0.20.1 # MIT -Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.5.3 +Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.6.0 # Apache-2.0 Provides: bundled(golang(go.uber.org/mock)) = 0.4.0 # MIT @@ -286,37 +288,37 @@ Provides: bundled(golang(go.uber.org/multierr)) = 1.11.0 # MIT Provides: bundled(golang(go.uber.org/zap)) = 1.27.0 # MIT -Provides: bundled(golang(go.uber.org/zap/exp)) = 0.2.0 +Provides: bundled(golang(go.uber.org/zap/exp)) = 0.3.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.23.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.31.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto/x509roots/fallback)) = 67b1361 +Provides: bundled(golang(golang.org/x/crypto/x509roots/fallback)) = 71ed71b # BSD-3-Clause Provides: bundled(golang(golang.org/x/exp)) = 9bf2ced # BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.17.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.18.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net)) = 0.33.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/sync)) = 0.7.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.10.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.20.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.28.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/term)) = 0.20.0 +Provides: bundled(golang(golang.org/x/term)) = 0.27.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.15.0 +Provides: bundled(golang(golang.org/x/text)) = 0.21.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/time)) = 0.5.0 +Provides: bundled(golang(golang.org/x/time)) = 0.7.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.21.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.22.0 # Apache-2.0 -Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = b8a5c65 +Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 5fefd90 # Apache-2.0 -Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 8cf5692 +Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 5fefd90 # Apache-2.0 -Provides: bundled(golang(google.golang.org/grpc)) = 1.63.2 +Provides: bundled(golang(google.golang.org/grpc)) = 1.67.1 # BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.34.1 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.35.1 # MIT Provides: bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = 2.2.1 # Apache-2.0 AND MIT @@ -476,6 +478,9 @@ fi %changelog +* Wed Jan 01 2025 Carl George - 2.9.0-1 +- Update to version 2.9.0 rhbz#2316289 + * Wed Jul 17 2024 Fedora Release Engineering - 2.8.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index aa0786d..84bb35f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (caddy-2.8.4-vendored.tar.gz) = 4519da995327c1b5adc006267f352acf9452df1002c6545565a6679795e8dff162b6b702f218d805b25930461ec938cbd67b7e2a33111a9a96a3ea6d798cccf6 +SHA512 (caddy-2.9.0-vendored.tar.gz) = cd88f9ebb8db481d5c3d73d70f4fcd3cd945877d9344ed0a448863cce0922a9a741c0a03ea760e26a30afdefd7ea60b52ea96accb3d50ef77b2d9e4c67637ba6 From e50853b5b349ec5da8c788756735a1ad44a9a497 Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 8 Jan 2025 15:29:42 -0600 Subject: [PATCH 06/18] Include goipaths of bundled libraries in license comments --- caddy.spec | 286 ++++++++++++++++++++++++++--------------------------- 1 file changed, 143 insertions(+), 143 deletions(-) diff --git a/caddy.spec b/caddy.spec index 9c5b910..bdfcdde 100644 --- a/caddy.spec +++ b/caddy.spec @@ -39,291 +39,291 @@ Patch: 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-envir # https://github.com/caddyserver/caddy/commit/2028da4e74cd41f0f7f94222c6599da1a371d4b8 BuildRequires: golang >= 1.22.3 -# BSD-3-Clause +# dario.cat/mergo : BSD-3-Clause Provides: bundled(golang(dario.cat/mergo)) = 1.0.1 -# BSD-3-Clause +# filippo.io/edwards25519 : BSD-3-Clause Provides: bundled(golang(filippo.io/edwards25519)) = 1.1.0 -# MIT AND CC0-1.0 +# github.com/AndreasBriese/bbloom : MIT AND CC0-1.0 Provides: bundled(golang(github.com/AndreasBriese/bbloom)) = 46b345b -# MIT +# github.com/BurntSushi/toml : MIT Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.4.0 -# Apache-2.0 +# github.com/Masterminds/goutils : Apache-2.0 Provides: bundled(golang(github.com/Masterminds/goutils)) = 1.1.1 -# MIT +# github.com/Masterminds/semver/v3 : MIT Provides: bundled(golang(github.com/Masterminds/semver/v3)) = 3.3.0 -# MIT +# github.com/Masterminds/sprig/v3 : MIT Provides: bundled(golang(github.com/Masterminds/sprig/v3)) = 3.3.0 -# MIT +# github.com/Microsoft/go-winio : MIT Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.6.0 -# MIT +# github.com/alecthomas/chroma/v2 : MIT Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.14.0 -# BSD-3-Clause +# github.com/antlr4-go/antlr/v4 : BSD-3-Clause Provides: bundled(golang(github.com/antlr4-go/antlr/v4)) = 4.13.0 -# MIT +# github.com/aryann/difflib : MIT Provides: bundled(golang(github.com/aryann/difflib)) = ff5ff6d -# MIT +# github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 -# Apache-2.0 +# github.com/caddyserver/certmagic : Apache-2.0 Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.21.5 -# MIT +# github.com/caddyserver/zerossl : MIT Provides: bundled(golang(github.com/caddyserver/zerossl)) = 0.1.3 -# MIT +# github.com/cenkalti/backoff/v4 : MIT Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.3.0 -# MIT +# github.com/cespare/xxhash : MIT Provides: bundled(golang(github.com/cespare/xxhash)) = 1.1.0 -# MIT +# github.com/cespare/xxhash/v2 : MIT Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.3.0 -# MIT +# github.com/chzyer/readline : MIT Provides: bundled(golang(github.com/chzyer/readline)) = 1.5.1 -# MIT +# github.com/cpuguy83/go-md2man/v2 : MIT Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.4 -# ISC +# github.com/davecgh/go-spew : ISC Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 -# Apache-2.0 +# github.com/dgraph-io/badger : Apache-2.0 Provides: bundled(golang(github.com/dgraph-io/badger)) = 1.6.2 -# Apache-2.0 +# github.com/dgraph-io/badger/v2 : Apache-2.0 Provides: bundled(golang(github.com/dgraph-io/badger/v2)) = 2.2007.4 -# Apache-2.0 AND MIT +# github.com/dgraph-io/ristretto : Apache-2.0 AND MIT Provides: bundled(golang(github.com/dgraph-io/ristretto)) = 0.1.0 -# MIT +# github.com/dgryski/go-farm : MIT Provides: bundled(golang(github.com/dgryski/go-farm)) = a6ae236 -# MIT +# github.com/dlclark/regexp2 : MIT Provides: bundled(golang(github.com/dlclark/regexp2)) = 1.11.0 -# MIT +# github.com/dustin/go-humanize : MIT Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.1 -# MIT +# github.com/felixge/httpsnoop : MIT Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4 -# MIT +# github.com/francoispqt/gojay : MIT Provides: bundled(golang(github.com/francoispqt/gojay)) = 1.2.13 -# MIT +# github.com/fxamacker/cbor/v2 : MIT Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = 2.6.0 -# MIT +# github.com/go-chi/chi/v5 : MIT Provides: bundled(golang(github.com/go-chi/chi/v5)) = 5.0.12 -# Apache-2.0 AND BSD-3-Clause +# github.com/go-jose/go-jose/v3 : Apache-2.0 AND BSD-3-Clause Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.3 -# MIT +# github.com/go-kit/kit : MIT Provides: bundled(golang(github.com/go-kit/kit)) = 0.13.0 -# MIT +# github.com/go-kit/log : MIT Provides: bundled(golang(github.com/go-kit/log)) = 0.2.1 -# MIT +# github.com/go-logfmt/logfmt : MIT Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.6.0 -# Apache-2.0 +# github.com/go-logr/logr : Apache-2.0 Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.2 -# Apache-2.0 +# github.com/go-logr/stdr : Apache-2.0 Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2 -# MPL-2.0 +# github.com/go-sql-driver/mysql : MPL-2.0 Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.7.1 -# MIT +# github.com/go-task/slim-sprig : MIT Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 -# Apache-2.0 +# github.com/golang/glog : Apache-2.0 Provides: bundled(golang(github.com/golang/glog)) = 1.2.2 -# BSD-3-Clause +# github.com/golang/protobuf : BSD-3-Clause Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.4 -# BSD-3-Clause +# github.com/golang/snappy : BSD-3-Clause Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 -# Apache-2.0 +# github.com/google/cel-go : Apache-2.0 Provides: bundled(golang(github.com/google/cel-go)) = 0.21.0 -# Apache-2.0 +# github.com/google/certificate-transparency-go : Apache-2.0 Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 74a5dd3 -# Apache-2.0 +# github.com/google/go-tpm : Apache-2.0 Provides: bundled(golang(github.com/google/go-tpm)) = 0.9.0 -# Apache-2.0 +# github.com/google/go-tspi : Apache-2.0 Provides: bundled(golang(github.com/google/go-tspi)) = 0.3.0 -# Apache-2.0 +# github.com/google/pprof : Apache-2.0 Provides: bundled(golang(github.com/google/pprof)) = ec68065 -# BSD-3-Clause +# github.com/google/uuid : BSD-3-Clause Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 -# BSD-3-Clause +# github.com/grpc-ecosystem/grpc-gateway/v2 : BSD-3-Clause Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway/v2)) = 2.22.0 -# MIT +# github.com/huandu/xstrings : MIT Provides: bundled(golang(github.com/huandu/xstrings)) = 1.5.0 -# Apache-2.0 +# github.com/inconshreveable/mousetrap : Apache-2.0 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 -# MIT +# github.com/jackc/chunkreader/v2 : MIT Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1 -# MIT +# github.com/jackc/pgconn : MIT Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.3 -# MIT +# github.com/jackc/pgio : MIT Provides: bundled(golang(github.com/jackc/pgio)) = 1.0.0 -# MIT +# github.com/jackc/pgpassfile : MIT Provides: bundled(golang(github.com/jackc/pgpassfile)) = 1.0.0 -# MIT +# github.com/jackc/pgproto3/v2 : MIT Provides: bundled(golang(github.com/jackc/pgproto3/v2)) = 2.3.3 -# MIT +# github.com/jackc/pgservicefile : MIT Provides: bundled(golang(github.com/jackc/pgservicefile)) = 091c0ba -# MIT +# github.com/jackc/pgtype : MIT Provides: bundled(golang(github.com/jackc/pgtype)) = 1.14.0 -# MIT +# github.com/jackc/pgx/v4 : MIT Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.3 -# BSD-3-Clause AND Apache-2.0 AND MIT +# github.com/klauspost/compress : BSD-3-Clause AND Apache-2.0 AND MIT Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.11 -# MIT +# github.com/klauspost/cpuid/v2 : MIT Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.9 -# MIT +# github.com/libdns/libdns : MIT Provides: bundled(golang(github.com/libdns/libdns)) = 0.2.2 -# BSD-3-Clause +# github.com/manifoldco/promptui : BSD-3-Clause Provides: bundled(golang(github.com/manifoldco/promptui)) = 0.9.0 -# MIT +# github.com/mattn/go-colorable : MIT Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.13 -# MIT +# github.com/mattn/go-isatty : MIT Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 -# MIT +# github.com/mgutz/ansi : MIT Provides: bundled(golang(github.com/mgutz/ansi)) = d51e80e -# Apache-2.0 AND BSD-3-Clause +# github.com/mholt/acmez/v3 : Apache-2.0 AND BSD-3-Clause Provides: bundled(golang(github.com/mholt/acmez/v3)) = 3.0.0 -# BSD-3-Clause +# github.com/miekg/dns : BSD-3-Clause Provides: bundled(golang(github.com/miekg/dns)) = 1.1.62 -# MIT +# github.com/mitchellh/copystructure : MIT Provides: bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0 -# MIT +# github.com/mitchellh/go-ps : MIT Provides: bundled(golang(github.com/mitchellh/go-ps)) = 1.0.0 -# MIT +# github.com/mitchellh/reflectwalk : MIT Provides: bundled(golang(github.com/mitchellh/reflectwalk)) = 1.0.2 -# MIT +# github.com/onsi/ginkgo/v2 : MIT Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.2 -# Apache-2.0 +# github.com/pires/go-proxyproto : Apache-2.0 Provides: bundled(golang(github.com/pires/go-proxyproto)) = b718e7c -# BSD-2-Clause +# github.com/pkg/errors : BSD-2-Clause Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 -# BSD-3-Clause +# github.com/pmezard/go-difflib : BSD-3-Clause Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 -# Apache-2.0 +# github.com/prometheus/client_golang : Apache-2.0 Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.19.1 -# Apache-2.0 +# github.com/prometheus/client_model : Apache-2.0 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 -# Apache-2.0 +# github.com/prometheus/common : Apache-2.0 Provides: bundled(golang(github.com/prometheus/common)) = 0.48.0 -# Apache-2.0 +# github.com/prometheus/procfs : Apache-2.0 Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 -# MIT +# github.com/quic-go/qpack : MIT Provides: bundled(golang(github.com/quic-go/qpack)) = 0.5.1 -# MIT +# github.com/quic-go/quic-go : MIT Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.48.2 -# MIT +# github.com/rs/xid : MIT Provides: bundled(golang(github.com/rs/xid)) = 1.5.0 -# BSD-2-Clause +# github.com/russross/blackfriday/v2 : BSD-2-Clause Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 -# MIT +# github.com/shopspring/decimal : MIT Provides: bundled(golang(github.com/shopspring/decimal)) = 1.4.0 -# MIT +# github.com/shurcooL/sanitized_anchor_name : MIT Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0 -# MIT +# github.com/sirupsen/logrus : MIT Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3 -# MIT +# github.com/slackhq/nebula : MIT Provides: bundled(golang(github.com/slackhq/nebula)) = 1.6.1 -# Apache-2.0 +# github.com/smallstep/certificates : Apache-2.0 Provides: bundled(golang(github.com/smallstep/certificates)) = 0.26.1 -# Apache-2.0 +# github.com/smallstep/go-attestation : Apache-2.0 Provides: bundled(golang(github.com/smallstep/go-attestation)) = 413678f -# Apache-2.0 +# github.com/smallstep/nosql : Apache-2.0 Provides: bundled(golang(github.com/smallstep/nosql)) = 0.6.1 -# MIT +# github.com/smallstep/pkcs7 : MIT Provides: bundled(golang(github.com/smallstep/pkcs7)) = 3b98ecc -# MIT +# github.com/smallstep/scep : MIT Provides: bundled(golang(github.com/smallstep/scep)) = aee96d7 -# Apache-2.0 +# github.com/smallstep/truststore : Apache-2.0 Provides: bundled(golang(github.com/smallstep/truststore)) = 0.13.0 -# MIT +# github.com/spf13/cast : MIT Provides: bundled(golang(github.com/spf13/cast)) = 1.7.0 -# Apache-2.0 +# github.com/spf13/cobra : Apache-2.0 Provides: bundled(golang(github.com/spf13/cobra)) = 1.8.1 -# BSD-3-Clause +# github.com/spf13/pflag : BSD-3-Clause Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5 -# MIT +# github.com/stoewer/go-strcase : MIT Provides: bundled(golang(github.com/stoewer/go-strcase)) = 1.2.0 -# MIT +# github.com/stretchr/testify : MIT Provides: bundled(golang(github.com/stretchr/testify)) = 1.9.0 -# BSD-3-Clause +# github.com/tailscale/tscert : BSD-3-Clause Provides: bundled(golang(github.com/tailscale/tscert)) = d3f8340 -# MIT +# github.com/urfave/cli : MIT Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 -# MIT +# github.com/x448/float16 : MIT Provides: bundled(golang(github.com/x448/float16)) = 0.8.4 -# MIT +# github.com/yuin/goldmark : MIT Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.8 -# MIT +# github.com/yuin/goldmark-highlighting/v2 : MIT Provides: bundled(golang(github.com/yuin/goldmark-highlighting/v2)) = 37449ab -# CC0-1.0 +# github.com/zeebo/blake3 : CC0-1.0 Provides: bundled(golang(github.com/zeebo/blake3)) = 0.2.4 -# MIT +# go.etcd.io/bbolt : MIT Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.9 -# Apache-2.0 +# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.56.0 -# Apache-2.0 +# go.opentelemetry.io/contrib/propagators/autoprop : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/autoprop)) = 0.42.0 -# Apache-2.0 +# go.opentelemetry.io/contrib/propagators/aws : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/aws)) = 1.17.0 -# Apache-2.0 +# go.opentelemetry.io/contrib/propagators/b3 : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/b3)) = 1.17.0 -# Apache-2.0 +# go.opentelemetry.io/contrib/propagators/jaeger : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/jaeger)) = 1.17.0 -# Apache-2.0 +# go.opentelemetry.io/contrib/propagators/ot : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/ot)) = 1.17.0 -# Apache-2.0 +# go.opentelemetry.io/otel : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.31.0 -# Apache-2.0 +# go.opentelemetry.io/otel/exporters/otlp/otlptrace : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.31.0 -# Apache-2.0 +# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.31.0 -# Apache-2.0 +# go.opentelemetry.io/otel/metric : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.31.0 -# Apache-2.0 +# go.opentelemetry.io/otel/sdk : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.31.0 -# Apache-2.0 +# go.opentelemetry.io/otel/trace : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.31.0 -# Apache-2.0 +# go.opentelemetry.io/proto/otlp : Apache-2.0 Provides: bundled(golang(go.opentelemetry.io/proto/otlp)) = 1.3.1 -# Apache-2.0 AND BSD-2-Clause +# go.step.sm/cli-utils : Apache-2.0 AND BSD-2-Clause Provides: bundled(golang(go.step.sm/cli-utils)) = 0.9.0 -# Apache-2.0 AND BSD-2-Clause +# go.step.sm/crypto : Apache-2.0 AND BSD-2-Clause Provides: bundled(golang(go.step.sm/crypto)) = 0.45.0 -# Apache-2.0 +# go.step.sm/linkedca : Apache-2.0 Provides: bundled(golang(go.step.sm/linkedca)) = 0.20.1 -# MIT +# go.uber.org/automaxprocs : MIT Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.6.0 -# Apache-2.0 +# go.uber.org/mock : Apache-2.0 Provides: bundled(golang(go.uber.org/mock)) = 0.4.0 -# MIT +# go.uber.org/multierr : MIT Provides: bundled(golang(go.uber.org/multierr)) = 1.11.0 -# MIT +# go.uber.org/zap : MIT Provides: bundled(golang(go.uber.org/zap)) = 1.27.0 -# MIT +# go.uber.org/zap/exp : MIT Provides: bundled(golang(go.uber.org/zap/exp)) = 0.3.0 -# BSD-3-Clause +# golang.org/x/crypto : BSD-3-Clause Provides: bundled(golang(golang.org/x/crypto)) = 0.31.0 -# BSD-3-Clause +# golang.org/x/crypto/x509roots/fallback : BSD-3-Clause Provides: bundled(golang(golang.org/x/crypto/x509roots/fallback)) = 71ed71b -# BSD-3-Clause +# golang.org/x/exp : BSD-3-Clause Provides: bundled(golang(golang.org/x/exp)) = 9bf2ced -# BSD-3-Clause +# golang.org/x/mod : BSD-3-Clause Provides: bundled(golang(golang.org/x/mod)) = 0.18.0 -# BSD-3-Clause +# golang.org/x/net : BSD-3-Clause Provides: bundled(golang(golang.org/x/net)) = 0.33.0 -# BSD-3-Clause +# golang.org/x/sync : BSD-3-Clause Provides: bundled(golang(golang.org/x/sync)) = 0.10.0 -# BSD-3-Clause +# golang.org/x/sys : BSD-3-Clause Provides: bundled(golang(golang.org/x/sys)) = 0.28.0 -# BSD-3-Clause +# golang.org/x/term : BSD-3-Clause Provides: bundled(golang(golang.org/x/term)) = 0.27.0 -# BSD-3-Clause +# golang.org/x/text : BSD-3-Clause Provides: bundled(golang(golang.org/x/text)) = 0.21.0 -# BSD-3-Clause +# golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.7.0 -# BSD-3-Clause +# golang.org/x/tools : BSD-3-Clause Provides: bundled(golang(golang.org/x/tools)) = 0.22.0 -# Apache-2.0 +# google.golang.org/genproto/googleapis/api : Apache-2.0 Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 5fefd90 -# Apache-2.0 +# google.golang.org/genproto/googleapis/rpc : Apache-2.0 Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 5fefd90 -# Apache-2.0 +# google.golang.org/grpc : Apache-2.0 Provides: bundled(golang(google.golang.org/grpc)) = 1.67.1 -# BSD-3-Clause +# google.golang.org/protobuf : BSD-3-Clause Provides: bundled(golang(google.golang.org/protobuf)) = 1.35.1 -# MIT +# gopkg.in/natefinch/lumberjack.v2 : MIT Provides: bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = 2.2.1 -# Apache-2.0 AND MIT +# gopkg.in/yaml.v3 : Apache-2.0 AND MIT Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 -# BSD-2-Clause-Views AND BSD-3-Clause +# howett.net/plist : BSD-2-Clause-Views AND BSD-3-Clause Provides: bundled(golang(howett.net/plist)) = 1.0.0 BuildRequires: systemd-rpm-macros From d8ee5cf86dba97e70133abdcf95793a8ec989abd Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 8 Jan 2025 16:56:06 -0600 Subject: [PATCH 07/18] Update to version 2.9.1 rhbz#2336409 --- caddy.spec | 51 ++++++++++++++++++++++++---------------- create-vendor-tarball.sh | 3 +-- sources | 3 ++- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/caddy.spec b/caddy.spec index bdfcdde..f5992c5 100644 --- a/caddy.spec +++ b/caddy.spec @@ -1,23 +1,19 @@ %global goipath github.com/caddyserver/caddy Name: caddy -Version: 2.9.0 +Version: 2.9.1 Release: 1%{?dist} Summary: Web server with automatic HTTPS + # 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 CC0-1.0 AND ISC AND MPL-2.0 URL: https://caddyserver.com +Source0: https://%{goipath}/archive/v%{version}/caddy-%{version}.tar.gz -%if %{defined el8} -ExclusiveArch: %{golang_arches} -%else -ExclusiveArch: %{golang_arches_future} -BuildRequires: go-rpm-macros -%endif - -# see create-vendor-tarball.sh for how to create this -Source0: caddy-%{version}-vendored.tar.gz +# vendored dependencies +Source1: caddy-%{version}-vendor.tar.gz +Source2: create-vendor-tarball.sh # based on reference files upstream # https://github.com/caddyserver/dist @@ -28,13 +24,17 @@ Source22: caddy.sysusers Source30: poweredby-white.png Source31: poweredby-black.png -# Script that creates vendor tarball -Source100: create-vendor-tarball.sh - # downstream only patch to disable commands that can alter the binary -Patch: 0001-Disable-commands-that-can-alter-the-binary.patch +Patch1: 0001-Disable-commands-that-can-alter-the-binary.patch # downstream only patch to skip ACME integration tests -Patch: 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch +Patch2: 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch + +%if %{defined el8} +ExclusiveArch: %{golang_arches} +%else +BuildRequires: go-rpm-macros +ExclusiveArch: %{golang_arches_future} +%endif # https://github.com/caddyserver/caddy/commit/2028da4e74cd41f0f7f94222c6599da1a371d4b8 BuildRequires: golang >= 1.22.3 @@ -64,7 +64,7 @@ Provides: bundled(golang(github.com/aryann/difflib)) = ff5ff6d # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/caddyserver/certmagic : Apache-2.0 -Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.21.5 +Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.21.6 # github.com/caddyserver/zerossl : MIT Provides: bundled(golang(github.com/caddyserver/zerossl)) = 0.1.3 # github.com/cenkalti/backoff/v4 : MIT @@ -338,13 +338,15 @@ Caddy is an extensible server platform that uses TLS by default. %prep -%autosetup -p 1 +%autosetup -p 1 -a 1 mkdir -p src/$(dirname %{goipath}) ln -s $PWD src/%{goipath} %build +%if %{defined el8} export GO111MODULE=off +%endif export GOPATH=$PWD export LDFLAGS="-X %{goipath}.CustomVersion=v%{version}" %gobuild -o bin/caddy %{goipath}/cmd/caddy @@ -352,7 +354,7 @@ export LDFLAGS="-X %{goipath}.CustomVersion=v%{version}" %install # command -install -D -p -m 0755 bin/caddy %{buildroot}%{_bindir}/caddy +install -D -p -m 0755 -t %{buildroot}%{_bindir} bin/caddy # man pages ./bin/caddy manpage --directory %{buildroot}%{_mandir}/man8 @@ -362,8 +364,7 @@ install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/caddy/Caddyfile install -d -m 0755 %{buildroot}%{_sysconfdir}/caddy/Caddyfile.d # systemd units -install -D -p -m 0644 %{S:20} %{buildroot}%{_unitdir}/caddy.service -install -D -p -m 0644 %{S:21} %{buildroot}%{_unitdir}/caddy-api.service +install -D -p -m 0644 -t %{buildroot}%{_unitdir} %{S:20} %{S:21} # sysusers install -D -p -m 0644 %{S:22} %{buildroot}%{_sysusersdir}/caddy.conf @@ -472,12 +473,22 @@ fi %config(noreplace) %{_sysconfdir}/caddy/Caddyfile %dir %{_sysconfdir}/caddy/Caddyfile.d %attr(0750,caddy,caddy) %dir %{_sharedstatedir}/caddy +%if %{defined el8} +# this is normally owned by filesystem +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%dir %{_datadir}/fish +%dir %{_datadir}/fish/vendor_completions.d +%endif %{bash_completions_dir}/caddy %{zsh_completions_dir}/_caddy %{fish_completions_dir}/caddy.fish %changelog +* Wed Jan 08 2025 Carl George - 2.9.1-1 +- Update to version 2.9.1 rhbz#2336409 + * Wed Jan 01 2025 Carl George - 2.9.0-1 - Update to version 2.9.0 rhbz#2316289 diff --git a/create-vendor-tarball.sh b/create-vendor-tarball.sh index cf2a545..4df0320 100755 --- a/create-vendor-tarball.sh +++ b/create-vendor-tarball.sh @@ -34,5 +34,4 @@ git -c advice.detachedHead=false clone --branch $tag --depth 1 https://github.co 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 -C caddy-$version -czf caddy-$version-vendor.tar.gz vendor diff --git a/sources b/sources index 84bb35f..507c3f7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (caddy-2.9.0-vendored.tar.gz) = cd88f9ebb8db481d5c3d73d70f4fcd3cd945877d9344ed0a448863cce0922a9a741c0a03ea760e26a30afdefd7ea60b52ea96accb3d50ef77b2d9e4c67637ba6 +SHA512 (caddy-2.9.1.tar.gz) = 2ed36bfe8de3a2c7270e202b2d9ab4c3c78174fcd09c02e38d61d1bd57afa6471a2a690f15edcf91f2bfb105dbf2b0c2186d0c5e6f20ec169e98c66f8f71d0f8 +SHA512 (caddy-2.9.1-vendor.tar.gz) = c37617fd38da0b9d966d5bd297d5647386d5d863d9674f530497a3c5102545e94a6279072d237a1278476365b008153484352ae79a82ff57997088d3510a1eef From ca553ea9611bbb2802570cd43c0f14d7fde0ed89 Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 8 Jan 2025 23:05:39 -0600 Subject: [PATCH 08/18] Skip a few more flaky tests --- ...e-commands-that-can-alter-the-binary.patch | 2 +- ...hat-fail-in-an-RPM-build-environment.patch | 91 +++++++++++++++++-- caddy.spec | 4 +- 3 files changed, 88 insertions(+), 9 deletions(-) rename 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch => 0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch (65%) diff --git a/0001-Disable-commands-that-can-alter-the-binary.patch b/0001-Disable-commands-that-can-alter-the-binary.patch index 6f1671b..710f8c5 100644 --- 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 e2f7bc1fb84f8611562ef4275bfbda55b77100a7 Mon Sep 17 00:00:00 2001 +From ffc4888694c5222e9eddecb461c955d5661aa18c Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 16 Feb 2022 11:45:03 -0600 Subject: [PATCH 1/2] Disable commands that can alter the binary diff --git a/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch b/0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch similarity index 65% rename from 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch rename to 0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch index 57758b0..5a1f9e5 100644 --- a/0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch +++ b/0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch @@ -1,18 +1,42 @@ -From bd8f9d326f50a62cabf01a1de06c082cfbe8e4d1 Mon Sep 17 00:00:00 2001 +From 36fd7bf190357e1cf3c845d964349c161b8a18b4 Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 30 May 2024 21:48:09 -0500 -Subject: [PATCH 2/2] Skip ACME integration tests that fail in an RPM build - environment +Subject: [PATCH 2/2] Skip tests that fail in an RPM build environment --- + caddytest/caddytest_test.go | 4 ++++ caddytest/integration/acme_test.go | 7 +++++++ caddytest/integration/acmeserver_test.go | 10 ++++++++++ - caddytest/integration/caddyfile_test.go | 7 +++++++ + caddytest/integration/autohttps_test.go | 4 ++++ + caddytest/integration/caddyfile_test.go | 10 ++++++++++ caddytest/integration/handler_test.go | 4 ++++ caddytest/integration/leafcertloaders_test.go | 4 ++++ caddytest/integration/listener_test.go | 4 ++++ - 6 files changed, 36 insertions(+) + caddytest/integration/reverseproxy_test.go | 6 ++++++ + 9 files changed, 53 insertions(+) +diff --git a/caddytest/caddytest_test.go b/caddytest/caddytest_test.go +index a9d5da93..73aec0b4 100644 +--- a/caddytest/caddytest_test.go ++++ b/caddytest/caddytest_test.go +@@ -2,6 +2,7 @@ package caddytest + + import ( + "net/http" ++ "os" + "strings" + "testing" + ) +@@ -34,6 +35,9 @@ func TestReplaceCertificatePaths(t *testing.T) { + } + + func TestLoadUnorderedJSON(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := NewTester(t) + tester.InitServer(` + { diff --git a/caddytest/integration/acme_test.go b/caddytest/integration/acme_test.go index d7e4c296..203dd9bc 100644 --- a/caddytest/integration/acme_test.go @@ -83,12 +107,33 @@ index ca5845f8..6bc13fed 100644 func TestACMEServerDenyPolicy(t *testing.T) { + if os.Getenv("RPM_BUILD_ROOT") != "" { + t.SkipNow() ++ } + tester := caddytest.NewTester(t) + tester.InitServer(` + { +diff --git a/caddytest/integration/autohttps_test.go b/caddytest/integration/autohttps_test.go +index 1dbdbcee..f56816d8 100644 +--- a/caddytest/integration/autohttps_test.go ++++ b/caddytest/integration/autohttps_test.go +@@ -2,12 +2,16 @@ package integration + + import ( + "net/http" ++ "os" + "testing" + + "github.com/caddyserver/caddy/v2/caddytest" + ) + + func TestAutoHTTPtoHTTPSRedirectsImplicitPort(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() + } tester := caddytest.NewTester(t) tester.InitServer(` { diff --git a/caddytest/integration/caddyfile_test.go b/caddytest/integration/caddyfile_test.go -index 11ffc08a..25aed784 100644 +index 11ffc08a..e1a1e375 100644 --- a/caddytest/integration/caddyfile_test.go +++ b/caddytest/integration/caddyfile_test.go @@ -3,6 +3,7 @@ package integration @@ -119,6 +164,16 @@ index 11ffc08a..25aed784 100644 tester := caddytest.NewTester(t) tester.InitServer(` { +@@ -537,6 +544,9 @@ func TestHttpRequestLocalPortPlaceholder(t *testing.T) { + } + + func TestSetThenAddQueryParams(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := caddytest.NewTester(t) + + tester.InitServer(` diff --git a/caddytest/integration/handler_test.go b/caddytest/integration/handler_test.go index afc700b0..93d07bb9 100644 --- a/caddytest/integration/handler_test.go @@ -184,6 +239,30 @@ index 30642b1a..f1d8d07e 100644 const uploadSize = (1024 * 1024) + 1 // 1 MB + 1 byte // 1 more than an MB body := make([]byte, uploadSize) +diff --git a/caddytest/integration/reverseproxy_test.go b/caddytest/integration/reverseproxy_test.go +index cbfe8433..cb9944d4 100644 +--- a/caddytest/integration/reverseproxy_test.go ++++ b/caddytest/integration/reverseproxy_test.go +@@ -327,6 +327,9 @@ func TestReverseProxyWithPlaceholderTCPDialAddress(t *testing.T) { + } + + func TestReverseProxyHealthCheck(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + tester := caddytest.NewTester(t) + tester.InitServer(` + { +@@ -419,6 +422,9 @@ func TestReverseProxyHealthCheckUnixSocket(t *testing.T) { + } + + func TestReverseProxyHealthCheckUnixSocketWithoutPort(t *testing.T) { ++ if os.Getenv("RPM_BUILD_ROOT") != "" { ++ t.SkipNow() ++ } + if runtime.GOOS == "windows" { + t.SkipNow() + } -- 2.47.1 diff --git a/caddy.spec b/caddy.spec index f5992c5..06f8702 100644 --- a/caddy.spec +++ b/caddy.spec @@ -26,8 +26,8 @@ Source31: poweredby-black.png # downstream only patch to disable commands that can alter the binary Patch1: 0001-Disable-commands-that-can-alter-the-binary.patch -# downstream only patch to skip ACME integration tests -Patch2: 0002-Skip-ACME-integration-tests-that-fail-in-an-RPM-build-environment.patch +# downstream only patch to skip certain tests +Patch2: 0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch %if %{defined el8} ExclusiveArch: %{golang_arches} From f05422fa4475c21481a9293b82f4cd04812c65b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:10:54 +0000 Subject: [PATCH 09/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- caddy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/caddy.spec b/caddy.spec index 06f8702..3a0018e 100644 --- a/caddy.spec +++ b/caddy.spec @@ -2,7 +2,7 @@ Name: caddy Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web server with automatic HTTPS # main source code is Apache-2.0 @@ -486,6 +486,9 @@ fi %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 08 2025 Carl George - 2.9.1-1 - Update to version 2.9.1 rhbz#2336409 From 9fd11293df10a0fb398dcf035329f60edb4f467f Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 22 Jan 2025 14:05:44 -0600 Subject: [PATCH 10/18] Run tests with -short flag like upstream to avoid test failures Resolves: FTBFS rhbz#2339573 rhbz#2339954 --- ...hat-fail-in-an-RPM-build-environment.patch | 268 ------------------ caddy.spec | 14 +- 2 files changed, 11 insertions(+), 271 deletions(-) delete mode 100644 0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch diff --git a/0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch b/0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch deleted file mode 100644 index 5a1f9e5..0000000 --- a/0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch +++ /dev/null @@ -1,268 +0,0 @@ -From 36fd7bf190357e1cf3c845d964349c161b8a18b4 Mon Sep 17 00:00:00 2001 -From: Carl George -Date: Thu, 30 May 2024 21:48:09 -0500 -Subject: [PATCH 2/2] Skip tests that fail in an RPM build environment - ---- - caddytest/caddytest_test.go | 4 ++++ - caddytest/integration/acme_test.go | 7 +++++++ - caddytest/integration/acmeserver_test.go | 10 ++++++++++ - caddytest/integration/autohttps_test.go | 4 ++++ - caddytest/integration/caddyfile_test.go | 10 ++++++++++ - caddytest/integration/handler_test.go | 4 ++++ - caddytest/integration/leafcertloaders_test.go | 4 ++++ - caddytest/integration/listener_test.go | 4 ++++ - caddytest/integration/reverseproxy_test.go | 6 ++++++ - 9 files changed, 53 insertions(+) - -diff --git a/caddytest/caddytest_test.go b/caddytest/caddytest_test.go -index a9d5da93..73aec0b4 100644 ---- a/caddytest/caddytest_test.go -+++ b/caddytest/caddytest_test.go -@@ -2,6 +2,7 @@ package caddytest - - import ( - "net/http" -+ "os" - "strings" - "testing" - ) -@@ -34,6 +35,9 @@ func TestReplaceCertificatePaths(t *testing.T) { - } - - func TestLoadUnorderedJSON(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := NewTester(t) - tester.InitServer(` - { -diff --git a/caddytest/integration/acme_test.go b/caddytest/integration/acme_test.go -index d7e4c296..203dd9bc 100644 ---- a/caddytest/integration/acme_test.go -+++ b/caddytest/integration/acme_test.go -@@ -9,6 +9,7 @@ import ( - "log/slog" - "net" - "net/http" -+ "os" - "strings" - "testing" - -@@ -25,6 +26,9 @@ const acmeChallengePort = 9081 - - // Test the basic functionality of Caddy's ACME server - func TestACMEServerWithDefaults(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - ctx := context.Background() - logger, err := zap.NewDevelopment() - if err != nil { -@@ -96,6 +100,9 @@ func TestACMEServerWithDefaults(t *testing.T) { - } - - func TestACMEServerWithMismatchedChallenges(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - ctx := context.Background() - logger := caddy.Log().Named("acmez") - -diff --git a/caddytest/integration/acmeserver_test.go b/caddytest/integration/acmeserver_test.go -index ca5845f8..6bc13fed 100644 ---- a/caddytest/integration/acmeserver_test.go -+++ b/caddytest/integration/acmeserver_test.go -@@ -6,6 +6,7 @@ import ( - "crypto/elliptic" - "crypto/rand" - "log/slog" -+ "os" - "strings" - "testing" - -@@ -17,6 +18,9 @@ import ( - ) - - func TestACMEServerDirectory(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - tester.InitServer(` - { -@@ -43,6 +47,9 @@ func TestACMEServerDirectory(t *testing.T) { - } - - func TestACMEServerAllowPolicy(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - tester.InitServer(` - { -@@ -133,6 +140,9 @@ func TestACMEServerAllowPolicy(t *testing.T) { - } - - func TestACMEServerDenyPolicy(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - tester.InitServer(` - { -diff --git a/caddytest/integration/autohttps_test.go b/caddytest/integration/autohttps_test.go -index 1dbdbcee..f56816d8 100644 ---- a/caddytest/integration/autohttps_test.go -+++ b/caddytest/integration/autohttps_test.go -@@ -2,12 +2,16 @@ package integration - - import ( - "net/http" -+ "os" - "testing" - - "github.com/caddyserver/caddy/v2/caddytest" - ) - - func TestAutoHTTPtoHTTPSRedirectsImplicitPort(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - tester.InitServer(` - { -diff --git a/caddytest/integration/caddyfile_test.go b/caddytest/integration/caddyfile_test.go -index 11ffc08a..e1a1e375 100644 ---- a/caddytest/integration/caddyfile_test.go -+++ b/caddytest/integration/caddyfile_test.go -@@ -3,6 +3,7 @@ package integration - import ( - "net/http" - "net/url" -+ "os" - "testing" - - "github.com/caddyserver/caddy/v2/caddytest" -@@ -73,6 +74,9 @@ func TestDuplicateHosts(t *testing.T) { - } - - func TestReadCookie(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - localhost, _ := url.Parse("http://localhost") - cookie := http.Cookie{ - Name: "clientname", -@@ -106,6 +110,9 @@ func TestReadCookie(t *testing.T) { - } - - func TestReplIndex(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - tester.InitServer(` - { -@@ -537,6 +544,9 @@ func TestHttpRequestLocalPortPlaceholder(t *testing.T) { - } - - func TestSetThenAddQueryParams(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - - tester.InitServer(` -diff --git a/caddytest/integration/handler_test.go b/caddytest/integration/handler_test.go -index afc700b0..93d07bb9 100644 ---- a/caddytest/integration/handler_test.go -+++ b/caddytest/integration/handler_test.go -@@ -3,6 +3,7 @@ package integration - import ( - "bytes" - "net/http" -+ "os" - "testing" - - "github.com/caddyserver/caddy/v2/caddytest" -@@ -32,6 +33,9 @@ func TestBrowse(t *testing.T) { - } - - func TestRespondWithJSON(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - tester.InitServer(` - { -diff --git a/caddytest/integration/leafcertloaders_test.go b/caddytest/integration/leafcertloaders_test.go -index 4399902e..de8539dd 100644 ---- a/caddytest/integration/leafcertloaders_test.go -+++ b/caddytest/integration/leafcertloaders_test.go -@@ -1,12 +1,16 @@ - package integration - - import ( -+ "os" - "testing" - - "github.com/caddyserver/caddy/v2/caddytest" - ) - - func TestLeafCertLoaders(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - tester.InitServer(` - { -diff --git a/caddytest/integration/listener_test.go b/caddytest/integration/listener_test.go -index 30642b1a..f1d8d07e 100644 ---- a/caddytest/integration/listener_test.go -+++ b/caddytest/integration/listener_test.go -@@ -6,6 +6,7 @@ import ( - "math/rand" - "net" - "net/http" -+ "os" - "strings" - "testing" - -@@ -51,6 +52,9 @@ func setupListenerWrapperTest(t *testing.T, handlerFunc http.HandlerFunc) *caddy - } - - func TestHTTPRedirectWrapperWithLargeUpload(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - const uploadSize = (1024 * 1024) + 1 // 1 MB + 1 byte - // 1 more than an MB - body := make([]byte, uploadSize) -diff --git a/caddytest/integration/reverseproxy_test.go b/caddytest/integration/reverseproxy_test.go -index cbfe8433..cb9944d4 100644 ---- a/caddytest/integration/reverseproxy_test.go -+++ b/caddytest/integration/reverseproxy_test.go -@@ -327,6 +327,9 @@ func TestReverseProxyWithPlaceholderTCPDialAddress(t *testing.T) { - } - - func TestReverseProxyHealthCheck(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - tester := caddytest.NewTester(t) - tester.InitServer(` - { -@@ -419,6 +422,9 @@ func TestReverseProxyHealthCheckUnixSocket(t *testing.T) { - } - - func TestReverseProxyHealthCheckUnixSocketWithoutPort(t *testing.T) { -+ if os.Getenv("RPM_BUILD_ROOT") != "" { -+ t.SkipNow() -+ } - if runtime.GOOS == "windows" { - t.SkipNow() - } --- -2.47.1 - diff --git a/caddy.spec b/caddy.spec index 3a0018e..b9a59e7 100644 --- a/caddy.spec +++ b/caddy.spec @@ -1,8 +1,14 @@ %global goipath github.com/caddyserver/caddy +%if %{defined el8} +%global gotest() go test -short -compiler gc -ldflags "${LDFLAGS:-}" %{?**}; +%else +%global gotestflags %{gocompilerflags} -short +%endif + Name: caddy Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Web server with automatic HTTPS # main source code is Apache-2.0 @@ -26,8 +32,6 @@ Source31: poweredby-black.png # downstream only patch to disable commands that can alter the binary Patch1: 0001-Disable-commands-that-can-alter-the-binary.patch -# downstream only patch to skip certain tests -Patch2: 0002-Skip-tests-that-fail-in-an-RPM-build-environment.patch %if %{defined el8} ExclusiveArch: %{golang_arches} @@ -486,6 +490,10 @@ fi %changelog +* Wed Jan 22 2025 Carl George - 2.9.1-3 +- Run tests with -short flag like upstream to avoid test failures +- Resolves FTBFS rhbz#2339573 rhbz#2339954 + * Thu Jan 16 2025 Fedora Release Engineering - 2.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 538b1d0c53498b92691b7b97b06b349a6bfa57fe Mon Sep 17 00:00:00 2001 From: Carl George Date: Fri, 18 Apr 2025 17:27:45 -0500 Subject: [PATCH 11/18] Convert to %autorelease and %autochangelog [skip changelog] --- caddy.spec | 288 +---------------------------------------------------- changelog | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 287 insertions(+), 286 deletions(-) create mode 100644 changelog diff --git a/caddy.spec b/caddy.spec index b9a59e7..7c11165 100644 --- a/caddy.spec +++ b/caddy.spec @@ -8,7 +8,7 @@ Name: caddy Version: 2.9.1 -Release: 3%{?dist} +Release: %autorelease Summary: Web server with automatic HTTPS # main source code is Apache-2.0 @@ -490,288 +490,4 @@ fi %changelog -* Wed Jan 22 2025 Carl George - 2.9.1-3 -- Run tests with -short flag like upstream to avoid test failures -- Resolves FTBFS rhbz#2339573 rhbz#2339954 - -* Thu Jan 16 2025 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jan 08 2025 Carl George - 2.9.1-1 -- Update to version 2.9.1 rhbz#2336409 - -* Wed Jan 01 2025 Carl George - 2.9.0-1 -- Update to version 2.9.0 rhbz#2316289 - -* Wed Jul 17 2024 Fedora Release Engineering - 2.8.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jul 05 2024 Carl George - 2.8.4-1 -- Update to version 2.8.4 rhbz#2278549 -- Resolves CVE-2023-49295 rhbz#2257829 -- Resolves CVE-2024-27304 rhbz#2268278 -- Resolves CVE-2024-27289 rhbz#2268468 -- Resolves CVE-2024-28180 rhbz#2268877 -- Resolves CVE-2024-22189 rhbz#2273517 -- Remove LimitNPROC from systemd unit files - -* Sun Feb 11 2024 Maxwell G - 2.7.6-2 -- Rebuild for golang 1.22.0 - -* Fri Feb 09 2024 Carl George - 2.7.6-1 -- Update to version 2.7.6 rhbz#2253698 -- Includes fix for CVE-2023-45142 rhbz#2246587 - -* Tue Jan 23 2024 Fedora Release Engineering - 2.7.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 30 2023 Carl George - 2.7.5-1 -- Update to version 2.7.5 -- Update poweredby logos -- Add symlink for system_noindex_logo.png on EL9 -- Symlink directly to fedora-testpage directory on Fedora - -* Thu Aug 17 2023 Carl George - 2.7.4-1 -- Update to version 2.7.4, resolves rhbz#2232696 -- Fix CVE-2023-3978, resolves rhbz#2229582 - -* Tue Aug 08 2023 Carl George - 2.7.3-1 -- Update to version 2.7.3, resolves rhbz#2229638 - -* Thu Aug 03 2023 Carl George - 2.7.2-1 -- Update to version 2.7.2, resolves rhbz#2228776 - -* Thu Jul 27 2023 Carl George - 2.7.0~beta2-1 -- Update to version 2.7.0~beta2, resolves rhbz#2225732 rhbz#2124366 -- Resolves CVE-2022-41717 rhbz#2164315 -- Resolves CVE-2022-41723 rhbz#2178412 -- Add man pages -- Use generated shell completion files instead of static ones -- Add fish shell completions -- Switch to systemd sysusers - -* Wed Jul 19 2023 Fedora Release Engineering - 2.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jan 24 2023 Carl George - 2.5.2-3 -- Rebuild for CVE-2022-41717 in golang - -* Wed Jan 18 2023 Fedora Release Engineering - 2.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Aug 09 2022 Carl George - 2.5.2-1 -- Latest upstream, resolves rhbz#2062499 rhbz#2113136 - -* Wed Jul 20 2022 Fedora Release Engineering - 2.4.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Maxwell G - 2.4.6-4 -- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in - golang - -* Fri Jun 17 2022 Robert-André Mauchin - 2.4.6-3 -- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, - CVE-2022-29526, CVE-2022-30629 - -* Fri Feb 25 2022 Carl George - 2.4.6-2 -- Update welcome page symlink and image to work on both Fedora and EPEL - -* Wed Feb 16 2022 Carl George - 2.4.6-1 -- Latest upstream rhbz#1984163 - -* Wed Jan 19 2022 Fedora Release Engineering - 2.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Mar 03 2021 Carl George - 2.3.0-1 -- Latest upstream -- Fix vendored license handling -- Switch to white logo rhbz#1934864 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.1-3 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 30 2020 Carl George - 2.2.1-1 -- Latest upstream - -* Sat Sep 26 2020 Carl George - 2.2.0-1 -- Latest upstream - -* Sat Sep 19 2020 Carl George - 2.2.0~rc3-1 -- Latest upstream - -* Fri Aug 14 2020 Carl George - 2.1.1-2 -- Add bash and zsh completion support - -* Sun Aug 09 2020 Carl George - 2.1.1-1 -- Update to Caddy v2 -- Remove all v1 plugins -- Use vendored dependencies -- Remove devel subpackage -- Rename config file per upstream request -- Use webserver test page from system-logos-httpd - -* Sat Aug 01 2020 Fedora Release Engineering - 1.0.4-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 07 20:56:10 CEST 2020 Robert-André Mauchin - 1.0.4-1 -- Update to 1.0.4 (#1803691) - -* Mon Feb 17 2020 Elliott Sales de Andrade - 1.0.3-3 -- Rebuilt for GHSA-jf24-p9p9-4rjh - -* Tue Jan 28 2020 Fedora Release Engineering - 1.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Sep 07 2019 Carl George - 1.0.3-1 -- Latest upstream -- Remove bundled lego and plugins -- Remove dyn, gandi, namecheap, and rfc2136 dns providers -- Add patch0 to fix `-version` flag -- Add patch1 to adjust blackfriday import path -- Add devel subpackages -- Run test suite - -* Wed Jul 24 2019 Fedora Release Engineering - 0.11.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 09 2019 Carl George - 0.11.4-2 -- Switch unit file from ProtectSystem strict to full rhbz#1706651 - -* Wed Mar 06 2019 Carl George - 0.11.4-1 -- Latest upstream -- Update bundled dnsproviders to 0.1.3 -- Update bundled lego to 2.2.0 -- Enable googlecloud, route53, and azure dns providers on epel7 -- Allow custom http port with default config file rhbz#1685446 - -* Thu Jan 31 2019 Fedora Release Engineering - 0.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 14 2018 Carl George - 0.11.1-2 -- Buildrequires at least golang 1.10 - -* Tue Nov 13 2018 Carl George - 0.11.1-1 -- Latest upstream -- Update bundled geoip - -* Fri Oct 19 2018 Carl George - 0.11.0-3 -- Enable httpd_can_network_connect selinux boolean to connect to ACME endpoint rhbz#1641158 -- Define UDP 80/443 as selinux http_port_t for QUIC rhbz#1608548 -- Define TCP 5033 as selinux http_port_t for HTTP challenge rhbz#1641160 - -* Thu Jul 12 2018 Fedora Release Engineering - 0.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat May 12 2018 Carl George - 0.11.0-1 -- Latest upstream - -* Sat Apr 21 2018 Carl George - 0.10.14-1 -- Latest upstream -- Overhaul %%prep to extract everything with %%setup -- Edit lego providers to require acmev2 instead of acme -- Add provides for specific providers from %%import_path_dnsproviders and %%import_path_lego -- Add azure dns provider on f28+ - -* Fri Apr 20 2018 Carl George - 0.10.11-6 -- Enable geoip plugin on EL7 -- Only provide bundled geoip/realip/dnsproviders/lego when the respective plugin is enabled - -* Wed Apr 18 2018 Carl George - 0.10.11-5 -- Add geoip plugin - -* Tue Apr 17 2018 Carl George - 0.10.11-4 -- Correct ExclusiveArch fallback - -* Mon Apr 16 2018 Carl George - 0.10.11-3 -- Enable s390x -- Disable googlecloud and route53 dns providers on EL7 due to dependency issues - -* Fri Mar 30 2018 Carl George - 0.10.11-2 -- Add googlecloud dns provider -- Add route53 dns provider -- Set minimum golang version to 1.9 -- Set selinux labels in scriptlets - -* Sat Feb 24 2018 Carl George - 0.10.11-1 -- Latest upstream - -* Sat Feb 24 2018 Carl George - 0.10.10-4 -- Change ProtectSystem from strict to full in unit file on RHEL - -* Wed Feb 07 2018 Fedora Release Engineering - 0.10.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 11 2018 Carl George - 0.10.10-2 -- Add powerdns provider - -* Mon Oct 09 2017 Carl George - 0.10.10-1 -- Latest upstream - -* Mon Oct 02 2017 Carl George - 0.10.9-6 -- Add provides for bundled libraries - -* Mon Oct 02 2017 Carl George - 0.10.9-5 -- Enable rfc2136 dns provider -- List plugins in description - -* Mon Sep 18 2017 Carl George - 0.10.9-4 -- Exclude s390x - -* Sun Sep 17 2017 Carl George - 0.10.9-3 -- Add realip plugin -- Add conditionals for plugins - -* Sat Sep 16 2017 Carl George - 0.10.9-2 -- Add sources for caddyserver/dnsproviders and xenolf/lego -- Disable all dns providers that require additional libraries (dnsimple, dnspod, googlecloud, linode, ovh, route53, vultr) -- Rewrite default index.html - -* Tue Sep 12 2017 Carl George - 0.10.9-1 -- Latest upstream -- Add config validation to unit file -- Disable exoscale dns provider https://github.com/xenolf/lego/issues/429 - -* Fri Sep 08 2017 Carl George - 0.10.8-1 -- Latest upstream -- Build with %%gobuild macro -- Move config subdirectory from /etc/caddy/caddy.conf.d to /etc/caddy/conf.d - -* Tue Aug 29 2017 Carl George - 0.10.7-1 -- Latest upstream - -* Fri Aug 25 2017 Carl George - 0.10.6-2 -- Use SIQQUIT to stop service -- Increase the process limit from 64 to 512 -- Only `go get` in caddy/caddymain - -* Fri Aug 11 2017 Carl George - 0.10.6-1 -- Latest upstream -- Add webserver virtual provides -- Drop tmpfiles and just own /var/lib/caddy directly -- Remove PrivateDevices setting from unit file, it prevents selinux process transitions -- Disable rfc2136 dns provider https://github.com/caddyserver/dnsproviders/issues/11 - -* Sat Jun 03 2017 Carl George - 0.10.3-2 -- Rename Envfile to envfile -- Rename Caddyfile to caddy.conf -- Include additional configs from caddy.conf.d directory - -* Fri May 19 2017 Carl George - 0.10.3-1 -- Latest upstream - -* Mon May 15 2017 Carl George - 0.10.2-1 -- Initial package +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..8e10c3e --- /dev/null +++ b/changelog @@ -0,0 +1,285 @@ +* Wed Jan 22 2025 Carl George - 2.9.1-3 +- Run tests with -short flag like upstream to avoid test failures +- Resolves FTBFS rhbz#2339573 rhbz#2339954 + +* Thu Jan 16 2025 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jan 08 2025 Carl George - 2.9.1-1 +- Update to version 2.9.1 rhbz#2336409 + +* Wed Jan 01 2025 Carl George - 2.9.0-1 +- Update to version 2.9.0 rhbz#2316289 + +* Wed Jul 17 2024 Fedora Release Engineering - 2.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jul 05 2024 Carl George - 2.8.4-1 +- Update to version 2.8.4 rhbz#2278549 +- Resolves CVE-2023-49295 rhbz#2257829 +- Resolves CVE-2024-27304 rhbz#2268278 +- Resolves CVE-2024-27289 rhbz#2268468 +- Resolves CVE-2024-28180 rhbz#2268877 +- Resolves CVE-2024-22189 rhbz#2273517 +- Remove LimitNPROC from systemd unit files + +* Sun Feb 11 2024 Maxwell G - 2.7.6-2 +- Rebuild for golang 1.22.0 + +* Fri Feb 09 2024 Carl George - 2.7.6-1 +- Update to version 2.7.6 rhbz#2253698 +- Includes fix for CVE-2023-45142 rhbz#2246587 + +* Tue Jan 23 2024 Fedora Release Engineering - 2.7.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 30 2023 Carl George - 2.7.5-1 +- Update to version 2.7.5 +- Update poweredby logos +- Add symlink for system_noindex_logo.png on EL9 +- Symlink directly to fedora-testpage directory on Fedora + +* Thu Aug 17 2023 Carl George - 2.7.4-1 +- Update to version 2.7.4, resolves rhbz#2232696 +- Fix CVE-2023-3978, resolves rhbz#2229582 + +* Tue Aug 08 2023 Carl George - 2.7.3-1 +- Update to version 2.7.3, resolves rhbz#2229638 + +* Thu Aug 03 2023 Carl George - 2.7.2-1 +- Update to version 2.7.2, resolves rhbz#2228776 + +* Thu Jul 27 2023 Carl George - 2.7.0~beta2-1 +- Update to version 2.7.0~beta2, resolves rhbz#2225732 rhbz#2124366 +- Resolves CVE-2022-41717 rhbz#2164315 +- Resolves CVE-2022-41723 rhbz#2178412 +- Add man pages +- Use generated shell completion files instead of static ones +- Add fish shell completions +- Switch to systemd sysusers + +* Wed Jul 19 2023 Fedora Release Engineering - 2.5.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jan 24 2023 Carl George - 2.5.2-3 +- Rebuild for CVE-2022-41717 in golang + +* Wed Jan 18 2023 Fedora Release Engineering - 2.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 09 2022 Carl George - 2.5.2-1 +- Latest upstream, resolves rhbz#2062499 rhbz#2113136 + +* Wed Jul 20 2022 Fedora Release Engineering - 2.4.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Maxwell G - 2.4.6-4 +- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in + golang + +* Fri Jun 17 2022 Robert-André Mauchin - 2.4.6-3 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629 + +* Fri Feb 25 2022 Carl George - 2.4.6-2 +- Update welcome page symlink and image to work on both Fedora and EPEL + +* Wed Feb 16 2022 Carl George - 2.4.6-1 +- Latest upstream rhbz#1984163 + +* Wed Jan 19 2022 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Mar 03 2021 Carl George - 2.3.0-1 +- Latest upstream +- Fix vendored license handling +- Switch to white logo rhbz#1934864 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.1-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Jan 26 2021 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 30 2020 Carl George - 2.2.1-1 +- Latest upstream + +* Sat Sep 26 2020 Carl George - 2.2.0-1 +- Latest upstream + +* Sat Sep 19 2020 Carl George - 2.2.0~rc3-1 +- Latest upstream + +* Fri Aug 14 2020 Carl George - 2.1.1-2 +- Add bash and zsh completion support + +* Sun Aug 09 2020 Carl George - 2.1.1-1 +- Update to Caddy v2 +- Remove all v1 plugins +- Use vendored dependencies +- Remove devel subpackage +- Rename config file per upstream request +- Use webserver test page from system-logos-httpd + +* Sat Aug 01 2020 Fedora Release Engineering - 1.0.4-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 07 20:56:10 CEST 2020 Robert-André Mauchin - 1.0.4-1 +- Update to 1.0.4 (#1803691) + +* Mon Feb 17 2020 Elliott Sales de Andrade - 1.0.3-3 +- Rebuilt for GHSA-jf24-p9p9-4rjh + +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Sep 07 2019 Carl George - 1.0.3-1 +- Latest upstream +- Remove bundled lego and plugins +- Remove dyn, gandi, namecheap, and rfc2136 dns providers +- Add patch0 to fix `-version` flag +- Add patch1 to adjust blackfriday import path +- Add devel subpackages +- Run test suite + +* Wed Jul 24 2019 Fedora Release Engineering - 0.11.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 09 2019 Carl George - 0.11.4-2 +- Switch unit file from ProtectSystem strict to full rhbz#1706651 + +* Wed Mar 06 2019 Carl George - 0.11.4-1 +- Latest upstream +- Update bundled dnsproviders to 0.1.3 +- Update bundled lego to 2.2.0 +- Enable googlecloud, route53, and azure dns providers on epel7 +- Allow custom http port with default config file rhbz#1685446 + +* Thu Jan 31 2019 Fedora Release Engineering - 0.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Nov 14 2018 Carl George - 0.11.1-2 +- Buildrequires at least golang 1.10 + +* Tue Nov 13 2018 Carl George - 0.11.1-1 +- Latest upstream +- Update bundled geoip + +* Fri Oct 19 2018 Carl George - 0.11.0-3 +- Enable httpd_can_network_connect selinux boolean to connect to ACME endpoint rhbz#1641158 +- Define UDP 80/443 as selinux http_port_t for QUIC rhbz#1608548 +- Define TCP 5033 as selinux http_port_t for HTTP challenge rhbz#1641160 + +* Thu Jul 12 2018 Fedora Release Engineering - 0.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat May 12 2018 Carl George - 0.11.0-1 +- Latest upstream + +* Sat Apr 21 2018 Carl George - 0.10.14-1 +- Latest upstream +- Overhaul %%prep to extract everything with %%setup +- Edit lego providers to require acmev2 instead of acme +- Add provides for specific providers from %%import_path_dnsproviders and %%import_path_lego +- Add azure dns provider on f28+ + +* Fri Apr 20 2018 Carl George - 0.10.11-6 +- Enable geoip plugin on EL7 +- Only provide bundled geoip/realip/dnsproviders/lego when the respective plugin is enabled + +* Wed Apr 18 2018 Carl George - 0.10.11-5 +- Add geoip plugin + +* Tue Apr 17 2018 Carl George - 0.10.11-4 +- Correct ExclusiveArch fallback + +* Mon Apr 16 2018 Carl George - 0.10.11-3 +- Enable s390x +- Disable googlecloud and route53 dns providers on EL7 due to dependency issues + +* Fri Mar 30 2018 Carl George - 0.10.11-2 +- Add googlecloud dns provider +- Add route53 dns provider +- Set minimum golang version to 1.9 +- Set selinux labels in scriptlets + +* Sat Feb 24 2018 Carl George - 0.10.11-1 +- Latest upstream + +* Sat Feb 24 2018 Carl George - 0.10.10-4 +- Change ProtectSystem from strict to full in unit file on RHEL + +* Wed Feb 07 2018 Fedora Release Engineering - 0.10.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 11 2018 Carl George - 0.10.10-2 +- Add powerdns provider + +* Mon Oct 09 2017 Carl George - 0.10.10-1 +- Latest upstream + +* Mon Oct 02 2017 Carl George - 0.10.9-6 +- Add provides for bundled libraries + +* Mon Oct 02 2017 Carl George - 0.10.9-5 +- Enable rfc2136 dns provider +- List plugins in description + +* Mon Sep 18 2017 Carl George - 0.10.9-4 +- Exclude s390x + +* Sun Sep 17 2017 Carl George - 0.10.9-3 +- Add realip plugin +- Add conditionals for plugins + +* Sat Sep 16 2017 Carl George - 0.10.9-2 +- Add sources for caddyserver/dnsproviders and xenolf/lego +- Disable all dns providers that require additional libraries (dnsimple, dnspod, googlecloud, linode, ovh, route53, vultr) +- Rewrite default index.html + +* Tue Sep 12 2017 Carl George - 0.10.9-1 +- Latest upstream +- Add config validation to unit file +- Disable exoscale dns provider https://github.com/xenolf/lego/issues/429 + +* Fri Sep 08 2017 Carl George - 0.10.8-1 +- Latest upstream +- Build with %%gobuild macro +- Move config subdirectory from /etc/caddy/caddy.conf.d to /etc/caddy/conf.d + +* Tue Aug 29 2017 Carl George - 0.10.7-1 +- Latest upstream + +* Fri Aug 25 2017 Carl George - 0.10.6-2 +- Use SIQQUIT to stop service +- Increase the process limit from 64 to 512 +- Only `go get` in caddy/caddymain + +* Fri Aug 11 2017 Carl George - 0.10.6-1 +- Latest upstream +- Add webserver virtual provides +- Drop tmpfiles and just own /var/lib/caddy directly +- Remove PrivateDevices setting from unit file, it prevents selinux process transitions +- Disable rfc2136 dns provider https://github.com/caddyserver/dnsproviders/issues/11 + +* Sat Jun 03 2017 Carl George - 0.10.3-2 +- Rename Envfile to envfile +- Rename Caddyfile to caddy.conf +- Include additional configs from caddy.conf.d directory + +* Fri May 19 2017 Carl George - 0.10.3-1 +- Latest upstream + +* Mon May 15 2017 Carl George - 0.10.2-1 +- Initial package From b7cb457c44b93db6795a0685886c9eb662930a47 Mon Sep 17 00:00:00 2001 From: Carl George Date: Fri, 18 Apr 2025 17:41:09 -0500 Subject: [PATCH 12/18] Update to version 2.10.0 rhbz#2350493 - Resolves CVE-2025-22872 - Resolves CVE-2024-45339 - Resolves CVE-2025-22869 --- caddy.spec | 613 ++++++++++++++++++++------------------- create-vendor-tarball.sh | 9 +- sources | 4 +- 3 files changed, 324 insertions(+), 302 deletions(-) diff --git a/caddy.spec b/caddy.spec index 7c11165..873f44c 100644 --- a/caddy.spec +++ b/caddy.spec @@ -7,17 +7,176 @@ %endif Name: caddy -Version: 2.9.1 +Version: 2.10.0 Release: %autorelease Summary: Web server with automatic HTTPS +URL: https://caddyserver.com # 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 CC0-1.0 AND ISC AND MPL-2.0 -URL: https://caddyserver.com -Source0: https://%{goipath}/archive/v%{version}/caddy-%{version}.tar.gz +# Apache-2.0: +# cel.dev/expr +# github.com/Masterminds/goutils +# github.com/caddyserver/certmagic +# github.com/dgraph-io/badger +# github.com/dgraph-io/badger/v2 +# github.com/go-logr/logr +# github.com/go-logr/stdr +# github.com/google/cel-go +# github.com/google/certificate-transparency-go +# github.com/google/go-tpm +# github.com/google/go-tspi +# github.com/google/pprof +# github.com/inconshreveable/mousetrap +# github.com/pires/go-proxyproto +# github.com/prometheus/client_model +# github.com/prometheus/procfs +# github.com/smallstep/go-attestation +# github.com/smallstep/nosql +# github.com/smallstep/truststore +# github.com/spf13/cobra +# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp +# go.opentelemetry.io/contrib/propagators/autoprop +# go.opentelemetry.io/contrib/propagators/aws +# go.opentelemetry.io/contrib/propagators/b3 +# go.opentelemetry.io/contrib/propagators/jaeger +# go.opentelemetry.io/contrib/propagators/ot +# go.opentelemetry.io/otel +# go.opentelemetry.io/otel/exporters/otlp/otlptrace +# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc +# go.opentelemetry.io/otel/metric +# go.opentelemetry.io/otel/sdk +# go.opentelemetry.io/otel/trace +# go.opentelemetry.io/proto/otlp +# go.step.sm/linkedca +# go.uber.org/mock +# google.golang.org/genproto/googleapis/api +# google.golang.org/genproto/googleapis/rpc +# google.golang.org/grpc +# BSD-2-Clause: +# github.com/pkg/errors +# github.com/russross/blackfriday/v2 +# BSD-3-Clause: +# dario.cat/mergo +# github.com/antlr4-go/antlr/v4 +# github.com/cloudflare/circl +# github.com/golang/protobuf +# github.com/golang/snappy +# github.com/google/uuid +# github.com/grpc-ecosystem/grpc-gateway/v2 +# github.com/manifoldco/promptui +# github.com/miekg/dns +# github.com/pbnjay/memory +# github.com/pmezard/go-difflib +# github.com/spf13/pflag +# github.com/tailscale/tscert +# golang.org/x/crypto +# golang.org/x/crypto/x509roots/fallback +# golang.org/x/exp +# golang.org/x/mod +# golang.org/x/net +# golang.org/x/sync +# golang.org/x/sys +# golang.org/x/term +# golang.org/x/text +# golang.org/x/time +# golang.org/x/tools +# google.golang.org/protobuf +# CC0-1.0: +# github.com/zeebo/blake3 +# ISC: +# github.com/davecgh/go-spew +# MIT: +# github.com/BurntSushi/toml +# github.com/KimMachineGun/automemlimit +# github.com/Masterminds/semver/v3 +# github.com/Masterminds/sprig/v3 +# github.com/Microsoft/go-winio +# github.com/alecthomas/chroma/v2 +# github.com/aryann/difflib +# github.com/beorn7/perks +# github.com/caddyserver/zerossl +# github.com/cenkalti/backoff/v4 +# github.com/cespare/xxhash +# github.com/cespare/xxhash/v2 +# github.com/chzyer/readline +# github.com/cpuguy83/go-md2man/v2 +# github.com/dgryski/go-farm +# github.com/dlclark/regexp2 +# github.com/dustin/go-humanize +# github.com/felixge/httpsnoop +# github.com/francoispqt/gojay +# github.com/fxamacker/cbor/v2 +# github.com/go-chi/chi/v5 +# github.com/go-kit/kit +# github.com/go-kit/log +# github.com/go-logfmt/logfmt +# github.com/go-task/slim-sprig +# github.com/huandu/xstrings +# github.com/jackc/chunkreader/v2 +# github.com/jackc/pgconn +# github.com/jackc/pgio +# github.com/jackc/pgpassfile +# github.com/jackc/pgproto3/v2 +# github.com/jackc/pgservicefile +# github.com/jackc/pgtype +# github.com/klauspost/cpuid/v2 +# github.com/libdns/libdns +# github.com/mattn/go-colorable +# github.com/mattn/go-isatty +# github.com/mgutz/ansi +# github.com/mitchellh/copystructure +# github.com/mitchellh/go-ps +# github.com/mitchellh/reflectwalk +# github.com/onsi/ginkgo/v2 +# github.com/quic-go/qpack +# github.com/quic-go/quic-go +# github.com/rs/xid +# github.com/shopspring/decimal +# github.com/shurcooL/sanitized_anchor_name +# github.com/sirupsen/logrus +# github.com/slackhq/nebula +# github.com/smallstep/pkcs7 +# github.com/spf13/cast +# github.com/stoewer/go-strcase +# github.com/stretchr/testify +# github.com/urfave/cli +# github.com/x448/float16 +# github.com/yuin/goldmark +# github.com/yuin/goldmark-highlighting/v2 +# go.etcd.io/bbolt +# go.uber.org/automaxprocs +# go.uber.org/multierr +# go.uber.org/zap +# go.uber.org/zap/exp +# gopkg.in/natefinch/lumberjack.v2 +# MPL-2.0: +# github.com/go-sql-driver/mysql +# Apache-2.0 AND BSD-2-Clause: +# go.step.sm/cli-utils +# go.step.sm/crypto +# Apache-2.0 AND BSD-3-Clause: +# github.com/go-jose/go-jose/v3 +# github.com/mholt/acmez/v3 +# github.com/prometheus/common +# github.com/smallstep/certificates +# Apache-2.0 AND MIT: +# github.com/dgraph-io/ristretto +# github.com/prometheus/client_golang +# gopkg.in/yaml.v3 +# BSD-2-Clause-Views AND BSD-3-Clause: +# howett.net/plist +# BSD-3-Clause AND Apache-2.0 AND MIT: +# github.com/klauspost/compress +# BSD-3-Clause AND BSD-1-Clause: +# filippo.io/edwards25519 +# MIT AND BSD-3-Clause: +# github.com/jackc/pgx/v4 +# github.com/smallstep/scep +# MIT AND CC0-1.0: +# github.com/AndreasBriese/bbloom +License: Apache-2.0 AND BSD-1-Clause AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT AND MPL-2.0 -# vendored dependencies +Source0: https://%{goipath}/archive/v%{version}/caddy-%{version}.tar.gz Source1: caddy-%{version}-vendor.tar.gz Source2: create-vendor-tarball.sh @@ -40,302 +199,162 @@ BuildRequires: go-rpm-macros ExclusiveArch: %{golang_arches_future} %endif -# https://github.com/caddyserver/caddy/commit/2028da4e74cd41f0f7f94222c6599da1a371d4b8 -BuildRequires: golang >= 1.22.3 - -# dario.cat/mergo : BSD-3-Clause -Provides: bundled(golang(dario.cat/mergo)) = 1.0.1 -# filippo.io/edwards25519 : BSD-3-Clause -Provides: bundled(golang(filippo.io/edwards25519)) = 1.1.0 -# github.com/AndreasBriese/bbloom : MIT AND CC0-1.0 -Provides: bundled(golang(github.com/AndreasBriese/bbloom)) = 46b345b -# github.com/BurntSushi/toml : MIT -Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.4.0 -# github.com/Masterminds/goutils : Apache-2.0 -Provides: bundled(golang(github.com/Masterminds/goutils)) = 1.1.1 -# github.com/Masterminds/semver/v3 : MIT -Provides: bundled(golang(github.com/Masterminds/semver/v3)) = 3.3.0 -# github.com/Masterminds/sprig/v3 : MIT -Provides: bundled(golang(github.com/Masterminds/sprig/v3)) = 3.3.0 -# github.com/Microsoft/go-winio : MIT -Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.6.0 -# github.com/alecthomas/chroma/v2 : MIT -Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.14.0 -# github.com/antlr4-go/antlr/v4 : BSD-3-Clause -Provides: bundled(golang(github.com/antlr4-go/antlr/v4)) = 4.13.0 -# github.com/aryann/difflib : MIT -Provides: bundled(golang(github.com/aryann/difflib)) = ff5ff6d -# github.com/beorn7/perks : MIT -Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 -# github.com/caddyserver/certmagic : Apache-2.0 -Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.21.6 -# github.com/caddyserver/zerossl : MIT -Provides: bundled(golang(github.com/caddyserver/zerossl)) = 0.1.3 -# github.com/cenkalti/backoff/v4 : MIT -Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.3.0 -# github.com/cespare/xxhash : MIT -Provides: bundled(golang(github.com/cespare/xxhash)) = 1.1.0 -# github.com/cespare/xxhash/v2 : MIT -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.3.0 -# github.com/chzyer/readline : MIT -Provides: bundled(golang(github.com/chzyer/readline)) = 1.5.1 -# github.com/cpuguy83/go-md2man/v2 : MIT -Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.4 -# github.com/davecgh/go-spew : ISC -Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 -# github.com/dgraph-io/badger : Apache-2.0 -Provides: bundled(golang(github.com/dgraph-io/badger)) = 1.6.2 -# github.com/dgraph-io/badger/v2 : Apache-2.0 -Provides: bundled(golang(github.com/dgraph-io/badger/v2)) = 2.2007.4 -# github.com/dgraph-io/ristretto : Apache-2.0 AND MIT -Provides: bundled(golang(github.com/dgraph-io/ristretto)) = 0.1.0 -# github.com/dgryski/go-farm : MIT -Provides: bundled(golang(github.com/dgryski/go-farm)) = a6ae236 -# github.com/dlclark/regexp2 : MIT -Provides: bundled(golang(github.com/dlclark/regexp2)) = 1.11.0 -# github.com/dustin/go-humanize : MIT -Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.1 -# github.com/felixge/httpsnoop : MIT -Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4 -# github.com/francoispqt/gojay : MIT -Provides: bundled(golang(github.com/francoispqt/gojay)) = 1.2.13 -# github.com/fxamacker/cbor/v2 : MIT -Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = 2.6.0 -# github.com/go-chi/chi/v5 : MIT -Provides: bundled(golang(github.com/go-chi/chi/v5)) = 5.0.12 -# github.com/go-jose/go-jose/v3 : Apache-2.0 AND BSD-3-Clause -Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.3 -# github.com/go-kit/kit : MIT -Provides: bundled(golang(github.com/go-kit/kit)) = 0.13.0 -# github.com/go-kit/log : MIT -Provides: bundled(golang(github.com/go-kit/log)) = 0.2.1 -# github.com/go-logfmt/logfmt : MIT -Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.6.0 -# github.com/go-logr/logr : Apache-2.0 -Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.2 -# github.com/go-logr/stdr : Apache-2.0 -Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2 -# github.com/go-sql-driver/mysql : MPL-2.0 -Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.7.1 -# github.com/go-task/slim-sprig : MIT -Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 -# github.com/golang/glog : Apache-2.0 -Provides: bundled(golang(github.com/golang/glog)) = 1.2.2 -# github.com/golang/protobuf : BSD-3-Clause -Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.4 -# github.com/golang/snappy : BSD-3-Clause -Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 -# github.com/google/cel-go : Apache-2.0 -Provides: bundled(golang(github.com/google/cel-go)) = 0.21.0 -# github.com/google/certificate-transparency-go : Apache-2.0 -Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 74a5dd3 -# github.com/google/go-tpm : Apache-2.0 -Provides: bundled(golang(github.com/google/go-tpm)) = 0.9.0 -# github.com/google/go-tspi : Apache-2.0 -Provides: bundled(golang(github.com/google/go-tspi)) = 0.3.0 -# github.com/google/pprof : Apache-2.0 -Provides: bundled(golang(github.com/google/pprof)) = ec68065 -# github.com/google/uuid : BSD-3-Clause -Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 -# github.com/grpc-ecosystem/grpc-gateway/v2 : BSD-3-Clause -Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway/v2)) = 2.22.0 -# github.com/huandu/xstrings : MIT -Provides: bundled(golang(github.com/huandu/xstrings)) = 1.5.0 -# github.com/inconshreveable/mousetrap : Apache-2.0 -Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 -# github.com/jackc/chunkreader/v2 : MIT -Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1 -# github.com/jackc/pgconn : MIT -Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.3 -# github.com/jackc/pgio : MIT -Provides: bundled(golang(github.com/jackc/pgio)) = 1.0.0 -# github.com/jackc/pgpassfile : MIT -Provides: bundled(golang(github.com/jackc/pgpassfile)) = 1.0.0 -# github.com/jackc/pgproto3/v2 : MIT -Provides: bundled(golang(github.com/jackc/pgproto3/v2)) = 2.3.3 -# github.com/jackc/pgservicefile : MIT -Provides: bundled(golang(github.com/jackc/pgservicefile)) = 091c0ba -# github.com/jackc/pgtype : MIT -Provides: bundled(golang(github.com/jackc/pgtype)) = 1.14.0 -# github.com/jackc/pgx/v4 : MIT -Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.3 -# github.com/klauspost/compress : BSD-3-Clause AND Apache-2.0 AND MIT -Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.11 -# github.com/klauspost/cpuid/v2 : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.9 -# github.com/libdns/libdns : MIT -Provides: bundled(golang(github.com/libdns/libdns)) = 0.2.2 -# github.com/manifoldco/promptui : BSD-3-Clause -Provides: bundled(golang(github.com/manifoldco/promptui)) = 0.9.0 -# github.com/mattn/go-colorable : MIT -Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.13 -# github.com/mattn/go-isatty : MIT -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 -# github.com/mgutz/ansi : MIT -Provides: bundled(golang(github.com/mgutz/ansi)) = d51e80e -# github.com/mholt/acmez/v3 : Apache-2.0 AND BSD-3-Clause -Provides: bundled(golang(github.com/mholt/acmez/v3)) = 3.0.0 -# github.com/miekg/dns : BSD-3-Clause -Provides: bundled(golang(github.com/miekg/dns)) = 1.1.62 -# github.com/mitchellh/copystructure : MIT -Provides: bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0 -# github.com/mitchellh/go-ps : MIT -Provides: bundled(golang(github.com/mitchellh/go-ps)) = 1.0.0 -# github.com/mitchellh/reflectwalk : MIT -Provides: bundled(golang(github.com/mitchellh/reflectwalk)) = 1.0.2 -# github.com/onsi/ginkgo/v2 : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.2 -# github.com/pires/go-proxyproto : Apache-2.0 -Provides: bundled(golang(github.com/pires/go-proxyproto)) = b718e7c -# github.com/pkg/errors : BSD-2-Clause -Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 -# github.com/pmezard/go-difflib : BSD-3-Clause -Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 -# github.com/prometheus/client_golang : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.19.1 -# github.com/prometheus/client_model : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 -# github.com/prometheus/common : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.48.0 -# github.com/prometheus/procfs : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 -# github.com/quic-go/qpack : MIT -Provides: bundled(golang(github.com/quic-go/qpack)) = 0.5.1 -# github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.48.2 -# github.com/rs/xid : MIT -Provides: bundled(golang(github.com/rs/xid)) = 1.5.0 -# github.com/russross/blackfriday/v2 : BSD-2-Clause -Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 -# github.com/shopspring/decimal : MIT -Provides: bundled(golang(github.com/shopspring/decimal)) = 1.4.0 -# github.com/shurcooL/sanitized_anchor_name : MIT -Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0 -# github.com/sirupsen/logrus : MIT -Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3 -# github.com/slackhq/nebula : MIT -Provides: bundled(golang(github.com/slackhq/nebula)) = 1.6.1 -# github.com/smallstep/certificates : Apache-2.0 -Provides: bundled(golang(github.com/smallstep/certificates)) = 0.26.1 -# github.com/smallstep/go-attestation : Apache-2.0 -Provides: bundled(golang(github.com/smallstep/go-attestation)) = 413678f -# github.com/smallstep/nosql : Apache-2.0 -Provides: bundled(golang(github.com/smallstep/nosql)) = 0.6.1 -# github.com/smallstep/pkcs7 : MIT -Provides: bundled(golang(github.com/smallstep/pkcs7)) = 3b98ecc -# github.com/smallstep/scep : MIT -Provides: bundled(golang(github.com/smallstep/scep)) = aee96d7 -# github.com/smallstep/truststore : Apache-2.0 -Provides: bundled(golang(github.com/smallstep/truststore)) = 0.13.0 -# github.com/spf13/cast : MIT -Provides: bundled(golang(github.com/spf13/cast)) = 1.7.0 -# github.com/spf13/cobra : Apache-2.0 -Provides: bundled(golang(github.com/spf13/cobra)) = 1.8.1 -# github.com/spf13/pflag : BSD-3-Clause -Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5 -# github.com/stoewer/go-strcase : MIT -Provides: bundled(golang(github.com/stoewer/go-strcase)) = 1.2.0 -# github.com/stretchr/testify : MIT -Provides: bundled(golang(github.com/stretchr/testify)) = 1.9.0 -# github.com/tailscale/tscert : BSD-3-Clause -Provides: bundled(golang(github.com/tailscale/tscert)) = d3f8340 -# github.com/urfave/cli : MIT -Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 -# github.com/x448/float16 : MIT -Provides: bundled(golang(github.com/x448/float16)) = 0.8.4 -# github.com/yuin/goldmark : MIT -Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.8 -# github.com/yuin/goldmark-highlighting/v2 : MIT -Provides: bundled(golang(github.com/yuin/goldmark-highlighting/v2)) = 37449ab -# github.com/zeebo/blake3 : CC0-1.0 -Provides: bundled(golang(github.com/zeebo/blake3)) = 0.2.4 -# go.etcd.io/bbolt : MIT -Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.9 -# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.56.0 -# go.opentelemetry.io/contrib/propagators/autoprop : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/autoprop)) = 0.42.0 -# go.opentelemetry.io/contrib/propagators/aws : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/aws)) = 1.17.0 -# go.opentelemetry.io/contrib/propagators/b3 : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/b3)) = 1.17.0 -# go.opentelemetry.io/contrib/propagators/jaeger : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/jaeger)) = 1.17.0 -# go.opentelemetry.io/contrib/propagators/ot : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/ot)) = 1.17.0 -# go.opentelemetry.io/otel : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.31.0 -# go.opentelemetry.io/otel/exporters/otlp/otlptrace : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.31.0 -# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.31.0 -# go.opentelemetry.io/otel/metric : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.31.0 -# go.opentelemetry.io/otel/sdk : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.31.0 -# go.opentelemetry.io/otel/trace : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.31.0 -# go.opentelemetry.io/proto/otlp : Apache-2.0 -Provides: bundled(golang(go.opentelemetry.io/proto/otlp)) = 1.3.1 -# go.step.sm/cli-utils : Apache-2.0 AND BSD-2-Clause -Provides: bundled(golang(go.step.sm/cli-utils)) = 0.9.0 -# go.step.sm/crypto : Apache-2.0 AND BSD-2-Clause -Provides: bundled(golang(go.step.sm/crypto)) = 0.45.0 -# go.step.sm/linkedca : Apache-2.0 -Provides: bundled(golang(go.step.sm/linkedca)) = 0.20.1 -# go.uber.org/automaxprocs : MIT -Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.6.0 -# go.uber.org/mock : Apache-2.0 -Provides: bundled(golang(go.uber.org/mock)) = 0.4.0 -# go.uber.org/multierr : MIT -Provides: bundled(golang(go.uber.org/multierr)) = 1.11.0 -# go.uber.org/zap : MIT -Provides: bundled(golang(go.uber.org/zap)) = 1.27.0 -# go.uber.org/zap/exp : MIT -Provides: bundled(golang(go.uber.org/zap/exp)) = 0.3.0 -# golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.31.0 -# golang.org/x/crypto/x509roots/fallback : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto/x509roots/fallback)) = 71ed71b -# golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 9bf2ced -# golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.18.0 -# golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.33.0 -# golang.org/x/sync : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sync)) = 0.10.0 -# golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.28.0 -# golang.org/x/term : BSD-3-Clause -Provides: bundled(golang(golang.org/x/term)) = 0.27.0 -# golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.21.0 -# golang.org/x/time : BSD-3-Clause -Provides: bundled(golang(golang.org/x/time)) = 0.7.0 -# golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.22.0 -# google.golang.org/genproto/googleapis/api : Apache-2.0 -Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 5fefd90 -# google.golang.org/genproto/googleapis/rpc : Apache-2.0 -Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 5fefd90 -# google.golang.org/grpc : Apache-2.0 -Provides: bundled(golang(google.golang.org/grpc)) = 1.67.1 -# google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.35.1 -# gopkg.in/natefinch/lumberjack.v2 : MIT -Provides: bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = 2.2.1 -# gopkg.in/yaml.v3 : Apache-2.0 AND MIT -Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 -# howett.net/plist : BSD-2-Clause-Views AND BSD-3-Clause -Provides: bundled(golang(howett.net/plist)) = 1.0.0 - BuildRequires: systemd-rpm-macros %{?systemd_requires} %{?sysusers_requires_compat} + +# https://github.com/caddyserver/caddy/commit/172136a0a0f6aa47be4eab3727fa2482d7af6617 +BuildRequires: golang >= 1.24 Requires: system-logos-httpd Provides: webserver +Provides: bundled(golang(cel.dev/expr)) = 0.19.1 +Provides: bundled(golang(dario.cat/mergo)) = 1.0.1 +Provides: bundled(golang(filippo.io/edwards25519)) = 1.1.0 +Provides: bundled(golang(github.com/AndreasBriese/bbloom)) = 46b345b +Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.4.0 +Provides: bundled(golang(github.com/KimMachineGun/automemlimit)) = 0.7.1 +Provides: bundled(golang(github.com/Masterminds/goutils)) = 1.1.1 +Provides: bundled(golang(github.com/Masterminds/semver/v3)) = 3.3.0 +Provides: bundled(golang(github.com/Masterminds/sprig/v3)) = 3.3.0 +Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.6.0 +Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.15.0 +Provides: bundled(golang(github.com/antlr4-go/antlr/v4)) = 4.13.0 +Provides: bundled(golang(github.com/aryann/difflib)) = ff5ff6d +Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 +Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.23.0 +Provides: bundled(golang(github.com/caddyserver/zerossl)) = 0.1.3 +Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.3.0 +Provides: bundled(golang(github.com/cespare/xxhash)) = 1.1.0 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.3.0 +Provides: bundled(golang(github.com/chzyer/readline)) = 1.5.1 +Provides: bundled(golang(github.com/cloudflare/circl)) = 1.6.0 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.6 +Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 +Provides: bundled(golang(github.com/dgraph-io/badger)) = 1.6.2 +Provides: bundled(golang(github.com/dgraph-io/badger/v2)) = 2.2007.4 +Provides: bundled(golang(github.com/dgraph-io/ristretto)) = 0.2.0 +Provides: bundled(golang(github.com/dgryski/go-farm)) = a6ae236 +Provides: bundled(golang(github.com/dlclark/regexp2)) = 1.11.4 +Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.1 +Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4 +Provides: bundled(golang(github.com/francoispqt/gojay)) = 1.2.13 +Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = 2.6.0 +Provides: bundled(golang(github.com/go-chi/chi/v5)) = 5.2.1 +Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.4 +Provides: bundled(golang(github.com/go-kit/kit)) = 0.13.0 +Provides: bundled(golang(github.com/go-kit/log)) = 0.2.1 +Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.6.0 +Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.2 +Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2 +Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.7.1 +Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 +Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.4 +Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 +Provides: bundled(golang(github.com/google/cel-go)) = 0.24.1 +Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 74a5dd3 +Provides: bundled(golang(github.com/google/go-tpm)) = 0.9.0 +Provides: bundled(golang(github.com/google/go-tspi)) = 0.3.0 +Provides: bundled(golang(github.com/google/pprof)) = ec68065 +Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 +Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway/v2)) = 2.22.0 +Provides: bundled(golang(github.com/huandu/xstrings)) = 1.5.0 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 +Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1 +Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.3 +Provides: bundled(golang(github.com/jackc/pgio)) = 1.0.0 +Provides: bundled(golang(github.com/jackc/pgpassfile)) = 1.0.0 +Provides: bundled(golang(github.com/jackc/pgproto3/v2)) = 2.3.3 +Provides: bundled(golang(github.com/jackc/pgservicefile)) = 091c0ba +Provides: bundled(golang(github.com/jackc/pgtype)) = 1.14.0 +Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.3 +Provides: bundled(golang(github.com/klauspost/compress)) = 1.18.0 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.10 +Provides: bundled(golang(github.com/libdns/libdns)) = 1.0.0-beta.1 +Provides: bundled(golang(github.com/manifoldco/promptui)) = 0.9.0 +Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.13 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 +Provides: bundled(golang(github.com/mgutz/ansi)) = d51e80e +Provides: bundled(golang(github.com/mholt/acmez/v3)) = 3.1.2 +Provides: bundled(golang(github.com/miekg/dns)) = 1.1.63 +Provides: bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0 +Provides: bundled(golang(github.com/mitchellh/go-ps)) = 1.0.0 +Provides: bundled(golang(github.com/mitchellh/reflectwalk)) = 1.0.2 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.2 +Provides: bundled(golang(github.com/pbnjay/memory)) = 7b4eea6 +Provides: bundled(golang(github.com/pires/go-proxyproto)) = b718e7c +Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 +Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.19.1 +Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.48.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 +Provides: bundled(golang(github.com/quic-go/qpack)) = 0.5.1 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.50.1 +Provides: bundled(golang(github.com/rs/xid)) = 1.5.0 +Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 +Provides: bundled(golang(github.com/shopspring/decimal)) = 1.4.0 +Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0 +Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3 +Provides: bundled(golang(github.com/slackhq/nebula)) = 1.6.1 +Provides: bundled(golang(github.com/smallstep/certificates)) = 0.26.1 +Provides: bundled(golang(github.com/smallstep/go-attestation)) = 413678f +Provides: bundled(golang(github.com/smallstep/nosql)) = 0.6.1 +Provides: bundled(golang(github.com/smallstep/pkcs7)) = 3b98ecc +Provides: bundled(golang(github.com/smallstep/scep)) = aee96d7 +Provides: bundled(golang(github.com/smallstep/truststore)) = 0.13.0 +Provides: bundled(golang(github.com/spf13/cast)) = 1.7.0 +Provides: bundled(golang(github.com/spf13/cobra)) = 1.9.1 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6 +Provides: bundled(golang(github.com/stoewer/go-strcase)) = 1.2.0 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.10.0 +Provides: bundled(golang(github.com/tailscale/tscert)) = d3f8340 +Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 +Provides: bundled(golang(github.com/x448/float16)) = 0.8.4 +Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.8 +Provides: bundled(golang(github.com/yuin/goldmark-highlighting/v2)) = 37449ab +Provides: bundled(golang(github.com/zeebo/blake3)) = 0.2.4 +Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.9 +Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.56.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/autoprop)) = 0.42.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/aws)) = 1.17.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/b3)) = 1.17.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/jaeger)) = 1.17.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/ot)) = 1.17.0 +Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.31.0 +Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.31.0 +Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.31.0 +Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.31.0 +Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.31.0 +Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.31.0 +Provides: bundled(golang(go.opentelemetry.io/proto/otlp)) = 1.3.1 +Provides: bundled(golang(go.step.sm/cli-utils)) = 0.9.0 +Provides: bundled(golang(go.step.sm/crypto)) = 0.45.0 +Provides: bundled(golang(go.step.sm/linkedca)) = 0.20.1 +Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.6.0 +Provides: bundled(golang(go.uber.org/mock)) = 0.5.0 +Provides: bundled(golang(go.uber.org/multierr)) = 1.11.0 +Provides: bundled(golang(go.uber.org/zap)) = 1.27.0 +Provides: bundled(golang(go.uber.org/zap/exp)) = 0.3.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.36.0 +Provides: bundled(golang(golang.org/x/crypto/x509roots/fallback)) = 49bf5b8 +Provides: bundled(golang(golang.org/x/exp)) = 9bf2ced +Provides: bundled(golang(golang.org/x/mod)) = 0.24.0 +Provides: bundled(golang(golang.org/x/net)) = 0.38.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.12.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.31.0 +Provides: bundled(golang(golang.org/x/term)) = 0.30.0 +Provides: bundled(golang(golang.org/x/text)) = 0.23.0 +Provides: bundled(golang(golang.org/x/time)) = 0.11.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.31.0 +Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 5fefd90 +Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 5fefd90 +Provides: bundled(golang(google.golang.org/grpc)) = 1.67.1 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.35.1 +Provides: bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = 2.2.1 +Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 +Provides: bundled(golang(howett.net/plist)) = 1.0.0 + %description Caddy is an extensible server platform that uses TLS by default. @@ -364,7 +383,7 @@ install -D -p -m 0755 -t %{buildroot}%{_bindir} bin/caddy ./bin/caddy manpage --directory %{buildroot}%{_mandir}/man8 # config -install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/caddy/Caddyfile +install -D -p -m 0644 -t %{buildroot}%{_sysconfdir}/caddy %{S:10} install -d -m 0755 %{buildroot}%{_sysconfdir}/caddy/Caddyfile.d # systemd units diff --git a/create-vendor-tarball.sh b/create-vendor-tarball.sh index 4df0320..87bace1 100755 --- a/create-vendor-tarball.sh +++ b/create-vendor-tarball.sh @@ -9,6 +9,9 @@ fi set -euo pipefail +PKG="caddy" +REPO="https://github.com/caddyserver/$PKG" + # transform tag into version case $tag in *beta*) @@ -30,8 +33,8 @@ 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 +git -c advice.detachedHead=false clone --branch $tag --depth 1 $REPO.git $PKG-$version +pushd $PKG-$version GOPROXY='https://proxy.golang.org,direct' go mod vendor popd -tar -C caddy-$version -czf caddy-$version-vendor.tar.gz vendor +tar -C $PKG-$version -czf $PKG-$version-vendor.tar.gz vendor diff --git a/sources b/sources index 507c3f7..ebdbe02 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (caddy-2.9.1.tar.gz) = 2ed36bfe8de3a2c7270e202b2d9ab4c3c78174fcd09c02e38d61d1bd57afa6471a2a690f15edcf91f2bfb105dbf2b0c2186d0c5e6f20ec169e98c66f8f71d0f8 -SHA512 (caddy-2.9.1-vendor.tar.gz) = c37617fd38da0b9d966d5bd297d5647386d5d863d9674f530497a3c5102545e94a6279072d237a1278476365b008153484352ae79a82ff57997088d3510a1eef +SHA512 (caddy-2.10.0.tar.gz) = 9f0448b6108d088c5b9f59af8977df9adb73d62ebfc9fce038b07d927984873e39234d7d7dfd64c20e9527eccc400bd54930c5ffa21ec899a117e2c13b6ae229 +SHA512 (caddy-2.10.0-vendor.tar.gz) = 0dc3b2ebd96cd4ea937b7ffd34a8b33b5a3ffdff5fbf55357104019674319ebfcde0a1b3514897c62595409f7edc79a9da580fa3c7cc30c8913017a430f27c9a From 7f398568ca8a486af6d00084dbfd9fa8e20c17cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:02:07 +0000 Subject: [PATCH 13/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9ecd047ae08fad6f018055ccd6f6cb8045a39570 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 14:23:42 -0500 Subject: [PATCH 14/18] Rebuild for golang-1.25.0 --- caddy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/caddy.spec b/caddy.spec index 873f44c..199f7e8 100644 --- a/caddy.spec +++ b/caddy.spec @@ -8,7 +8,7 @@ Name: caddy Version: 2.10.0 -Release: %autorelease +Release: %autorelease.1 Summary: Web server with automatic HTTPS URL: https://caddyserver.com @@ -509,4 +509,7 @@ fi %changelog +* Fri Aug 15 2025 Maxwell G - 2.10.0-1.1 +- Rebuild for golang-1.25.0 + %autochangelog From b068e4104c6face75c76ef088560d0c58fc3ecfc Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 15:26:06 -0500 Subject: [PATCH 15/18] Revert "Rebuild for golang-1.25.0" This reverts commit 9ecd047ae08fad6f018055ccd6f6cb8045a39570. --- caddy.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/caddy.spec b/caddy.spec index 199f7e8..873f44c 100644 --- a/caddy.spec +++ b/caddy.spec @@ -8,7 +8,7 @@ Name: caddy Version: 2.10.0 -Release: %autorelease.1 +Release: %autorelease Summary: Web server with automatic HTTPS URL: https://caddyserver.com @@ -509,7 +509,4 @@ fi %changelog -* Fri Aug 15 2025 Maxwell G - 2.10.0-1.1 -- Rebuild for golang-1.25.0 - %autochangelog From 2e3e4085eb0ec68d81a04fe68d5d65154abd3c4b Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 16:03:06 -0500 Subject: [PATCH 16/18] Rebuild for golang-1.25.0 From a28b0a7c7d0f53e350f31ce53226d3b9082d0b65 Mon Sep 17 00:00:00 2001 From: Carl George Date: Sat, 23 Aug 2025 23:11:40 -0500 Subject: [PATCH 17/18] Update to version 2.10.2 rhbz#2390338 --- ...e-commands-that-can-alter-the-binary.patch | 44 +- caddy.spec | 417 ++++++------------ sources | 4 +- 3 files changed, 184 insertions(+), 281 deletions(-) diff --git a/0001-Disable-commands-that-can-alter-the-binary.patch b/0001-Disable-commands-that-can-alter-the-binary.patch index 710f8c5..73a53c8 100644 --- a/0001-Disable-commands-that-can-alter-the-binary.patch +++ b/0001-Disable-commands-that-can-alter-the-binary.patch @@ -1,17 +1,18 @@ -From ffc4888694c5222e9eddecb461c955d5661aa18c Mon Sep 17 00:00:00 2001 +From 41711beb6776923a84c06fad76964e5932333bd7 Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 16 Feb 2022 11:45:03 -0600 -Subject: [PATCH 1/2] Disable commands that can alter the binary +Subject: [PATCH] Disable commands that can alter the binary --- - cmd/commands.go | 45 --------------------------------------------- - 1 file changed, 45 deletions(-) + cmd/commands.go | 45 -------------------------------------------- + cmd/commands_test.go | 8 ++++---- + 2 files changed, 4 insertions(+), 49 deletions(-) diff --git a/cmd/commands.go b/cmd/commands.go -index 259dd358..31b85a18 100644 +index c9ea636b..791ddf6d 100644 --- a/cmd/commands.go +++ b/cmd/commands.go -@@ -395,51 +395,6 @@ is always printed to stdout. +@@ -404,51 +404,6 @@ is always printed to stdout. }, }) @@ -61,8 +62,35 @@ index 259dd358..31b85a18 100644 - }) - defaultFactory.Use(func(rootCmd *cobra.Command) { - rootCmd.AddCommand(caddyCmdToCobra(Command{ + manpageCommand := Command{ Name: "manpage", +diff --git a/cmd/commands_test.go b/cmd/commands_test.go +index 085a9d78..f6d01fa3 100644 +--- a/cmd/commands_test.go ++++ b/cmd/commands_test.go +@@ -19,7 +19,7 @@ func TestCommandsAreAvailable(t *testing.T) { + // include the commands registered through calls to init in + // other packages + cmds := Commands() +- if len(cmds) != 17 { ++ if len(cmds) != 14 { + t.Errorf("expected 17 commands, got %d", len(cmds)) + } + +@@ -27,10 +27,10 @@ func TestCommandsAreAvailable(t *testing.T) { + slices.Sort(commandNames) + + expectedCommandNames := []string{ +- "adapt", "add-package", "build-info", "completion", ++ "adapt", "build-info", "completion", + "environ", "fmt", "list-modules", "manpage", +- "reload", "remove-package", "run", "start", +- "stop", "storage", "upgrade", "validate", "version", ++ "reload", "run", "start", ++ "stop", "storage", "validate", "version", + } + + if !reflect.DeepEqual(expectedCommandNames, commandNames) { -- -2.47.1 +2.50.1 diff --git a/caddy.spec b/caddy.spec index 873f44c..c7e502f 100644 --- a/caddy.spec +++ b/caddy.spec @@ -7,173 +7,13 @@ %endif Name: caddy -Version: 2.10.0 +Version: 2.10.2 Release: %autorelease Summary: Web server with automatic HTTPS URL: https://caddyserver.com # main source code is Apache-2.0 -# Apache-2.0: -# cel.dev/expr -# github.com/Masterminds/goutils -# github.com/caddyserver/certmagic -# github.com/dgraph-io/badger -# github.com/dgraph-io/badger/v2 -# github.com/go-logr/logr -# github.com/go-logr/stdr -# github.com/google/cel-go -# github.com/google/certificate-transparency-go -# github.com/google/go-tpm -# github.com/google/go-tspi -# github.com/google/pprof -# github.com/inconshreveable/mousetrap -# github.com/pires/go-proxyproto -# github.com/prometheus/client_model -# github.com/prometheus/procfs -# github.com/smallstep/go-attestation -# github.com/smallstep/nosql -# github.com/smallstep/truststore -# github.com/spf13/cobra -# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp -# go.opentelemetry.io/contrib/propagators/autoprop -# go.opentelemetry.io/contrib/propagators/aws -# go.opentelemetry.io/contrib/propagators/b3 -# go.opentelemetry.io/contrib/propagators/jaeger -# go.opentelemetry.io/contrib/propagators/ot -# go.opentelemetry.io/otel -# go.opentelemetry.io/otel/exporters/otlp/otlptrace -# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc -# go.opentelemetry.io/otel/metric -# go.opentelemetry.io/otel/sdk -# go.opentelemetry.io/otel/trace -# go.opentelemetry.io/proto/otlp -# go.step.sm/linkedca -# go.uber.org/mock -# google.golang.org/genproto/googleapis/api -# google.golang.org/genproto/googleapis/rpc -# google.golang.org/grpc -# BSD-2-Clause: -# github.com/pkg/errors -# github.com/russross/blackfriday/v2 -# BSD-3-Clause: -# dario.cat/mergo -# github.com/antlr4-go/antlr/v4 -# github.com/cloudflare/circl -# github.com/golang/protobuf -# github.com/golang/snappy -# github.com/google/uuid -# github.com/grpc-ecosystem/grpc-gateway/v2 -# github.com/manifoldco/promptui -# github.com/miekg/dns -# github.com/pbnjay/memory -# github.com/pmezard/go-difflib -# github.com/spf13/pflag -# github.com/tailscale/tscert -# golang.org/x/crypto -# golang.org/x/crypto/x509roots/fallback -# golang.org/x/exp -# golang.org/x/mod -# golang.org/x/net -# golang.org/x/sync -# golang.org/x/sys -# golang.org/x/term -# golang.org/x/text -# golang.org/x/time -# golang.org/x/tools -# google.golang.org/protobuf -# CC0-1.0: -# github.com/zeebo/blake3 -# ISC: -# github.com/davecgh/go-spew -# MIT: -# github.com/BurntSushi/toml -# github.com/KimMachineGun/automemlimit -# github.com/Masterminds/semver/v3 -# github.com/Masterminds/sprig/v3 -# github.com/Microsoft/go-winio -# github.com/alecthomas/chroma/v2 -# github.com/aryann/difflib -# github.com/beorn7/perks -# github.com/caddyserver/zerossl -# github.com/cenkalti/backoff/v4 -# github.com/cespare/xxhash -# github.com/cespare/xxhash/v2 -# github.com/chzyer/readline -# github.com/cpuguy83/go-md2man/v2 -# github.com/dgryski/go-farm -# github.com/dlclark/regexp2 -# github.com/dustin/go-humanize -# github.com/felixge/httpsnoop -# github.com/francoispqt/gojay -# github.com/fxamacker/cbor/v2 -# github.com/go-chi/chi/v5 -# github.com/go-kit/kit -# github.com/go-kit/log -# github.com/go-logfmt/logfmt -# github.com/go-task/slim-sprig -# github.com/huandu/xstrings -# github.com/jackc/chunkreader/v2 -# github.com/jackc/pgconn -# github.com/jackc/pgio -# github.com/jackc/pgpassfile -# github.com/jackc/pgproto3/v2 -# github.com/jackc/pgservicefile -# github.com/jackc/pgtype -# github.com/klauspost/cpuid/v2 -# github.com/libdns/libdns -# github.com/mattn/go-colorable -# github.com/mattn/go-isatty -# github.com/mgutz/ansi -# github.com/mitchellh/copystructure -# github.com/mitchellh/go-ps -# github.com/mitchellh/reflectwalk -# github.com/onsi/ginkgo/v2 -# github.com/quic-go/qpack -# github.com/quic-go/quic-go -# github.com/rs/xid -# github.com/shopspring/decimal -# github.com/shurcooL/sanitized_anchor_name -# github.com/sirupsen/logrus -# github.com/slackhq/nebula -# github.com/smallstep/pkcs7 -# github.com/spf13/cast -# github.com/stoewer/go-strcase -# github.com/stretchr/testify -# github.com/urfave/cli -# github.com/x448/float16 -# github.com/yuin/goldmark -# github.com/yuin/goldmark-highlighting/v2 -# go.etcd.io/bbolt -# go.uber.org/automaxprocs -# go.uber.org/multierr -# go.uber.org/zap -# go.uber.org/zap/exp -# gopkg.in/natefinch/lumberjack.v2 -# MPL-2.0: -# github.com/go-sql-driver/mysql -# Apache-2.0 AND BSD-2-Clause: -# go.step.sm/cli-utils -# go.step.sm/crypto -# Apache-2.0 AND BSD-3-Clause: -# github.com/go-jose/go-jose/v3 -# github.com/mholt/acmez/v3 -# github.com/prometheus/common -# github.com/smallstep/certificates -# Apache-2.0 AND MIT: -# github.com/dgraph-io/ristretto -# github.com/prometheus/client_golang -# gopkg.in/yaml.v3 -# BSD-2-Clause-Views AND BSD-3-Clause: -# howett.net/plist -# BSD-3-Clause AND Apache-2.0 AND MIT: -# github.com/klauspost/compress -# BSD-3-Clause AND BSD-1-Clause: -# filippo.io/edwards25519 -# MIT AND BSD-3-Clause: -# github.com/jackc/pgx/v4 -# github.com/smallstep/scep -# MIT AND CC0-1.0: -# github.com/AndreasBriese/bbloom +# see comments above bundled provides for a breakdown of the rest License: Apache-2.0 AND BSD-1-Clause AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT AND MPL-2.0 Source0: https://%{goipath}/archive/v%{version}/caddy-%{version}.tar.gz @@ -203,158 +43,193 @@ BuildRequires: systemd-rpm-macros %{?systemd_requires} %{?sysusers_requires_compat} -# https://github.com/caddyserver/caddy/commit/172136a0a0f6aa47be4eab3727fa2482d7af6617 -BuildRequires: golang >= 1.24 Requires: system-logos-httpd Provides: webserver -Provides: bundled(golang(cel.dev/expr)) = 0.19.1 -Provides: bundled(golang(dario.cat/mergo)) = 1.0.1 -Provides: bundled(golang(filippo.io/edwards25519)) = 1.1.0 -Provides: bundled(golang(github.com/AndreasBriese/bbloom)) = 46b345b -Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.4.0 -Provides: bundled(golang(github.com/KimMachineGun/automemlimit)) = 0.7.1 +# https://github.com/caddyserver/caddy/commit/05acc5131ed5c80acbd28ed8d907b166cd15b72c +BuildRequires: golang >= 1.25 + +# Apache-2.0: +Provides: bundled(golang(cel.dev/expr)) = 0.24.0 +Provides: bundled(golang(cloud.google.com/go/auth)) = 0.16.2 +Provides: bundled(golang(cloud.google.com/go/auth/oauth2adapt)) = 0.2.8 +Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.7.0 Provides: bundled(golang(github.com/Masterminds/goutils)) = 1.1.1 +Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.24.0 +Provides: bundled(golang(github.com/coreos/go-oidc/v3)) = 3.14.1 +Provides: bundled(golang(github.com/dgraph-io/badger)) = 1.6.2 +Provides: bundled(golang(github.com/dgraph-io/badger/v2)) = 2.2007.4 +Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.3 +Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2 +Provides: bundled(golang(github.com/google/cel-go)) = 0.26.0 +Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 74a5dd3 +Provides: bundled(golang(github.com/google/go-tpm)) = 0.9.5 +Provides: bundled(golang(github.com/google/go-tspi)) = 0.3.0 +Provides: bundled(golang(github.com/google/s2a-go)) = 0.1.9 +Provides: bundled(golang(github.com/googleapis/enterprise-certificate-proxy)) = 0.3.6 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 +Provides: bundled(golang(github.com/kylelemons/godebug)) = 1.1.0 +Provides: bundled(golang(github.com/pires/go-proxyproto)) = 0.8.1 +Provides: bundled(golang(github.com/prometheus/client_model)) = 0.6.2 +Provides: bundled(golang(github.com/prometheus/common)) = 0.65.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.16.1 +Provides: bundled(golang(github.com/smallstep/go-attestation)) = 2306d5b +Provides: bundled(golang(github.com/smallstep/linkedca)) = 0.23.0 +Provides: bundled(golang(github.com/smallstep/nosql)) = 0.7.0 +Provides: bundled(golang(github.com/smallstep/truststore)) = 0.13.0 +Provides: bundled(golang(github.com/spf13/cobra)) = 1.9.1 +Provides: bundled(golang(go.opentelemetry.io/auto/sdk)) = 1.1.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.61.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/autoprop)) = 0.62.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/aws)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/b3)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/jaeger)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/ot)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.37.0 +Provides: bundled(golang(go.opentelemetry.io/proto/otlp)) = 1.7.0 +Provides: bundled(golang(go.uber.org/mock)) = 0.5.2 +Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 513f239 +Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 513f239 +Provides: bundled(golang(google.golang.org/grpc)) = 1.73.0 +Provides: bundled(golang(google.golang.org/grpc/cmd/protoc-gen-go-grpc)) = 1.5.1 + +# BSD-2-Clause: +Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 +Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 + +# BSD-3-Clause: +Provides: bundled(golang(dario.cat/mergo)) = 1.0.1 +Provides: bundled(golang(github.com/antlr4-go/antlr/v4)) = 4.13.0 +Provides: bundled(golang(github.com/cloudflare/circl)) = 1.6.1 +Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.4 +Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 +Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 +Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway/v2)) = 2.27.1 +Provides: bundled(golang(github.com/manifoldco/promptui)) = 0.9.0 +Provides: bundled(golang(github.com/miekg/dns)) = 1.1.63 +Provides: bundled(golang(github.com/munnerz/goautoneg)) = a7dc8b6 +Provides: bundled(golang(github.com/pbnjay/memory)) = 7b4eea6 +Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.7 +Provides: bundled(golang(github.com/tailscale/tscert)) = d3f8340 +Provides: bundled(golang(golang.org/x/crypto)) = 0.40.0 +Provides: bundled(golang(golang.org/x/crypto/x509roots/fallback)) = 49bf5b8 +Provides: bundled(golang(golang.org/x/exp)) = 7e4ce0a +Provides: bundled(golang(golang.org/x/mod)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net)) = 0.42.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.30.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.16.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.34.0 +Provides: bundled(golang(golang.org/x/term)) = 0.33.0 +Provides: bundled(golang(golang.org/x/text)) = 0.27.0 +Provides: bundled(golang(golang.org/x/time)) = 0.12.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.34.0 +Provides: bundled(golang(google.golang.org/api)) = 0.240.0 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.36.6 + +# CC0-1.0: +Provides: bundled(golang(github.com/zeebo/blake3)) = 0.2.4 + +# ISC: +Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 + +# MIT: +Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.5.0 +Provides: bundled(golang(github.com/KimMachineGun/automemlimit)) = 0.7.4 Provides: bundled(golang(github.com/Masterminds/semver/v3)) = 3.3.0 Provides: bundled(golang(github.com/Masterminds/sprig/v3)) = 3.3.0 Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.6.0 -Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.15.0 -Provides: bundled(golang(github.com/antlr4-go/antlr/v4)) = 4.13.0 +Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.20.0 Provides: bundled(golang(github.com/aryann/difflib)) = ff5ff6d Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 -Provides: bundled(golang(github.com/caddyserver/certmagic)) = 0.23.0 Provides: bundled(golang(github.com/caddyserver/zerossl)) = 0.1.3 -Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.3.0 +Provides: bundled(golang(github.com/ccoveille/go-safecast)) = 1.6.1 +Provides: bundled(golang(github.com/cenkalti/backoff/v5)) = 5.0.2 Provides: bundled(golang(github.com/cespare/xxhash)) = 1.1.0 Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.3.0 Provides: bundled(golang(github.com/chzyer/readline)) = 1.5.1 -Provides: bundled(golang(github.com/cloudflare/circl)) = 1.6.0 -Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.6 -Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 -Provides: bundled(golang(github.com/dgraph-io/badger)) = 1.6.2 -Provides: bundled(golang(github.com/dgraph-io/badger/v2)) = 2.2007.4 -Provides: bundled(golang(github.com/dgraph-io/ristretto)) = 0.2.0 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.7 Provides: bundled(golang(github.com/dgryski/go-farm)) = a6ae236 -Provides: bundled(golang(github.com/dlclark/regexp2)) = 1.11.4 +Provides: bundled(golang(github.com/dlclark/regexp2)) = 1.11.5 Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.1 Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4 Provides: bundled(golang(github.com/francoispqt/gojay)) = 1.2.13 -Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = 2.6.0 -Provides: bundled(golang(github.com/go-chi/chi/v5)) = 5.2.1 -Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.4 -Provides: bundled(golang(github.com/go-kit/kit)) = 0.13.0 -Provides: bundled(golang(github.com/go-kit/log)) = 0.2.1 -Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.6.0 -Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.2 -Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2 -Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.7.1 -Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 -Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.4 -Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 -Provides: bundled(golang(github.com/google/cel-go)) = 0.24.1 -Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 74a5dd3 -Provides: bundled(golang(github.com/google/go-tpm)) = 0.9.0 -Provides: bundled(golang(github.com/google/go-tspi)) = 0.3.0 -Provides: bundled(golang(github.com/google/pprof)) = ec68065 -Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 -Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway/v2)) = 2.22.0 +Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = 2.8.0 +Provides: bundled(golang(github.com/go-chi/chi/v5)) = 5.2.2 Provides: bundled(golang(github.com/huandu/xstrings)) = 1.5.0 -Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 -Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1 -Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.3 -Provides: bundled(golang(github.com/jackc/pgio)) = 1.0.0 Provides: bundled(golang(github.com/jackc/pgpassfile)) = 1.0.0 -Provides: bundled(golang(github.com/jackc/pgproto3/v2)) = 2.3.3 Provides: bundled(golang(github.com/jackc/pgservicefile)) = 091c0ba -Provides: bundled(golang(github.com/jackc/pgtype)) = 1.14.0 -Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.3 -Provides: bundled(golang(github.com/klauspost/compress)) = 1.18.0 -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.10 -Provides: bundled(golang(github.com/libdns/libdns)) = 1.0.0-beta.1 -Provides: bundled(golang(github.com/manifoldco/promptui)) = 0.9.0 +Provides: bundled(golang(github.com/jackc/pgx/v5)) = 5.6.0 +Provides: bundled(golang(github.com/jackc/puddle/v2)) = 2.2.1 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.3.0 +Provides: bundled(golang(github.com/libdns/libdns)) = 1.1.0 Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.13 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 Provides: bundled(golang(github.com/mgutz/ansi)) = d51e80e -Provides: bundled(golang(github.com/mholt/acmez/v3)) = 3.1.2 -Provides: bundled(golang(github.com/miekg/dns)) = 1.1.63 Provides: bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0 Provides: bundled(golang(github.com/mitchellh/go-ps)) = 1.0.0 Provides: bundled(golang(github.com/mitchellh/reflectwalk)) = 1.0.2 -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.2 -Provides: bundled(golang(github.com/pbnjay/memory)) = 7b4eea6 -Provides: bundled(golang(github.com/pires/go-proxyproto)) = b718e7c -Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 -Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.19.1 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.48.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 Provides: bundled(golang(github.com/quic-go/qpack)) = 0.5.1 -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.50.1 -Provides: bundled(golang(github.com/rs/xid)) = 1.5.0 -Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.54.0 +Provides: bundled(golang(github.com/rs/xid)) = 1.6.0 Provides: bundled(golang(github.com/shopspring/decimal)) = 1.4.0 Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0 Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3 -Provides: bundled(golang(github.com/slackhq/nebula)) = 1.6.1 -Provides: bundled(golang(github.com/smallstep/certificates)) = 0.26.1 -Provides: bundled(golang(github.com/smallstep/go-attestation)) = 413678f -Provides: bundled(golang(github.com/smallstep/nosql)) = 0.6.1 -Provides: bundled(golang(github.com/smallstep/pkcs7)) = 3b98ecc -Provides: bundled(golang(github.com/smallstep/scep)) = aee96d7 -Provides: bundled(golang(github.com/smallstep/truststore)) = 0.13.0 +Provides: bundled(golang(github.com/slackhq/nebula)) = 1.9.5 +Provides: bundled(golang(github.com/smallstep/pkcs7)) = 0.2.1 Provides: bundled(golang(github.com/spf13/cast)) = 1.7.0 -Provides: bundled(golang(github.com/spf13/cobra)) = 1.9.1 -Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6 Provides: bundled(golang(github.com/stoewer/go-strcase)) = 1.2.0 Provides: bundled(golang(github.com/stretchr/testify)) = 1.10.0 -Provides: bundled(golang(github.com/tailscale/tscert)) = d3f8340 -Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 +Provides: bundled(golang(github.com/urfave/cli)) = 1.22.17 Provides: bundled(golang(github.com/x448/float16)) = 0.8.4 -Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.8 +Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.13 Provides: bundled(golang(github.com/yuin/goldmark-highlighting/v2)) = 37449ab -Provides: bundled(golang(github.com/zeebo/blake3)) = 0.2.4 -Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.9 -Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.56.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/autoprop)) = 0.42.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/aws)) = 1.17.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/b3)) = 1.17.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/jaeger)) = 1.17.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/ot)) = 1.17.0 -Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.31.0 -Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.31.0 -Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.31.0 -Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.31.0 -Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.31.0 -Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.31.0 -Provides: bundled(golang(go.opentelemetry.io/proto/otlp)) = 1.3.1 -Provides: bundled(golang(go.step.sm/cli-utils)) = 0.9.0 -Provides: bundled(golang(go.step.sm/crypto)) = 0.45.0 -Provides: bundled(golang(go.step.sm/linkedca)) = 0.20.1 +Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.10 Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.6.0 -Provides: bundled(golang(go.uber.org/mock)) = 0.5.0 Provides: bundled(golang(go.uber.org/multierr)) = 1.11.0 Provides: bundled(golang(go.uber.org/zap)) = 1.27.0 Provides: bundled(golang(go.uber.org/zap/exp)) = 0.3.0 -Provides: bundled(golang(golang.org/x/crypto)) = 0.36.0 -Provides: bundled(golang(golang.org/x/crypto/x509roots/fallback)) = 49bf5b8 -Provides: bundled(golang(golang.org/x/exp)) = 9bf2ced -Provides: bundled(golang(golang.org/x/mod)) = 0.24.0 -Provides: bundled(golang(golang.org/x/net)) = 0.38.0 -Provides: bundled(golang(golang.org/x/sync)) = 0.12.0 -Provides: bundled(golang(golang.org/x/sys)) = 0.31.0 -Provides: bundled(golang(golang.org/x/term)) = 0.30.0 -Provides: bundled(golang(golang.org/x/text)) = 0.23.0 -Provides: bundled(golang(golang.org/x/time)) = 0.11.0 -Provides: bundled(golang(golang.org/x/tools)) = 0.31.0 -Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 5fefd90 -Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 5fefd90 -Provides: bundled(golang(google.golang.org/grpc)) = 1.67.1 -Provides: bundled(golang(google.golang.org/protobuf)) = 1.35.1 Provides: bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = 2.2.1 + +# MPL-2.0: +Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.8.1 + +# Apache-2.0 AND BSD-2-Clause: +Provides: bundled(golang(go.step.sm/crypto)) = 0.67.0 +Provides: bundled(golang(github.com/smallstep/cli-utils)) = 0.12.1 + +# Apache-2.0 AND BSD-3-Clause: +Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.4 +Provides: bundled(golang(github.com/go-jose/go-jose/v4)) = 4.0.5 +Provides: bundled(golang(github.com/googleapis/gax-go/v2)) = 2.14.2 +Provides: bundled(golang(github.com/mholt/acmez/v3)) = 3.1.2 +Provides: bundled(golang(github.com/smallstep/certificates)) = 0.28.4 + +# Apache-2.0 AND MIT: +Provides: bundled(golang(github.com/dgraph-io/ristretto)) = 0.2.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 + +# BSD-1-Clause AND BSD-3-Clause: +Provides: bundled(golang(filippo.io/edwards25519)) = 1.1.0 + +# BSD-2-Clause-Views AND BSD-3-Clause: Provides: bundled(golang(howett.net/plist)) = 1.0.0 +# BSD-3-Clause AND MIT: +Provides: bundled(golang(github.com/smallstep/scep)) = 8cf1ca4 + +# CC0-1.0 AND MIT: +Provides: bundled(golang(github.com/AndreasBriese/bbloom)) = 46b345b + +# Apache-2.0 AND BSD-3-Clause AND MIT: +Provides: bundled(golang(github.com/klauspost/compress)) = 1.18.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.23.0 + %description Caddy is an extensible server platform that uses TLS by default. diff --git a/sources b/sources index ebdbe02..83d8cbc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (caddy-2.10.0.tar.gz) = 9f0448b6108d088c5b9f59af8977df9adb73d62ebfc9fce038b07d927984873e39234d7d7dfd64c20e9527eccc400bd54930c5ffa21ec899a117e2c13b6ae229 -SHA512 (caddy-2.10.0-vendor.tar.gz) = 0dc3b2ebd96cd4ea937b7ffd34a8b33b5a3ffdff5fbf55357104019674319ebfcde0a1b3514897c62595409f7edc79a9da580fa3c7cc30c8913017a430f27c9a +SHA512 (caddy-2.10.2.tar.gz) = 986b11e26cdaa4fbe554cf7b6bb333404fc33190945ef995122518a3fe2fe582a4cf4d2a8ab463e045857650e9deb88123f8d86a93dbdc465635755b00356205 +SHA512 (caddy-2.10.2-vendor.tar.gz) = 8b4b63f5b8ba4b29ec01da55820214f4c63a1c545756815e26d73bdcc3b3ac5aada863ef32ab6db898b90a9501c0ed6e03ed44e53612cdb8d872ab89480d466d From c364159f1a43395b33df06fb17aad705d0de76f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 13:09:49 +0200 Subject: [PATCH 18/18] rebuild