Set version 1.2.1, and package RPMs for Varnish with the VSL fix.

This is a custom patch version of Varnish 6.6.2 with a bugfix hypothesis
for issue 3775.

configure.ac

 AC_PREREQ(2.68)
 AC_COPYRIGHT([Copyright 2019 - 2021  UPLEX - Nils Goroll Systemoptimierung])
-AC_INIT([libvdp-pesi], [trunk], [varnish-support@uplex.de], [vdp-pesi])
+AC_INIT([libvdp-pesi], [1.2.1], [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

@@ -39,25 +39,30 @@ 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
 
+# update the build env
+set +e
+sudo yum check-update -y -q
+set -e
+sudo yum update -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'
+# set uplex repo for varnish-devel with the VSL fix
+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.2 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 -y -q --nogpgcheck varnish-devel-6.6.2-0.vslfix.1.el7
+sudo yum install -y -v pkgconfig make gcc python-docutils yum-utils \
+     python3-sphinx jemalloc-devel libedit-devel ncurses-devel pcre-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.2
+git checkout 3775_invalidate_vxid_cache_6.6.2
 ./autogen.sh
 ./configure
 make -j

pkg/rpm/vdp-pesi.spec

@@ -10,10 +10,10 @@ Group: System Environment/Daemons
 Source0: %{name}-%{version}.tar.gz
 
 # varnish from varnish66 at packagecloud
-# Strictly require 6.6.2 by commit ID.
-Requires: varnishd(abi)%{?_isa} == 17c51b08e037fc8533fb3687a042a867235fc72f
+# Strictly require 6.6.2 with VSL fix by commit ID.
+Requires: varnishd(abi)%{?_isa} == 175638f09da9a5ddb8dfaf1756ccebf97ecdcc98
 
-BuildRequires: varnish-devel == 6.6.2
+BuildRequires: varnish-devel == 6.6.2-0.vslfix.1.el7
 BuildRequires: pkgconfig
 BuildRequires: make
 BuildRequires: gcc
@@ -72,7 +72,10 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 
 %changelog
-* Tue Jan 25 2022 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
+* Wed Apr 27 2022 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
+- Update for Varnish 6.6.2 with VSL fix
+
+* Tue Jan 25 2022 Geoff Simmons <geoff@uplex.de> - 1.2.0-1
 - Update for Varnish 6.6.2
 
 * Wed Apr 21 2021 Geoff Simmons <geoff@uplex.de> - 1.1.0-1