From d35f043647db1ad2bed94a52fdb7fd4c8929dcbde5d28baa430e4a0beeee135c Mon Sep 17 00:00:00 2001
From: Alexandre Vicenzi <alexandre.vicenzi@suse.com>
Date: Tue, 29 Mar 2022 13:17:45 +0000
Subject: [PATCH] Accepting request 964918 from
 home:avicenzi:branches:server:http

Update to version 2.4.6

OBS-URL: https://build.opensuse.org/request/show/964918
OBS-URL: https://build.opensuse.org/package/show/server:http/caddy?expand=0&rev=8
---
 _service           |  2 +-
 _servicedata       |  2 +-
 caddy-2.4.5.tar.gz |  3 ---
 caddy-2.4.6.tar.gz |  3 +++
 caddy.changes      | 32 ++++++++++++++++++++++++++++++++
 caddy.spec         |  4 ++--
 vendor.tar.gz      |  4 ++--
 7 files changed, 41 insertions(+), 9 deletions(-)
 delete mode 100644 caddy-2.4.5.tar.gz
 create mode 100644 caddy-2.4.6.tar.gz

diff --git a/_service b/_service
index a817cc6..0080392 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,7 @@
     <param name="filename">caddy</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v2.4.5</param>
+    <param name="revision">v2.4.6</param>
     <param name="changesgenerate">enable</param>
 </service>
   <service mode="disabled" name="set_version">
diff --git a/_servicedata b/_servicedata
index b49594b..9cf2b6f 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/caddyserver/caddy.git</param>
-              <param name="changesrevision">46ab93be51754ac16bd7c59443e90481acf83022</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">e7457b43e4703080ae8713ada798ce3e20b83690</param></service></servicedata>
\ No newline at end of file
diff --git a/caddy-2.4.5.tar.gz b/caddy-2.4.5.tar.gz
deleted file mode 100644
index 595f349..0000000
--- a/caddy-2.4.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d2129b4d7e4b7a918ce11b987e3e27296c2fe3214de3c9fed3787401271a9c7d
-size 475684
diff --git a/caddy-2.4.6.tar.gz b/caddy-2.4.6.tar.gz
new file mode 100644
index 0000000..d266858
--- /dev/null
+++ b/caddy-2.4.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f5ec899e98e854879f10cadcabe85bf02963c6811c3b937e0f3cca452646560
+size 482438
diff --git a/caddy.changes b/caddy.changes
index 53dc87c..2555295 100644
--- a/caddy.changes
+++ b/caddy.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Fri Mar 25 17:23:27 UTC 2022 - alexandre.vicenzi@suse.com
+
+- Update to version 2.4.6:
+  * caddycmd: Add `--keep-backup` to upgrade commands (#4387)
+  * caddycmd: Add `--skip-standard` to `list-modules` command, quieter output (#4386)
+  * caddycmd: fix caddy validate/fmt help message (#4377)
+  * caddyhttp: Add support for triggering errors from `try_files` (#4346)
+  * caddyhttp: Placeholder for client cert in DER + base64 format (#4241)
+  * caddyhttp: reverseproxy: clarify warning for -insecure (#4379)
+  * caddyhttp: Sanitize the path before evaluating path matchers (#4407)
+  * caddytls: Mark storage clean timestamp at end of routine (#4401)
+  * docs: General minor improvements
+  * fastcgi: Fix Caddyfile parsing when `handle_response` is used (#4342)
+  * fastcgi: Implement `try_files` override in Caddyfile directive (#4347)
+  * fileserver: Fix compression breaks using httpInclude (#4352) (#4358)
+  * fileserver: Fix displayed file size if it is symlink (#4354)
+  * fileserver: Make file listing links purple once visited (#4356)
+  * fileserver: Prevent focusing filter from scrolling on page load (#4393)
+  * fileserver: properly handle escaped/non-ascii paths (#4332)
+  * headers: Canonicalize case in replace (fix #4330)
+  * httpcaddyfile: Empty tls policy for internal http localhost (#4398)
+  * httpcaddyfile: Preserve IPv6 addresses through normalization (fix #4381)
+  * map: Fix 95c03506 (avoid repeated expansions)
+  * map: Fix regex mappings
+  * reverseproxy: Log error at error level (fix #4360)
+  * reverseproxy: Prevent copying the response if a response handler ran (#4388)
+  * reverseproxy: Sanitize scheme and host on incoming requests (#4237)
+  * templates: Add 'import' action (#4321)
+  * templates: Add tests for funcInclude and funcImport (#4357)
+  * templates: Propagate httpError to HTTP response
+
 -------------------------------------------------------------------
 Fri Oct 22 11:02:07 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/caddy.spec b/caddy.spec
index 0eb0176..c7829d1 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package caddy
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define project github.com/caddyserver/caddy
 
 Name:           caddy
-Version:        2.4.5
+Version:        2.4.6
 Release:        0
 Summary:        Fast, multi-platform web server with automatic HTTPS
 License:        Apache-2.0
diff --git a/vendor.tar.gz b/vendor.tar.gz
index d4dd34e..9999cf6 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3f436423c56a6e12a58289ef0e54298174c44c677f627ea4cb1a06b8e05688e
-size 6745092
+oid sha256:67f33953e820a0cdf2e9578f273c8bdfa2528452388af162f209d54ac3cc6d76
+size 6678757