From f2252ed21bfac2d0fd505b0f3efb169921e953d7 Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Wed, 22 Sep 2021 19:45:54 +0200
Subject: [PATCH] New upstream release

Updated pkg-varnish checkout from the 7.0 branch
---
 .gitignore   |  2 ++
 sources      |  4 ++--
 varnish.spec | 16 ++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20d67f9..41df40b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@ varnish-2.1.3.tar.gz
 /varnish-6.5.1.tgz
 /varnish-6.6.0.tgz
 /varnish-6.6.1.tgz
+/pkg-varnish-cache-d3e6a3f.tar.gz
+/varnish-7.0.0.tgz
diff --git a/sources b/sources
index 86e6875..1424535 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (varnish-6.6.1.tgz) = af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
-SHA512 (pkg-varnish-cache-ec7ad9e.tar.gz) = 146aacec76b2ca641bb8bc9dda49e82d28740dbcba034e73a8d39387696f10fa3108ab124a078e900865388217352d112f63f6fe9ef7b23e20bc699441aab4f2
+SHA512 (pkg-varnish-cache-d3e6a3f.tar.gz) = 01a133e10bc88e115255839de9ce394fa232b21341c1712773cf6e4633112301890cdc5155fce51afc6456324b84a7dd82a8544b7e9e598841ea1c5dccd3b4e3
+SHA512 (varnish-7.0.0.tgz) = 39c694db4ec7b35236d12fe2c03036260d6799395b1c8bb5a58e96fc88d67dcaa5eb8bc75643540d3aa0edc1a8924d7d839e88293b0521fadef4cd12f466fb4b
diff --git a/varnish.spec b/varnish.spec
index 9fa221a..97c6af9 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -12,18 +12,18 @@
 
 %global __provides_exclude_from ^%{_libdir}/varnish/vmods
 
-%global abi e6a8c860944c4f6a7e1af9f40674ea78bbdcdc66
-%global vrt 13.0
+%global abi 454733b82a3279a1603516b4f0a07f8bad4bcd55
+%global vrt 14.0
 
 # Package scripts are now external
 # https://github.com/varnishcache/pkg-varnish-cache
-%global commit1 ec7ad9e6c6dd7c9b4f4ba60c5b223376908c3ca6
+%global commit1 d3e6a3fad7d4c2ac781ada92dcc246e7eef9d129
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 6.6.1
-Release: 3%{?dist}
+Version: 7.0.0
+Release: 1%{?dist}
 License: BSD
 URL: https://www.varnish-cache.org/
 Source0: http://varnish-cache.org/_downloads/%{name}-%{version}.tgz
@@ -88,7 +88,7 @@ BuildRequires: python3, python3-sphinx, python3-docutils
 BuildRequires: jemalloc-devel
 BuildRequires: libedit-devel
 BuildRequires: ncurses-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
 BuildRequires: pkgconfig
 BuildRequires: gcc
 BuildRequires: make
@@ -298,6 +298,10 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc
 
 
 %changelog
+* Thu Sep 16 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> - 7.0.0-1
+- New upstream release
+- Updated pkg-varnish checkout from the 7.0 branch
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild