From edb33473383f8a77b406be9052a13031787f4f9a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 13 Oct 2022 23:10:27 +0200
Subject: [PATCH] caddy: update to 2.6.2.

---
 .../caddy/patches/fix_https_upstreams.patch   | 29 -------------------
 srcpkgs/caddy/template                        |  6 ++--
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/caddy/patches/fix_https_upstreams.patch

diff --git a/srcpkgs/caddy/patches/fix_https_upstreams.patch b/srcpkgs/caddy/patches/fix_https_upstreams.patch
deleted file mode 100644
index ccdb599ae356..000000000000
--- a/srcpkgs/caddy/patches/fix_https_upstreams.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d0556929a4a574ea67be4c1ca2a2741b0f7a52c2 Mon Sep 17 00:00:00 2001
-From: lemmi <lemmi@nerd2nerd.org>
-Date: Tue, 27 Sep 2022 21:03:30 +0200
-Subject: [PATCH] reverseproxy: fix upstream scheme handling in command (#5088)
-
-e338648fed3263200dfd6abc9f8100c6f1c0eb67 introduced multiple upstream
-addresses. A comment notes that mixing schemes isn't supported and
-therefore the first valid scheme is supposed to be used.
-
-Fixes setting the first scheme.
-
-fixes #5087
----
- modules/caddyhttp/reverseproxy/command.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/caddyhttp/reverseproxy/command.go b/modules/caddyhttp/reverseproxy/command.go
-index 481f6e00d4..1b63086159 100644
---- a/modules/caddyhttp/reverseproxy/command.go
-+++ b/modules/caddyhttp/reverseproxy/command.go
-@@ -117,7 +117,7 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) {
- 		if err != nil {
- 			return caddy.ExitCodeFailedStartup, fmt.Errorf("invalid upstream address %s: %v", toLoc, err)
- 		}
--		if scheme != "" && toScheme != "" {
-+		if scheme != "" && toScheme == "" {
- 			toScheme = scheme
- 		}
- 		toAddresses[i] = addr
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 7d14b50b7344..cfed00140942 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.6.1
-revision=3
+version=2.6.2
+revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -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=ae698b4618dc6ffe7370b0607d59ee78833cb4986ca5663c50a9ae0b90072ac1
+checksum=563d027a78919f859188fb894ae5f3669508a3430db347aa726cd73c19fb7038
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"