From d2a8f649fc720c832d9e8b45efb59b4daec41aa1cfb017eeb8cf79c189b5f254 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 17 Sep 2020 08:41:58 +0000
Subject: [PATCH] - Update to release 6.5.0

OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=103
---
 varnish-6.4.0.tgz |  3 ---
 varnish-6.5.0.tgz |  3 +++
 varnish.changes   | 10 ++++++++++
 varnish.spec      |  9 ++++-----
 4 files changed, 17 insertions(+), 8 deletions(-)
 delete mode 100644 varnish-6.4.0.tgz
 create mode 100644 varnish-6.5.0.tgz

diff --git a/varnish-6.4.0.tgz b/varnish-6.4.0.tgz
deleted file mode 100644
index f4805ce..0000000
--- a/varnish-6.4.0.tgz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f636ba2d881b146f480fb52efefae468b36c2c3e6620d07460f9ccbe364a76c2
-size 3404617
diff --git a/varnish-6.5.0.tgz b/varnish-6.5.0.tgz
new file mode 100644
index 0000000..56773a7
--- /dev/null
+++ b/varnish-6.5.0.tgz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00814949f28701e164d8f246a4e37431594136c6bfcb02f64c58d77ab44861d9
+size 3476969
diff --git a/varnish.changes b/varnish.changes
index 65e34a8..c0fd9a4 100644
--- a/varnish.changes
+++ b/varnish.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep 17 08:34:30 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 6.5.0
+  * `PRIV_TOP` is now thread-safe to support parallel ESI
+    implementations.
+  * varnishstat's JSON output format (-j option) has been changed.
+  * Behavior for 304-type responses was changed not to update the
+    Content-Encoding response header of the stored object.
+
 -------------------------------------------------------------------
 Tue Jun 23 07:35:15 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/varnish.spec b/varnish.spec
index 812ba34..0664286 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -26,7 +26,7 @@
 %define pkg_logdir   %_localstatedir/log/%name
 %define pkg_cachedir %_localstatedir/cache/%name
 Name:           varnish
-Version:        6.4.0
+Version:        6.5.0
 Release:        0
 Summary:        Accelerator for HTTP services
 License:        BSD-2-Clause
@@ -45,7 +45,7 @@ BuildRequires:  python3-Sphinx
 BuildRequires:  libxslt
 BuildRequires:  ncurses-devel
 BuildRequires:  pcre-devel
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
 BuildRequires:  readline-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  xz
@@ -102,9 +102,8 @@ export CFLAGS="$CFLAGS -ffloat-store -fexcess-precision=standard"
 %endif
 %configure --disable-static --docdir="%_docdir/%name" \
            --localstatedir="%_localstatedir/cache/" \
-           --disable-silent-rules \
            --enable-developer-warnings
-make %{?_smp_mflags}
+%make_build
 
 %install
 b="%buildroot"
@@ -137,7 +136,7 @@ perl -i -pe 's{^#!/usr/bin/env python}{#!/usr/bin/python}g' \
 	"$b/usr/share/varnish/vmodtool.py" "$b/usr/share/varnish/vsctool.py"
 
 %check
-if ! make %{?_smp_mflags} check; then
+if ! %make_build check; then
 	x="$?"
 	cat bin/varnishtest/test-suite.log
 	exit "$x"