diff --git a/modify-invalid-option-for-varnished-command.patch b/modify-invalid-option-for-varnished-command.patch new file mode 100644 index 0000000000000000000000000000000000000000..4ed7f1abc9b3988c3e03321df36e622034ea75cc --- /dev/null +++ b/modify-invalid-option-for-varnished-command.patch @@ -0,0 +1,25 @@ +From 727e97677a45ab13d0adf43ba627f6b972e02a9e Mon Sep 17 00:00:00 2001 +From: caodongxia <315816521@qq.com> +Date: Fri, 25 Nov 2022 19:16:48 +0800 +Subject: [PATCH] modify invalid option ? for the varnished command + +--- + bin/varnishd/mgt/mgt_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c +index 9f4c236..9ad6d8a 100644 +--- a/bin/varnishd/mgt/mgt_main.c ++++ b/bin/varnishd/mgt/mgt_main.c +@@ -79,7 +79,7 @@ static struct vpf_fh *pfh2 = NULL; + static struct vfil_path *vcl_path = NULL; + static VTAILQ_HEAD(,f_arg) f_args = VTAILQ_HEAD_INITIALIZER(f_args); + +-static const char opt_spec[] = "a:b:Cdf:Fh:i:I:j:l:M:n:P:p:r:S:s:T:t:VW:x:"; ++static const char opt_spec[] = "?a:b:Cdf:Fh:i:I:j:l:M:n:P:p:r:S:s:T:t:VW:x:"; + + int optreset; // Some has it, some doesn't. Cheaper than auto* + +-- +2.23.0 + diff --git a/varnish.spec b/varnish.spec index 1cd3eecf3c11e7d279daf5a0a3715a0a397c2091..09bf22b11ab12a989ca19f2138867c7264f0de65 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,13 +1,14 @@ Name: varnish Summary: A web application accelerator Version: 6.6.2 -Release: 1 +Release: 2 License: BSD URL: https://www.varnish-cache.org/ Source0: http://varnish-cache.org/_downloads/varnish-%{version}.tgz # https://github.com/varnishcache/pkg-varnish-cache Source1: https://github.com/varnishcache/pkg-varnish-cache/archive/ec7ad9e6c6dd7c9b4f4ba60c5b223376908c3ca6/pkg-varnish-cache-ec7ad9e.tar.gz +Patch0000: modify-invalid-option-for-varnished-command.patch BuildRequires: python3-sphinx python3-docutils pkgconfig make graphviz nghttp2 systemd-units BuildRequires: ncurses-devel pcre-devel libedit-devel python3 @@ -155,6 +156,9 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc %{_mandir}/man7/*.7* %changelog +* Fri Nov 25 2022 caodongxia - 6.6.2-2 +- Modify invalid option for the varnished command + * Tue Apr 26 2022 yaoxin - 6.6.2-1 - Upgrade varnish to 6.6.2 for fix CVE-2022-23959