Version 2.6.0, packages for VRT 8 (Varnish 6.1 & libvarnisapi.so.2)

README.rst

@@ -122,12 +122,12 @@ never changes during the lifetime of VCL, use ``match``.
 
 .. _obj_regex:
 
-new xregex = regex(STRING, INT limit, INT limit_recursion)
-----------------------------------------------------------
+regex(...)
+----------
 
 ::
 
-   new xregex = regex(
+   new xregex = re.regex(
       STRING,
       INT limit=1000,
       INT limit_recursion=1000

configure.ac

 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2013-2015 UPLEX Nils Goroll Systemoptimierung])
-AC_INIT([libvmod-re], [2.5.1])
+AC_INIT([libvmod-re], [2.6.0])
 AC_CONFIG_MACRO_DIR([m4])
 m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
 AC_CONFIG_SRCDIR(src/vmod_re.vcc)

pkg/rpm/pkg

@@ -10,8 +10,8 @@
 # - this script (named pkg)
 # - VMOD re tarball (libvmod-re-v$VERSION.tar.gz)
 # - RPM spec file (vmod-re.spec)
-# - yum repo config for varnish60@packagecloud (varnishcache_varnish60.repo)
-#   (see https://packagecloud.io/varnishcache/varnish60/install#manual-rpm)
+# - yum repo config for varnish61@packagecloud (varnishcache_varnish61.repo)
+#   (see https://packagecloud.io/varnishcache/varnish61/install#manual-rpm)
 
 # So this is a sample docker invocation:
 #
@@ -45,9 +45,9 @@ 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_varnish60.repo /etc/yum.repos.d/
+sudo cp /srv/varnishcache_varnish61.repo /etc/yum.repos.d/
 
-sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish60'
+sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish61'
 
 # build requirements
 sudo yum install -y -q varnish-devel pkgconfig make gcc python-docutils

pkg/rpm/varnishcache_varnish5.repo

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

pkg/rpm/varnishcache_varnish60.repo → pkg/rpm/varnishcache_varnish61.repo

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

pkg/rpm/vmod-re.spec

@@ -10,10 +10,10 @@ URL: https://code.uplex.de/uplex-varnish/libvmod-re
 Source0: lib%{name}-%{version}.tar.gz
 
 # varnish from varnish60 at packagecloud
-# The Requires specifies ABI 7.0 -- cannot be versioned for Varnish 6.0.
-Requires: varnishabi-7.0
+# The Requires specifies ABI >= 8.0 (Varnish 6.1, libvarnishapi.so.2)
+Requires: varnishd(vrt)%{?_isa} >= 8
 
-BuildRequires: varnish-devel >= 6.0.0
+BuildRequires: varnish-devel >= 6.1.0
 BuildRequires: pkgconfig
 BuildRequires: make
 BuildRequires: gcc