Accepting request 1083782 from home:jfkw:branches:server:http

- Update to version 2.6.4:
  * go.mod: Upgrade acmez and x/net
  * reverseproxy: Don't buffer chunked requests (fix #5366) (#5367)
- Fix failing build on SLE-12 by defining _sharedstatedir /var/lib
  on SLE-12 consistent with SLE-15, openSUSE and upstream RPM docs.

OBS-URL: https://build.opensuse.org/request/show/1083782
OBS-URL: https://build.opensuse.org/package/show/server:http/caddy?expand=0&rev=26

_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.6.3</param>
+    <param name="revision">v2.6.4</param>
     <param name="changesgenerate">enable</param>
 </service>
   <service mode="disabled" name="set_version">

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/caddyserver/caddy.git</param>
-              <param name="changesrevision">90798f3eea6b7a219a9bb55f680919c0504263e3</param></service></servicedata>
+              <param name="changesrevision">0db29e2ce9799f652f3d16fd5aed6e426d23bd0a</param></service></servicedata>

caddy-2.6.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88c1e684df4de353256e311547db40e611aabff35212d532953a9445e9cd6721
-size 582027

caddy-2.6.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2793562529c167c2047b6909eca6c19ed7a111361657ee60f61ad8b297384368
+size 582991

caddy.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sun Apr 30 18:17:39 UTC 2023 - Jeff Kowalczyk <jkowalczyk@suse.com>
+
+- Fix failing build on SLE-12 by defining _sharedstatedir /var/lib
+  on SLE-12 consistent with SLE-15, openSUSE and upstream RPM docs.
+  * SLE-12 _sharedstatedir was /usr/com, _localstatedir is /var as expected
+  * SLE-15+ _sharedstatedir is /var/lib, _localstatedir is /var
+  * _sharedstatedir used here as home directory for newly created user caddy
+  * If not redefined build fails with empty /usr/com not owned by any package
+  * Switch to useradd -d %{_sharedstatedir} from %{_localstatedir}/lib
+    The latter is common in Factory packages possibly for historical reasons,
+    opt for the less common option here for equivalence and clarity.
+
+-------------------------------------------------------------------
+Sat Apr 29 22:23:15 UTC 2023 - jkowalczyk@suse.com
+
+- Update to version 2.6.4:
+  * go.mod: Upgrade acmez and x/net
+  * reverseproxy: Don't buffer chunked requests (fix #5366) (#5367)
+
 -------------------------------------------------------------------
 Thu Feb 09 10:19:47 UTC 2023 - alexandre.vicenzi@suse.com
 

caddy.spec

@@ -18,8 +18,16 @@
 
 %define project github.com/caddyserver/caddy
 
+# SLE-12 _sharedstatedir was /usr/com, _localstatedir is /var as expected
+# SLE-15+ _sharedstatedir is /var/lib, _localstatedir is /var
+# _sharedstatedir used here as home directory for newly created user caddy
+# If not redefined build fails with empty /usr/com not owned by any package
+%if 0%{?suse_version} < 1500
+%define _sharedstatedir /var/lib
+%endif
+
 Name:           caddy
-Version:        2.6.3
+Version:        2.6.4
 Release:        0
 Summary:        Fast, multi-platform web server with automatic HTTPS
 License:        Apache-2.0
@@ -83,7 +91,7 @@ install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/zsh/site-functions/_%{n
 
 %pre
 getent group %{name} >/dev/null || %{_sbindir}/groupadd -r %{name}
-getent passwd %{name} >/dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /bin/false -c "Caddy web server" %{name}
+getent passwd %{name} >/dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /bin/false -c "Caddy web server" %{name}
 %service_add_pre %{name}.service
 
 %post

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2ba887f0a05f5fdb56d8545b050640b87f28b2c4bde739a74a894a8c78f5ea8
+oid sha256:03c11cc9794aad856a53b5a79830ea84f7f983d54dedcda8ce923fdb5874f3f2
-size 8559715
+size 8472123