New upstream release

.gitignore

@@ -58,3 +58,5 @@ varnish-2.1.3.tar.gz
 /varnish-7.2.1.tgz
 /pkg-varnish-cache-7126673.tar.gz
 /varnish-7.3.0.tgz
+/pkg-varnish-cache-cfa8cb3.tar.gz
+/varnish-7.4.0.tgz

sources

@@ -1,2 +1,2 @@
-SHA512 (pkg-varnish-cache-7126673.tar.gz) = 168867cabc05f187315e2505f90234509cf79e740ad06164c44c86c07502a5463b2d1ca0a102f64bc3ff601fcae499b534f13f28e99a82307911eabfe999bf30
-SHA512 (varnish-7.3.0.tgz) = 2693ed52dccc889e0bb1035ef1e3e5e12b8060ff3be6e6b78593b83f60408035649185dc29dd92265e18d362c3bff2f82cd74b7ae0aa68b94b40013824f3c165
+SHA512 (pkg-varnish-cache-cfa8cb3.tar.gz) = 058e689186d1b01bb4a256ff3a5a373337e380a0a87128d4b2adbcff41210189e7f4b3d56e8451f06120449c04aaa4ddc61f934a1fda9c5336dfe2020c66a569
+SHA512 (varnish-7.4.0.tgz) = b707348e9e6b7b9a89159a5aaeffaca8a1783623b64c4cc3e719fbb40af8f962610eeb280a5a062af244e231c6e83d290d95e737f56927ffcc5dd0ee1dea5f92

varnish.spec

@@ -12,12 +12,12 @@
 
 %global __provides_exclude_from ^%{_libdir}/varnish/vmods
 
-%global abi 84d79120b6d17b11819a663a93160743f293e63f
-%global vrt 17.0
+%global abi f07a6d615c054cf73c9250f3f09d063ac344dff2
+%global vrt 18.0
 
 # Package scripts are now external
 # https://github.com/varnishcache/pkg-varnish-cache
-%global commit1 712667312304cbb1798f131caa0a98b7697a2cd9
+%global commit1 cfa8cb3724e4ca6398f60b09157715bcb99d189d
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
 # Default: Use jemalloc, as adviced by upstream project
@@ -36,8 +36,8 @@
 
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 7.3.0
-Release: 5%{?dist}
+Version: 7.4.0
+Release: 0%{?dist}
 License: BSD-2-Clause AND (BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain AND Zlib)
 URL: https://www.varnish-cache.org/
 Source0: http://varnish-cache.org/_downloads/%{name}-%{version}.tgz
@@ -235,7 +235,7 @@ install -D -m 0644 redhat/varnish.service %{buildroot}%{_unitdir}/varnish.servic
 install -D -m 0644 redhat/varnishncsa.service %{buildroot}%{_unitdir}/varnishncsa.service
 install -D -m 0755 redhat/varnishreload %{buildroot}%{_sbindir}/varnishreload
 
-echo %{_libdir}/varnish > %{buildroot}%{_sysconfdir}/ld.so.conf.d/varnish-%{_arch}.conf
+echo %{_libdir}/varnish > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 # No idea why these ends up with mode 600 in the debug package
 %if 0%{debug_package}
@@ -259,7 +259,7 @@ chmod 644 lib/libvmod_*/*.h
 %dir %{_sysconfdir}/varnish/
 %config(noreplace) %{_sysconfdir}/varnish/default.vcl
 %config(noreplace) %{_sysconfdir}/logrotate.d/varnish
-%config %{_sysconfdir}/ld.so.conf.d/varnish-%{_arch}.conf
+%config %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 
 %{_unitdir}/varnish.service
@@ -303,6 +303,9 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc
 
 
 %changelog
+* Wed Oct 11 2023 Ingvar Hagelund <ingvar@redpill-linpro.com> - 7.4.0
+- New upstream release
+
 * Thu Sep 14 2023 Luboš Uhliarik <luhliari@redhat.com> - 7.3.0-5
 - SPDX migration