Modify invalid option for the varnished command

This commit is contained in:
caodongxia 2022-11-25 19:39:17 +08:00
parent 45232a4450
commit e256937d82
2 changed files with 30 additions and 1 deletions

View File

@ -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

View File

@ -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 <caodongxia@h-partners.com> - 6.6.2-2
- Modify invalid option for the varnished command
* Tue Apr 26 2022 yaoxin <yaoxin30@h-partners.com> - 6.6.2-1
- Upgrade varnish to 6.6.2 for fix CVE-2022-23959