Update to 6.0.13
This commit is contained in:
parent
64f73c9f57
commit
2c0f90416e
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/pkg-varnish-cache-0ad2f22.tar.gz
|
||||
SOURCES/varnish-6.0.8.tgz
|
||||
SOURCES/varnish-6.0.13.tgz
|
||||
|
@ -1,2 +1,2 @@
|
||||
db2cd6c296e7f19d65c09e642b7011338d9d0e04 SOURCES/pkg-varnish-cache-0ad2f22.tar.gz
|
||||
7c5e50eabcd3c0ddb6c463ba4645678a2f71233a SOURCES/varnish-6.0.8.tgz
|
||||
614d305e69b01255347f33000f76ed6a4fa3c3f7 SOURCES/varnish-6.0.13.tgz
|
||||
|
@ -18,8 +18,8 @@
|
||||
|
||||
Summary: High-performance HTTP accelerator
|
||||
Name: varnish
|
||||
Version: 6.0.8
|
||||
Release: 3%{?dist}.1.alma.1
|
||||
Version: 6.0.13
|
||||
Release: 1%{?dist}.alma.1
|
||||
License: BSD
|
||||
Group: System Environment/Daemons
|
||||
URL: https://www.varnish-cache.org/
|
||||
@ -32,18 +32,6 @@ Patch9: varnish-5.1.1.fix_python_version.patch
|
||||
# https://github.com/varnishcache/varnish-cache/commit/5220c394232c25bb7a807a35e7394059ecefa821#diff-2279587378a4426edde05f42e1acca5e
|
||||
Patch11: varnish-6.0.0.fix_el6_fortify_source.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2045031
|
||||
Patch100: varnish-6.0.8.CVE-2022-23959.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2141844
|
||||
Patch101: varnish-6.0.8-CVE-2022-45060.patch
|
||||
|
||||
# https://issues.redhat.com/browse/RHEL-12814
|
||||
Patch102: varnish-6.0.8-CVE-2023-44487-rate_limit.patch
|
||||
|
||||
# https://issues.redhat.com/browse/RHEL-12814
|
||||
Patch103: varnish-6.0.8-CVE-2023-44487-vcl_vrt.patch
|
||||
|
||||
Obsoletes: varnish-libs
|
||||
|
||||
%if %{with python3}
|
||||
@ -152,11 +140,6 @@ sed -i '8 i\RPM_BUILD_ROOT=%{buildroot}' find-provides
|
||||
%patch11 -p0
|
||||
%endif
|
||||
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
|
||||
%build
|
||||
%if 0%{?rhel} == 6
|
||||
export CFLAGS="%{optflags} -fPIC"
|
||||
@ -222,10 +205,6 @@ sed -i 's/48/128/g;' bin/varnishtest/tests/c00057.vtc
|
||||
%endif
|
||||
#make %{?_smp_mflags} check LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{buildroot}%{_libdir}/%{name}" VERBOSE=1
|
||||
|
||||
# disable test because of CVE-2023-44487 fix
|
||||
# https://github.com/varnishcache/varnish-cache/pull/3998#issuecomment-1764649216
|
||||
rm bin/varnishtest/tests/t02014.vtc
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot} INSTALL="install -p"
|
||||
@ -392,6 +371,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 10 2024 Eduard Abdullin <eabdullin@almalinu.org> - 6.0.13-1.alma.1
|
||||
- Update to 6.0.13
|
||||
|
||||
* Mon Oct 23 2023 Tomas Korbar <tkorbar@redhat.com> - 6.0.8-3.1
|
||||
- Add parameters h2_rst_allowance and h2_rst_allowance_period to mitigate CVE-2023-44487
|
||||
- Resolves: RHEL-12814
|
||||
|
Loading…
Reference in New Issue
Block a user