From 240c8da693290f6b349c51575194683f0ef3f898ff1bdda8d8f7d7e8f5fadcd2 Mon Sep 17 00:00:00 2001
From: Alexandre Vicenzi <alexandre.vicenzi@suse.com>
Date: Mon, 23 May 2022 08:58:48 +0000
Subject: [PATCH] Accepting request 978655 from
 home:avicenzi:branches:server:http

Update to 2.5.1

OBS-URL: https://build.opensuse.org/request/show/978655
OBS-URL: https://build.opensuse.org/package/show/server:http/caddy?expand=0&rev=10
---
 _service                 |  2 +-
 _servicedata             |  2 +-
 caddy-2.4.6.tar.gz       |  3 ---
 caddy-2.5.1.tar.gz       |  3 +++
 caddy.changes            | 19 +++++++++++++++++++
 caddy.service            |  2 +-
 caddy.spec               |  6 +++---
 vendor.tar.gz            |  4 ++--
 _caddy => zsh-completion |  1 -
 9 files changed, 30 insertions(+), 12 deletions(-)
 delete mode 100644 caddy-2.4.6.tar.gz
 create mode 100644 caddy-2.5.1.tar.gz
 rename _caddy => zsh-completion (99%)

diff --git a/_service b/_service
index 0080392..e3d41f5 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.6</param>
+    <param name="revision">v2.5.1</param>
     <param name="changesgenerate">enable</param>
 </service>
   <service mode="disabled" name="set_version">
diff --git a/_servicedata b/_servicedata
index 9cf2b6f..8855e83 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">e7457b43e4703080ae8713ada798ce3e20b83690</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">f7be0ee10131f25620a2f64af7e3ded43eae2049</param></service></servicedata>
\ No newline at end of file
diff --git a/caddy-2.4.6.tar.gz b/caddy-2.4.6.tar.gz
deleted file mode 100644
index d266858..0000000
--- a/caddy-2.4.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f5ec899e98e854879f10cadcabe85bf02963c6811c3b937e0f3cca452646560
-size 482438
diff --git a/caddy-2.5.1.tar.gz b/caddy-2.5.1.tar.gz
new file mode 100644
index 0000000..76e13e2
--- /dev/null
+++ b/caddy-2.5.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36d808c302a8795e8cc7ea13ae0a4863d200cfb54df78c89bb6baa09d076d00e
+size 537206
diff --git a/caddy.changes b/caddy.changes
index 2555295..d41345d 100644
--- a/caddy.changes
+++ b/caddy.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon May 23 07:48:15 UTC 2022 - alexandre.vicenzi@suse.com
+
+- Update to version 2.5.1:
+  * Fixed regression in Unix socket admin endpoints.
+  * Fixed regression in caddy trust commands.
+  * Hash-based load balancing policies (ip_hash, uri_hash, header, and cookie)
+    use an improved highest-random-weight (HRW) algorithm for increased
+    consistency.
+  * Dynamic upstreams, which is the ability to get the list of upstreams at
+    every request (more specifically, every iteration in the proxy loop of
+    every request) rather than just once at config-load time.
+  * Caddy will automatically try to get relevant certificates from the local
+    Tailscale instance.
+  * New OpenTelemetry integration.
+  * Added new endpoints /pki/ca/<id> and /pki/ca/<id>/certificates for
+    getting information about Caddy's managed CAs.
+  * Rename _caddy to zsh-completion
+
 -------------------------------------------------------------------
 Fri Mar 25 17:23:27 UTC 2022 - alexandre.vicenzi@suse.com
 
diff --git a/caddy.service b/caddy.service
index c0dd98a..85eec11 100644
--- a/caddy.service
+++ b/caddy.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Caddy
+Description=Caddy web server
 Documentation=https://caddyserver.com/docs/
 After=network.target network-online.target
 Requires=network-online.target
diff --git a/caddy.spec b/caddy.spec
index c7829d1..e06cef1 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -19,7 +19,7 @@
 %define project github.com/caddyserver/caddy
 
 Name:           caddy
-Version:        2.4.6
+Version:        2.5.1
 Release:        0
 Summary:        Fast, multi-platform web server with automatic HTTPS
 License:        Apache-2.0
@@ -31,10 +31,10 @@ Source2:        Caddyfile
 Source3:        caddy.service
 Source4:        index.html
 Source5:        bash-completion
-Source6:        _caddy
+Source6:        zsh-completion
 BuildRequires:  golang-packaging
 BuildRequires:  systemd-rpm-macros
-BuildRequires:  golang(API) >= 1.16
+BuildRequires:  golang(API) >= 1.17
 %{?systemd_requires}
 %{go_provides}
 # Make sure that the binary is not getting stripped.
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 9999cf6..1e9a107 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67f33953e820a0cdf2e9578f273c8bdfa2528452388af162f209d54ac3cc6d76
-size 6678757
+oid sha256:7ec3bb4f8c29d7b471659fd61dbefe50fc045c0853bb8ec68bb5d82ec066514b
+size 8118918
diff --git a/_caddy b/zsh-completion
similarity index 99%
rename from _caddy
rename to zsh-completion
index 2cd815d..77984f9 100644
--- a/_caddy
+++ b/zsh-completion
@@ -163,4 +163,3 @@ function __caddy_version {
 }
 
 _caddy
-