From e72a770b1169d35ead1550284609b8307b19c1fd490aabf3b1a2be2fc9ba3037 Mon Sep 17 00:00:00 2001
From: Jeff Kowalczyk <jkowalczyk@suse.com>
Date: Thu, 17 Aug 2023 23:03:49 +0000
Subject: [PATCH] Accepting request 1104490 from home:jfkw:branches:server:http

- Update to version 2.7.4:
  * go.mod: Upgrade CertMagic and quic-go
  * reverseproxy: Always return new upstreams (fix #5736) (#5752)
  * ci: use gci linter (#5708)
  * fileserver: Slightly more fitting icons
  * cmd: Require config for caddy validate (fix #5612) (#5614)
  * Fix tests
  * caddytls: Update docs for on-demand config
  * fileserver: Don't repeat error for invalid method inside error context (#5705)
  * ci: Update to Go 1.21 (#5719)
  * ci: Add riscv64 (64-bit RISC-V) to goreleaser (#5720)
  * go.mod: Upgrade golang.org/x/net to 0.14.0 (#5718)
  * ci: Use gofumpt to format code (#5707)
  * templates: Fix httpInclude (fix #5698)

- Use _service mode manual as better alias name than disabled
  * osc reports service mode disabled as obsolete

OBS-URL: https://build.opensuse.org/request/show/1104490
OBS-URL: https://build.opensuse.org/package/show/server:http/caddy?expand=0&rev=32
---
 _service           | 10 +++++-----
 _servicedata       |  2 +-
 caddy-2.7.3.tar.gz |  3 ---
 caddy-2.7.4.tar.gz |  3 +++
 caddy.changes      | 24 ++++++++++++++++++++++++
 caddy.spec         |  2 +-
 vendor.tar.gz      |  4 ++--
 7 files changed, 36 insertions(+), 12 deletions(-)
 delete mode 100644 caddy-2.7.3.tar.gz
 create mode 100644 caddy-2.7.4.tar.gz

diff --git a/_service b/_service
index 05675d1..e5e309f 100644
--- a/_service
+++ b/_service
@@ -1,20 +1,20 @@
 <services>
-<service name="tar_scm" mode="disabled">
+<service name="tar_scm" mode="manual">
     <param name="url">https://github.com/caddyserver/caddy.git</param>
     <param name="scm">git</param>
     <param name="filename">caddy</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v2.7.3</param>
+    <param name="revision">v2.7.4</param>
     <param name="changesgenerate">enable</param>
 </service>
-  <service mode="disabled" name="set_version">
+  <service mode="manual" name="set_version">
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="recompress" mode="manual">
     <param name="file">*.tar</param>
     <param name="compression">gz</param>
   </service>
-  <service name="go_modules" mode="disabled">
+  <service name="go_modules" mode="manual">
   </service>
 </services>
 
diff --git a/_servicedata b/_servicedata
index 5db3298..8002dd2 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">a8cc5d1a7d9d80e12ab895beaf4eaed34cc6bded</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">f11c3c9f5a1be082450d64369853e1dacda22dde</param></service></servicedata>
\ No newline at end of file
diff --git a/caddy-2.7.3.tar.gz b/caddy-2.7.3.tar.gz
deleted file mode 100644
index 4dcba2d..0000000
--- a/caddy-2.7.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3be6840ae00e32f340c730d134405aa2b6df58205f276342d127dfa38c3fe065
-size 641173
diff --git a/caddy-2.7.4.tar.gz b/caddy-2.7.4.tar.gz
new file mode 100644
index 0000000..fab39ff
--- /dev/null
+++ b/caddy-2.7.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:edc2bf86307174ba980ff761dd7423744180f8838c3a772d816f88171fcd0edb
+size 642268
diff --git a/caddy.changes b/caddy.changes
index c37f8ab..1a39c0a 100644
--- a/caddy.changes
+++ b/caddy.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Aug 17 22:55:36 UTC 2023 - jkowalczyk@suse.com
+
+- Update to version 2.7.4:
+  * go.mod: Upgrade CertMagic and quic-go
+  * reverseproxy: Always return new upstreams (fix #5736) (#5752)
+  * ci: use gci linter (#5708)
+  * fileserver: Slightly more fitting icons
+  * cmd: Require config for caddy validate (fix #5612) (#5614)
+  * Fix tests
+  * caddytls: Update docs for on-demand config
+  * fileserver: Don't repeat error for invalid method inside error context (#5705)
+  * ci: Update to Go 1.21 (#5719)
+  * ci: Add riscv64 (64-bit RISC-V) to goreleaser (#5720)
+  * go.mod: Upgrade golang.org/x/net to 0.14.0 (#5718)
+  * ci: Use gofumpt to format code (#5707)
+  * templates: Fix httpInclude (fix #5698)
+
+-------------------------------------------------------------------
+Thu Aug 17 22:54:37 UTC 2023 - Jeff Kowalczyk <jkowalczyk@suse.com>
+
+- Use _service mode manual as better alias name than disabled
+  * osc reports service mode disabled as obsolete
+
 -------------------------------------------------------------------
 Sun Aug 06 01:06:42 UTC 2023 - jkowalczyk@suse.com
 
diff --git a/caddy.spec b/caddy.spec
index 9d0e4c3..063ada3 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -27,7 +27,7 @@
 %endif
 
 Name:           caddy
-Version:        2.7.3
+Version:        2.7.4
 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 b32391d..34df575 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3734bfed33bf2e7c10818a4c4500b1fd8ef8625d193b672897794f2e702718cf
-size 13590494
+oid sha256:77830677fe38c1648863bb7d5087355859a55ea42a3cc177bd7283d647ae3a72
+size 13594200