backwards compatibility

- New upstream release. A security release
- Includes fix for VSV00014, CVE-2024-30156, rhbz#2271511

.gitignore

@@ -32,3 +32,16 @@ varnish-2.1.3.tar.gz
 /pkg-varnish-cache-0ad2f22.tar.gz
 /varnish-6.0.0.tgz
 /varnish-6.0.1.tgz
+/varnish-6.0.2.tgz
+/varnish-6.0.3.tgz
+/varnish-6.0.4.tgz
+/varnish-6.0.5.tgz
+/varnish-6.0.6.tgz
+/varnish-6.0.7.tgz
+/pkg-varnish-cache-6890e35.tar.gz
+/varnish-6.0.8.tgz
+/varnish-6.0.9.tgz
+/varnish-6.0.10.tgz
+/varnish-6.0.11.tgz
+/varnish-6.0.12.tgz
+/varnish-6.0.13.tgz

sources

@@ -1,2 +1,2 @@
-SHA512 (varnish-6.0.1.tgz) = 057cb69ae6a4d980401effb7561d3a9b537216d8626fdf4e7bcc75971958517f51b6bd7f7af86c11bc92a2e77876831c577736dfcd11447ad0128f222c5ad138
+SHA512 (varnish-6.0.13.tgz) = 3bdb4f04bdb22789ebe04a1e57dc814a7d7e642456cce2696f7e05fe557a277f18d5dc4a2df22a27fa9445447af3356ebdb3c5d63c01bb32d9bff7881aa8a703
 SHA512 (pkg-varnish-cache-0ad2f22.tar.gz) = b66c05f74f9bd62ddf16ab3e7904f4e74993bd1406aaebf20d4dca840198430da9f5e746af22778f1a73063113ac19b6f8127d77ff71c30c246fd5fab5ed78da

varnish-6.0.2.fix_ld_library_path_in_doc_build.patch

@@ -0,0 +1,68 @@
+--- doc/sphinx/Makefile.in.orig	2018-11-26 21:53:39.236269183 +0100
++++ doc/sphinx/Makefile.in	2018-11-26 21:56:29.511635180 +0100
+@@ -642,10 +642,12 @@
+ 	rm -rf $(BUILDDIR)
+ 
+ include/cli.rst: $(top_builddir)/bin/varnishd/varnishd
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishd/varnishd -x cli > ${@}_
+ 	mv ${@}_ ${@}
+ 
+ include/params.rst: $(top_builddir)/bin/varnishd/varnishd
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishd/varnishd -x parameter > ${@}_
+ 	mv ${@}_ ${@}
+ 
+@@ -659,41 +661,52 @@
+ # XXX add varnishstat here when it's been _opt2rst'ed
+ 
+ include/varnishncsa_options.rst: $(top_builddir)/bin/varnishncsa/varnishncsa
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishncsa/varnishncsa --options > ${@}_
+ 	mv ${@}_ ${@}
+ include/varnishncsa_synopsis.rst: $(top_builddir)/bin/varnishncsa/varnishncsa
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishncsa/varnishncsa --synopsis > ${@}_
+ 	mv ${@}_ ${@}
+ 
+ include/varnishlog_options.rst: $(top_builddir)/bin/varnishlog/varnishlog
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishlog/varnishlog --options > ${@}_
+ 	mv ${@}_ ${@}
+ include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishlog/varnishlog --synopsis > ${@}_
+ 	mv ${@}_ ${@}
+ 
+ include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishtop/varnishtop --options > ${@}_
+ 	mv ${@}_ ${@}
+ include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishtop/varnishtop --synopsis > ${@}_
+ 	mv ${@}_ ${@}
+ 
+ include/varnishhist_options.rst: $(top_builddir)/bin/varnishhist/varnishhist
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishhist/varnishhist --options > ${@}_
+ 	mv ${@}_ ${@}
+ include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishhist/varnishhist --synopsis > ${@}_
+ 	mv ${@}_ ${@}
+ 
+ include/varnishstat_options.rst: $(top_builddir)/bin/varnishstat/varnishstat
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishstat/varnishstat --options > ${@}_
+ 	mv ${@}_ ${@}
+ include/varnishstat_synopsis.rst: $(top_builddir)/bin/varnishstat/varnishstat
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/bin/varnishstat/varnishstat --synopsis > ${@}_
+ 	mv ${@}_ ${@}
+ 
+ include/vsl-tags.rst: $(top_builddir)/lib/libvarnishapi/vsl2rst
++	LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \
+ 	$(top_builddir)/lib/libvarnishapi/vsl2rst > ${@}_
+ 	mv ${@}_ ${@}
+ include/vtc-syntax.rst: vtc-syntax.py $(VTCSYN_SRC)

varnish-6.0.3.fix_upstream_issue_2879.patch

@@ -0,0 +1,41 @@
+From 7119d790b590e7fb560ad602cedfda5185c7e841 Mon Sep 17 00:00:00 2001
+From: Poul-Henning Kamp <phk@FreeBSD.org>
+Date: Fri, 11 Jan 2019 10:26:44 +0000
+Subject: [PATCH] Avoid printing %s,NULL in case of errors we do not expect.
+
+Fixes #2879
+---
+ lib/libvarnish/vnum.c | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/lib/libvarnish/vnum.c b/lib/libvarnish/vnum.c
+index b619199c6..59e804ec8 100644
+--- a/lib/libvarnish/vnum.c
++++ b/lib/libvarnish/vnum.c
+@@ -349,15 +349,17 @@ main(int argc, char *argv[])
+ 
+ 	for (tc = test_cases; tc->str; ++tc) {
+ 		e = VNUM_2bytes(tc->str, &val, tc->rel);
+-		if (e != tc->err) {
+-			printf("%s: VNUM_2bytes(\"%s\", %ju) (%s) != (%s)\n",
+-			    *argv, tc->str, tc->rel, tc->err, e);
+-			++ec;
+-		} else if (e == NULL && val != tc->val) {
+-			printf("%s: VNUM_2bytes(\"%s\", %ju) %ju != %ju (%s)\n",
+-			    *argv, tc->str, tc->rel, val, tc->val, e);
+-			++ec;
+-		}
++		if (e != NULL)
++			val = 0;
++		if (e == tc->err && val == tc->val)
++			continue;
++		++ec;
++		printf("%s: VNUM_2bytes(\"%s\", %ju)\n",
++		   *argv, tc->str, tc->rel);
++		printf("\tExpected:\tstatus %s - value %ju\n",
++		    tc->err ? tc->err : "Success", tc->val);
++		printf("\tGot:\t\tstatus %s - value %ju\n",
++		    e ? e : "Success", val);
+ 	}
+ 	if (!isnan(VNUM_duration(NULL))) {
+ 		printf("%s: VNUM_Duration(NULL) fail\n", *argv);

varnish-6.0.7.fix_tests_v00064.patch

@@ -0,0 +1,20 @@
+--- varnish-6.0.7/bin/varnishtest/tests/v00064.vtc	2020-11-06 11:26:43.000000000 +0100
++++ varnish-6.5.1/bin/varnishtest/tests/v00064.vtc	2020-09-25 11:14:30.000000000 +0200
+@@ -44,7 +44,7 @@
+ delay .1
+ 
+ varnish v1 -expect SM?.Transient.g_bytes > 1048000
+-varnish v1 -expect SM?.Transient.g_space == 8
++varnish v1 -expect SM?.Transient.g_space < 50
+ 
+ client c1 {
+     # Fill malloc
+@@ -56,7 +56,7 @@
+ } -run
+ 
+ varnish v1 -expect SM?.s0.g_bytes > 1048000
+-varnish v1 -expect SM?.s0.g_space == 4
++varnish v1 -expect SM?.s0.g_space < 50
+ 
+ client c1 {
+     # Check that Varnish is still alive

varnish-6.3.2_fix_s390x.patch

@@ -0,0 +1,19 @@
+commit b0af060fb688b8fc2ff3817ea99430432668b291
+Author: Ingvar Hagelund <ingvar@redpill-linpro.com>
+Date:   Tue Feb 11 12:56:54 2020 +0100
+
+    simple fix for fedora/gcc-10.0.1: -Werror=format-overflow, by some reason hit on s390x
+
+diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
+index 1ec748cb6..09e49d258 100644
+--- a/bin/varnishtest/vtc_varnish.c
++++ b/bin/varnishtest/vtc_varnish.c
+@@ -121,7 +121,7 @@ varnish_ask_cli(const struct varnish *v, const char *cmd, char **repl)
+ 	i = VCLI_ReadResult(v->cli_fd, &retval, &r, vtc_maxdur);
+ 	if (i != 0 && !vtc_stop)
+ 		vtc_fatal(v->vl, "CLI failed (%s) = %d %u %s",
+-		    cmd, i, retval, r);
++		    cmd != NULL ? cmd : "NULL", i, retval, r);
+ 	vtc_log(v->vl, 3, "CLI RX  %u", retval);
+ 	vtc_dump(v->vl, 4, "CLI RX", r, -1);
+ 	if (repl != NULL)

varnish.spec

@@ -1,8 +1,28 @@
 %global _hardened_build 1
-%global debug_package %{nil}
+
 # https://github.com/varnishcache/varnish-cache/issues/2269
+%global debug_package %{nil}
+
+%if 0%{?rhel} == 7
 %global _use_internal_dependency_generator 0
 %global __find_provides %{_builddir}/%{name}-%{version}/find-provides %__find_provides
+%global __python /usr/bin/python3.4
+%else
+%if 0%{?fedora} >= 30
+%global __python %{__python3}
+%else
+%global __python /usr/bin/python3
+%endif
+%endif
+
+# Default is to build with jemalloc (preferred by upstream, default on fedora)
+# Add "--with system_allocator" if you insist on using the default malloc (glibc on rhel) instead
+%bcond_with system_allocator 
+
+%global __provides_exclude_from ^%{_libdir}/varnish/vmods
+
+%global abi 66e26fc5b617b13f77f425a8e1674f43596b6f5f
+%global vrt 7.1
 
 # Package scripts are now external
 # https://github.com/varnishcache/pkg-varnish-cache
@@ -11,28 +31,48 @@
 
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 6.0.1
-Release: 3%{?dist}
+Version: 6.0.18
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: https://www.varnish-cache.org/
-Source0: http://varnish-cache.org/_downloads/%{name}-%{version}%{?vd_rc}.tgz
+Source0: https://github.com/varnish/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1: https://github.com/varnishcache/pkg-varnish-cache/archive/%{commit1}.tar.gz#/pkg-varnish-cache-%{shortcommit1}.tar.gz
-Patch1:  varnish-5.1.1.fix_ld_library_path_in_doc_build.patch
-Patch4:  varnish-4.0.3_fix_varnish4_selinux.el6.patch
-Patch9:  varnish-5.1.1.fix_python_version.patch
+Patch1:  varnish-6.0.2.fix_ld_library_path_in_doc_build.patch
+Patch18: varnish-6.3.2_fix_s390x.patch
 
-# based on https://github.com/varnishcache/varnish-cache/commit/9bdc5f75d661a1659c4df60799612a7524a6caa7
-Patch12: varnish-6.0.1_fix_bug2668.patch
+%if 0%{?fedora} > 28
+Provides: varnish%{_isa} = %{version}-%{release}
+Provides: varnishd(abi)%{_isa} = %{abi}
+Provides: varnishd(vrt)%{_isa} = %{vrt}
 
-Obsoletes: varnish-libs
+Provides: vmod(blob)%{_isa} = %{version}-%{release}
+Provides: vmod(directors)%{_isa} = %{version}-%{release}
+Provides: vmod(proxy)%{_isa} = %{version}-%{release}
+Provides: vmod(purge)%{_isa} = %{version}-%{release}
+Provides: vmod(std)%{_isa} = %{version}-%{release}
+Provides: vmod(unix)%{_isa} = %{version}-%{release}
+Provides: vmod(vtc)%{_isa} = %{version}-%{release}
+%endif
 
-%if 0%{?rhel} ==6 || 0%{?rhel} == 7
+Obsoletes: varnish-libs < %{version}-%{release}
+
+%if 0%{?rhel} == 7
 BuildRequires: python-sphinx python34-docutils
 %else
 BuildRequires: python3-sphinx, python3-docutils
 %endif
+
+%if 0%{?rhel} > 8 || 0%{?fedora} > 40
+BuildRequires: vttest
+BuildRequires: haproxy
+%endif
+
+%if %{with system_allocator}
+# use glibc
+%else
 BuildRequires: jemalloc-devel
+%endif
 BuildRequires: libedit-devel
 BuildRequires: ncurses-devel
 BuildRequires: pcre-devel
@@ -41,13 +81,14 @@ BuildRequires: gcc
 BuildRequires: make
 BuildRequires: nghttp2
 
-%if 0%{?rhel} == 6
-BuildRequires: selinux-policy
-%endif
 Requires: logrotate
 Requires: ncurses
 Requires: pcre
+%if %{with system_allocator}
+# use glibc
+%else
 Requires: jemalloc
+%endif
 Requires: redhat-rpm-config
 Requires(pre): shadow-utils
 Requires(post): /usr/bin/uuidgen
@@ -61,15 +102,6 @@ Requires(preun): systemd-units
 Requires(postun): systemd-units
 BuildRequires: systemd-units
 %endif
-%if 0%{?rhel} == 6
-Requires: %{name}-selinux
-Requires(post): policycoreutils, 
-Requires(preun): policycoreutils
-Requires(postun): policycoreutils
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-%endif
 
 %description
 This is Varnish Cache, a high-performance HTTP accelerator.
@@ -87,17 +119,13 @@ Summary: Development files for %{name}
 Group: Development/Libraries
 BuildRequires: ncurses-devel
 Provides: varnish-libs-devel = %{version}-%{release}
-Obsoletes: varnish-libs-devel
+Obsoletes: varnish-libs-devel < %{version}-%{release}
+
 %description devel
 Development files for %{name}
 Varnish Cache is a high-performance HTTP accelerator
 Requires: %{name} = %{version}-%{release}
-
-%if 0%{?rhel} == 6
-Requires: python34
-%else
 Requires: python3
-%endif
 
 %package docs
 Summary: Documentation files for %name
@@ -106,64 +134,47 @@ Group: Documentation
 %description docs
 Documentation files for %name
 
-%if 0%{?rhel} == 6
-%package selinux
-Summary: Minimal selinux policy for running varnish
-Group:   System Environment/Daemons
-
-%description selinux
-Minimal selinux policy for running varnish4
-%endif
-
 %prep
 %setup -q -n varnish-%{version}%{?vd_rc}
 tar xzf %SOURCE1
 ln -s pkg-varnish-cache-%{commit1}/redhat redhat
 ln -s pkg-varnish-cache-%{commit1}/debian debian
 cp redhat/find-provides .
-%if 0%{?rhel} == 6
-cp pkg-varnish-cache-%{commit1}/sysv/redhat/* redhat/
-sed -i '8 i\RPM_BUILD_ROOT=%{buildroot}' find-provides
-%endif
 
-%patch1 -p0
-%if 0%{?rhel} == 6
-%patch4 -p0
-%patch9 -p0
+%patch -P1 -p0
+%patch -P18 -p1
+
+%if 0%{?fedora} > 42
+rm bin/varnishtest/tests/a02022.vtc
 %endif
-%patch12 -p1
 
 %build
-%if 0%{?rhel} == 6
-export CFLAGS="%{optflags} -fPIC"
-export LDFLAGS=" -pie"
-%endif
-
 # https://gcc.gnu.org/wiki/FAQ#PR323
 %ifarch %ix86
 %if 0%{?fedora} > 21
 export CFLAGS="%{optflags} -ffloat-store -fexcess-precision=standard"
 %endif
-%if 0%{?rhel} >= 6
-export CFLAGS="%{optflags} -fno-exceptions -fPIC -ffloat-store"
-%endif
 %endif
 
 # Man pages are prebuilt. No need to regenerate them.
 export RST2MAN=/bin/true
 # Explicit python, please
-export PYTHON=/usr/bin/python3
+export PYTHON=%{__python}
 
 %configure --disable-static \
 %ifarch aarch64
   --with-jemalloc=no \
 %endif
   --localstatedir=/var/lib  \
-  --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+  --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \
+%if %{with system_allocator}
+  --with-jemalloc=no \
+%endif
 #ifarch x86_64 #arm
 #  --disable-pcre-jit \
 #endif
 
+
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
@@ -175,37 +186,44 @@ pushd lib/libvarnishapi/.libs
 ln -s libvarnishapi.so libvarnishapi.so.1
 popd
 
-%if 0%{?rhel} == 6 
-# Upstream github issue #22650
-sed -i 's/-Werror$//g;' bin/varnishd/Makefile
-sed -i 's/-Werror$//g;' lib/libvarnishapi/Makefile
-# Workaround old readline/curses, ref upstream github issue #2550
-sed -i 's/vcl1/ vcl1/;' bin/varnishtest/tests/u00011.vtc
+# el7 defaults to LANG=C, which makes python3 fail on utf8
+%if 0%{?rhel} == 7
+export LANG=en_US.UTF-8
 %endif
 
-make %{?_smp_mflags} V=1 
+make %{?_smp_mflags} V=1
 
 # One varnish user is enough
 sed -i 's,User=varnishlog,User=varnish,g;' redhat/varnishncsa.service
 
 # Explicit python, please
-sed -i 's,env python,python3,;' lib/libvcc/vmodtool.py
-sed -i 's,env python,python3,;' lib/libvcc/vsctool.py
+sed -i 's,env python3,python3,;' lib/libvcc/vmodtool.py
+sed -i 's,env python3,python3,;' lib/libvcc/vsctool.py
 
 # Clean up the html documentation
 rm -rf doc/html/_sources
 
 %check
+# haproxy version compatibility stuff
+sed -i 's/HA-Proxy version/HAProxy version/g;' bin/varnishtest/tests/*.vtc
+rm bin/varnishtest/tests/h00004.vtc
+
 %ifarch ppc64 ppc64le aarch64
 sed -i 's/48/128/g;' bin/varnishtest/tests/c00057.vtc
 %endif
+# Upstream issues 3061, 3308
+%ifarch %ix86 x86_64 armv7hl
+sed -i 's/-vcl {$/\\/g; 4 a -arg "-p thread_pool_stack=64k" -vcl {' bin/varnishtest/tests/m00035.vtc
+sed -i 's/client, -12/client, -11/g;' bin/varnishtest/tests/v00058.vtc
+rm bin/varnishtest/tests/r03308.*
+%endif
 make %{?_smp_mflags} check LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{buildroot}%{_libdir}/%{name}" VERBOSE=1
 
 %install
 rm -rf %{buildroot}
 
-# el6 and el7 defaults to LANG=C, which makes python3 fail on utf8
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+# el7 defaults to LANG=C, which makes python3 fail on utf8
+%if 0%{?rhel} == 7
 export LANG=en_US.UTF-8
 %endif
 
@@ -223,13 +241,13 @@ install -D -m 0644 redhat/varnish.logrotate %{buildroot}%{_sysconfdir}/logrotate
 install -D -m 0644 include/vcs_version.h %{buildroot}%{_includedir}/varnish
 install -D -m 0644 include/vrt.h %{buildroot}%{_includedir}/varnish
 
-# systemd support
+# systemd
 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
 mkdir -p %{buildroot}%{_unitdir}
 install -D -m 0644 redhat/varnish.service %{buildroot}%{_unitdir}/varnish.service
 install -D -m 0644 redhat/varnishncsa.service %{buildroot}%{_unitdir}/varnishncsa.service
 
-# default is standard sysvinit
+# sysvinit
 %else
 install -D -m 0644 redhat/varnish.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/varnish
 install -D -m 0755 redhat/varnish.initrc %{buildroot}%{_initrddir}/varnish
@@ -243,13 +261,6 @@ echo %{_libdir}/varnish > %{buildroot}%{_sysconfdir}/ld.so.conf.d/varnish-%{_arc
 chmod 644 lib/libvmod_*/*.c
 chmod 644 lib/libvmod_*/*.h
 
-# selinux module for el6
-%if 0%{?rhel} == 6
-cd selinux
-make -f %{_datadir}/selinux/devel/Makefile
-install -p -m 644 -D varnish4.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/varnish4.pp
-%endif
-
 %files
 %{_sbindir}/*
 %{_bindir}/*
@@ -295,11 +306,6 @@ install -p -m 644 -D varnish4.pp %{buildroot}%{_datadir}/selinux/packages/%{name
 %doc doc/html
 %doc doc/changes*.html
 
-%if 0%{?rhel} == 6
-%files selinux
-%{_datadir}/selinux/packages/%{name}/varnish4.pp
-%endif
-
 %pre
 getent group varnish >/dev/null || groupadd -r varnish
 getent passwd varnish >/dev/null || \
@@ -324,18 +330,6 @@ chown varnish:varnish /var/log/varnish/varnishncsa.log 2>/dev/null || true
 
 test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc/varnish/secret)
 
-# selinux module for el6
-%if 0%{?rhel} == 6
-%post selinux
-if [ "$1" -le "1" ] ; then # First install
-semodule -i %{_datadir}/selinux/packages/%{name}/varnish4.pp 2>/dev/null || :
-fi
-
-%preun selinux
-if [ "$1" -lt "1" ] ; then # Final removal
-semodule -r varnish4 2>/dev/null || :
-fi
-
 %postun
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %systemd_postun_with_restart varnish.service
@@ -343,15 +337,7 @@ fi
 /sbin/ldconfig
 
 
-%postun selinux
-if [ "$1" -ge "1" ] ; then # Upgrade
-semodule -i %{_datadir}/selinux/packages/%{name}/varnish4.pp 2>/dev/null || :
-fi
-
-%endif
-
 %preun
-
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %systemd_preun varnish.service
 %else
@@ -373,6 +359,91 @@ fi
 
 
 %changelog
+* Wed May 20 2026 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.18-1
+- New upstream release. A security relase
+- Includes fix for VSV00019
+
+* Thu Mar 26 2026 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.17-1
+- New upstream release. A security release
+- Includes fix for VSV00018
+- Added support for a few more tests in the test suite
+
+* Fri Aug 29 2025 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.16-1
+- New upstream release. A security release
+- Includes fix for VSV00017,CVE-2025-8671, rhbz#2388222
+
+* Mon Aug 11 2025 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.14-1
+- New upstream release. A security release
+- Includes fix for VSV00015 CVE-2025-30346, VSV00016 CVE-2025-47905
+
+* Mon Apr 29 2024 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.13-1
+- New upstream release. A security release
+- Includes fix for VSV00014, CVE-2024-30156, rhbz#2271511
+
+* Tue Nov 14 2023 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.12-1
+- New upstream release. A security release
+- Includes fix for CVE-2023-44487 aka VSV00013, rhbz#2243328,
+  the HTTP/2 Rapid Reset Attack
+
+* Tue Nov 15 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.11-1
+- New upstream release. A security release
+- Includes fix for CVE-2022-45060 aka VSV00011, rhbz#2141847
+- Pulled support for el6
+- Added bcond for system allocator
+
+* Fri Jan 28 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.10-1
+- New upstream release. A security release
+- Includes fix for CVE-2022-23959 aka VSV00008, rhbz#2045032
+
+* Thu Jan 13 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.9-1
+- New upstream release. A bugfix release
+
+* Sat Jul 17 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.8-1
+- New upstream release
+- Includes fix for CVE-2021-36740 aka VSV00007, bz#1982413
+
+* Tue Nov 17 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.7-2
+- Added a small tuning patch fixing test suite on armv7hl
+- Removing a non-working test on armv7hl
+
+* Thu Nov 12 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.7-1
+- New upstream release. A bugfix release
+
+* Thu Feb 13 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.6-1
+- New upstream release. A security release. Fixes VSV00005
+- Versioned obsoletes
+- Build with utf8 LANG on el6 and el7
+- Changed the sed filter for explicit python as upstream has changed
+
+* Tue Oct 22 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.5-1
+- New upstream release. A security release. Fixes VSV00004
+
+* Wed Sep 25 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.4-4
+- Fix for tests/v00058.vtc on 32bit
+
+* Thu Sep 19 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.4-3
+- Updated vrt and abi versions
+- Use macro __python for python3 when available
+
+* Mon Sep 16 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.4-2
+- Removed tests/v00059.vtc on 32bit after advice from varnish upstream
+
+* Fri Sep 06 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.4-1
+- New upstream relase. A security release including fix for CVE-2019-15892
+
+* Mon Feb 25 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.3-1
+- New upstream release
+- Added a patch from upstream fixing a compile error on gcc9
+
+* Tue Nov 27 2018 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.2-2
+- Dropped the depricated external dependency generator in Fedora
+- Hard coded vmod, abi and vrt provides
+
+* Mon Nov 26 2018 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.2-1
+- New upstream release
+- Respun necessary patches for varnish-6.0.2
+- Dropped patches merged upstream
+
 * Tue Oct 09 2018 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.0.1-3
 - Explicitly using utf8 under install on el6 and el7 for python quirks
 
@@ -829,19 +900,19 @@ fi
 - Added a s390 specific patch to libjemalloc.
 
 * Fri Mar 27 2009 Ingvar Hagelund <ingvar@linpro.no> - 2.0.4-1
-  New upstream release 2.0.4 
+- New upstream release 2.0.4
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Feb 11 2009 Ingvar Hagelund <ingvar@linpro.no> - 2.0.3-1
-  New upstream release 2.0.3. A bugfix and feature enhancement release
+- New upstream release 2.0.3. A bugfix and feature enhancement release
 
 * Fri Dec 12 2008 Ingvar Hagelund <ingvar@linpro.no> - 2.0.2-2
-  Added a fix for a timeout bug, backported from trunk
+- Added a fix for a timeout bug, backported from trunk
 
 * Mon Nov 10 2008 Ingvar Hagelund <ingvar@linpro.no> - 2.0.2-1
-  New upstream release 2.0.2. A bugfix release
+- New upstream release 2.0.2. A bugfix release
 
 * Sun Nov 02 2008 Ingvar Hagelund <ingvar@linpro.no> - 2.0.1-2
 - Removed the requirement for kernel => 2.6.0. All supported