From 3275c17661dbdddfcea93c2cd9c371a99c5db416 Mon Sep 17 00:00:00 2001 From: caodongxia <315816521@qq.com> Date: Tue, 29 Nov 2022 20:36:24 +0800 Subject: [PATCH] Fix varnish.service reload failed due to miss conf --- fix-varnish.service-reload-failed.patch | 25 +++++++++++++++++++++++++ varnish.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 fix-varnish.service-reload-failed.patch diff --git a/fix-varnish.service-reload-failed.patch b/fix-varnish.service-reload-failed.patch new file mode 100644 index 0000000..fb6e696 --- /dev/null +++ b/fix-varnish.service-reload-failed.patch @@ -0,0 +1,25 @@ +From eac670ac734d814b466cbbf5e9b68625735438e5 Mon Sep 17 00:00:00 2001 +From: caodongxia <315816521@qq.com> +Date: Fri, 18 Feb 2022 16:21:18 +0800 +Subject: [PATCH] fix varnish.service reload failed + +--- + .../systemd/varnish.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkg-varnish-cache-0ad2f22629c4a368959c423a19e352c9c6c79682/systemd/varnish.service b/pkg-varnish-cache-0ad2f22629c4a368959c423a19e352c9c6c79682/systemd/varnish.service +index c06c36b..6c65124 100644 +--- a/pkg-varnish-cache-0ad2f22629c4a368959c423a19e352c9c6c79682/systemd/varnish.service ++++ b/pkg-varnish-cache-0ad2f22629c4a368959c423a19e352c9c6c79682/systemd/varnish.service +@@ -22,7 +22,7 @@ TasksMax=infinity + LimitCORE=infinity + + ExecStart=/usr/sbin/varnishd -a :6081 -f /etc/varnish/default.vcl -s malloc,256m +-ExecReload=/usr/sbin/varnishreload ++ExecReload=/usr/sbin/varnishreload /etc/varnish/default.vcl + + [Install] + WantedBy=multi-user.target +-- +2.27.0 + diff --git a/varnish.spec b/varnish.spec index 6a9aa09..b73c66f 100644 --- a/varnish.spec +++ b/varnish.spec @@ -4,7 +4,7 @@ Name: varnish Summary: A web application accelerator Version: 7.0.1 -Release: 6 +Release: 7 License: BSD URL: https://www.varnish-cache.org/ Source0: http://varnish-cache.org/_downloads/varnish-%{version}.tgz @@ -16,6 +16,7 @@ Patch0001: fix-varnish-devel-installation-failure.patch Patch0002: CVE-2022-23959.patch Patch0003: CVE-2022-38150.patch Patch0004: CVE-2022-45060.patch +Patch0005: fix-varnish.service-reload-failed.patch BuildRequires: python3-sphinx python3-docutils pkgconfig make graphviz nghttp2 systemd-units BuildRequires: ncurses-devel pcre2-devel libedit-devel gcc @@ -163,6 +164,9 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc %{_mandir}/man7/*.7* %changelog +* Tue Nov 29 2022 caodongxia - 7.0.1-7 +- Fix varnish.service reload failed due to miss conf + * Tue Nov 22 2022 jiangpeng - 7.0.1-6 - Fix CVE-2022-45060 -- Gitee