Set version maxwait-6.6.0, update RPM packaging for compatibility.

configure.ac

 AC_PREREQ(2.68)
 AC_COPYRIGHT([Copyright (c) 2019 UPLEX - Nils Goroll Systemoptimierung])
-AC_INIT([libvdp-pesi], [trunk], [varnish-support@uplex.de], [vdp-pesi])
+AC_INIT([libvdp-pesi], [maxwait-6.6.0], [varnish-support@uplex.de], [vdp-pesi])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vdp_pesi.vcc)
 AM_CONFIG_HEADER(config.h)

pkg/rpm/pkg

@@ -37,27 +37,32 @@ rm /home/builder/.rpmmacros
 cd /home/builder
 mkdir -p rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 cp /srv/vdp-pesi.spec rpmbuild/SPECS
-cp /srv/vdp-pesi-${VERSION}.tar.gz rpmbuild/SOURCES
+cp /srv/vdp-pesi-maxwait-${VERSION}.tar.gz rpmbuild/SOURCES
+
+# update the build env
+set +e
+sudo yum check-update -y -q
+set -e
+sudo yum upgrade -y -q
 
 # install epel7 repo
 sudo yum install -y -q \
      https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
-# set up varnish repo
-sudo cp /srv/varnishcache_varnish66.repo /etc/yum.repos.d/
-
-sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish66'
+# varnish-maxwait repo from uplex
+sudo yum-config-manager --add-repo https://pkg.uplex.de/rpm/7/uplex-varnish/x86_64/
 
 # build requirements (cf. Requires for varnish-src.rpm)
-sudo yum install -y -v varnish-devel-6.6.0 pkgconfig make gcc python-docutils \
-     yum-utils python3-sphinx jemalloc-devel libedit-devel ncurses-devel \
-     pcre-devel python3-docutils systemd-units git
+sudo yum install --nogpgcheck -y -q varnish-maxwait-devel-6.6.0
+sudo yum install -y -q pkgconfig make gcc python-docutils yum-utils \
+     python3-sphinx jemalloc-devel libedit-devel ncurses-devel pcre-devel \
+     pcre2-devel python3-docutils systemd-units git
 
 # build Varnish source
 cd rpmbuild/SOURCES
-git clone https://github.com/varnishcache/varnish-cache.git
+git clone https://github.com/slimhazard/varnish-cache.git
 cd varnish-cache
-git checkout varnish-6.6.0
+git checkout req_total_timeout_6.6 
 ./autogen.sh
 ./configure
 make -j

pkg/rpm/varnishcache_varnish66.repo

-[varnishcache_varnish66]
-name=varnishcache_varnish66
-baseurl=https://packagecloud.io/varnishcache/varnish66/el/7/$basearch
-repo_gpgcheck=1
-gpgcheck=0
-enabled=1
-gpgkey=https://packagecloud.io/varnishcache/varnish66/gpgkey
-sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
-metadata_expire=300
-
-[varnishcache_varnish66-source]
-name=varnishcache_varnish66-source
-baseurl=https://packagecloud.io/varnishcache/varnish66/el/7/SRPMS
-repo_gpgcheck=1
-gpgcheck=0
-enabled=1
-gpgkey=https://packagecloud.io/varnishcache/varnish66/gpgkey
-sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
-metadata_expire=300

pkg/rpm/vdp-pesi.spec

 # -D MUST pass in _version and _release, and SHOULD pass in dist.
 
 Summary: Varnish Delivery Processor for parallel Edge Side Includes
-Name: vdp-pesi
+Name: vdp-pesi-maxwait
 Version: %{_version}
 Release: %{_release}%{?dist}
 License: BSD
@@ -11,9 +11,9 @@ Source0: %{name}-%{version}.tar.gz
 
 # varnish from varnish66 at packagecloud
 # Strictly require 6.6.0 by commit ID.
-Requires: varnishd(abi)%{?_isa} == ef54768fc10f5b19556c7cf9866efc88cfbda8ff
+Requires: varnishd(abi)%{?_isa} == 88903a55c458c4d6a2ea893326e4a0e96cea9da8
 
-BuildRequires: varnish-devel == 6.6.0
+BuildRequires: varnish-maxwait-devel == 6.6.0
 BuildRequires: pkgconfig
 BuildRequires: make
 BuildRequires: gcc
@@ -26,7 +26,7 @@ BuildRequires: python-docutils >= 0.6
 #BuildRequires: libtool
 #BuildRequires: python-docutils >= 0.6
 
-Provides: vdp-pesi, vdp-pesi-debuginfo
+Provides: vdp-maxwait-pesi, vdp-maxwait-pesi-debuginfo
 
 %description
 Varnish Delivery Processor that implements Edge Side Includes by
@@ -72,7 +72,10 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 
 %changelog
-* Wed Apr 21 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
+* Fri May 21 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
+- Compatible with the maxwait feature (Varnish 6.6.0)
+
+* Wed Apr 21 2021 Geoff Simmons <geoff@uplex.de> - 1.1.0-1
 - Update for Varnish 6.6.0
 
 * Wed Jan 27 2021 Geoff Simmons <geoff@uplex.de> - 1.0.0-1