From 7ffff6907317ac41d4012ec594fd2005ede85f26 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 3 Oct 2022 09:29:02 -0400
Subject: [PATCH] caddy: update to 2.6.1.

---
 srcpkgs/caddy/patches/fix_version_command.patch | 17 -----------------
 srcpkgs/caddy/template                          |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/caddy/patches/fix_version_command.patch

diff --git a/srcpkgs/caddy/patches/fix_version_command.patch b/srcpkgs/caddy/patches/fix_version_command.patch
deleted file mode 100644
index 4726054f48d7..000000000000
--- a/srcpkgs/caddy/patches/fix_version_command.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/caddy.go
-+++ b/caddy.go
-@@ -712,14 +711,0 @@ func goModule(mod *debug.Module) *debug.Module {
--	bi, ok := debug.ReadBuildInfo()
--	if ok {
--		mod.Path = bi.Main.Path
--		// The recommended way to build Caddy involves
--		// creating a separate main module, which
--		// TODO: track related Go issue: https://github.com/golang/go/issues/29228
--		// once that issue is fixed, we should just be able to use bi.Main... hopefully.
--		for _, dep := range bi.Deps {
--			if dep.Path == ImportPath {
--				return dep
--			}
--		}
--		return &bi.Main
--	}
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 834375277504..394cd81bafcb 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,6 +1,6 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.5.2
+version=2.6.1
 revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=6a3e03774658af8009c0ece287301d73c1ea961d01e6ef7c6f44962e4349f5e5
+checksum=ae698b4618dc6ffe7370b0607d59ee78833cb4986ca5663c50a9ae0b90072ac1
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"