Migrated to Varnish Cache 8.0.x

carlosabalde · carlosabalde · commit db1238249e7b · 2025-09-15T15:32:46.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,9 +39,9 @@ jobs:
 
       - name: Install Varnish Cache
         run: |
-          git clone https://github.com/varnishcache/varnish-cache.git ./varnish
-          pushd varnish
-          git submodule update --init
+          wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-8.0.0.tgz
+          tar zxvf varnish-*.tgz
+          pushd varnish-*/
           ./autogen.sh
           CC='${{ matrix.cc }}' ./configure
           make -sj32
diff --git a/Dockerfile b/Dockerfile
@@ -45,9 +45,11 @@ RUN apt update \
     && apt clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN git clone https://github.com/varnishcache/varnish-cache.git /tmp/varnish \
-    && cd /tmp/varnish \
-    && git submodule update --init \
+RUN cd /tmp \
+    && wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-8.0.0.tgz \
+    && tar zxvf varnish-*.tgz \
+    && rm -f varnish-*.tgz \
+    && cd varnish-* \
     && ./autogen.sh \
     && ./configure \
     && make \
diff --git a/README.rst b/README.rst
@@ -1,8 +1,8 @@
 
-.. image:: https://github.com/carlosabalde/libvmod-cfg/actions/workflows/main.yml/badge.svg?branch=main
+.. image:: https://github.com/carlosabalde/libvmod-cfg/actions/workflows/main.yml/badge.svg?branch=8.0
    :alt: GitHub Actions CI badge
    :target: https://github.com/carlosabalde/libvmod-cfg/actions
-.. image:: https://codecov.io/gh/carlosabalde/libvmod-cfg/branch/main/graph/badge.svg
+.. image:: https://codecov.io/gh/carlosabalde/libvmod-cfg/branch/8.0/graph/badge.svg
    :alt: Codecov badge
    :target: https://codecov.io/gh/carlosabalde/libvmod-cfg
 
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT([libvmod-cfg], [trunk], [], [vmod-cfg])
+AC_INIT([libvmod-cfg], [20.0], [], [vmod-cfg])
 AC_COPYRIGHT([Copyright (c) Carlos Abalde <carlos.abalde@gmail.com>])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod_cfg.vcc)
@@ -94,7 +94,7 @@ fi
 
 m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
 
-#VARNISH_PREREQ([5.0], [5.1])
+VARNISH_PREREQ([8.0], [8.1])
 VARNISH_VMODS([cfg])
 
 VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,207 @@
+libvmod-cfg (20.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 8.0.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Mon, 15 Sep 2025 16:00:00 +0200
+
+libvmod-cfg (19.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 7.7.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Tue, 18 Mar 2025 16:00:00 +0100
+
+libvmod-cfg (18.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 7.6.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 13 Sep 2024 16:00:00 +0200
+
+libvmod-cfg (17.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 7.5.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Tue, 19 Mar 2024 16:00:00 +0100
+
+libvmod-cfg (16.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 7.4.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 15 Sep 2023 16:00:00 +0200
+
+libvmod-cfg (15.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 7.3.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Wed, 15 Mar 2023 16:00:00 +0100
+
+libvmod-cfg (14.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 7.2.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Thu, 15 Sep 2022 16:00:00 +0200
+
+libvmod-cfg (13.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 7.1.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Tue, 15 Mar 2022 16:00:00 +0100
+
+libvmod-cfg (12.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 7.0.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Wed, 15 Sep 2021 16:00:00 +0200
+
+libvmod-cfg (11.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 6.6.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Mon, 15 Mar 2021 16:00:00 +0100
+
+libvmod-cfg (10.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 6.5.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Tue, 15 Sep 2020 16:00:00 +0200
+
+libvmod-cfg (9.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 6.4.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 20 Mar 2020 16:00:00 +0100
+
+libvmod-cfg (8.2-1) stable; urgency=low
+
+  * Add inspect() support for files, rules & scripts
+  * Add VRT_FlushThreadCache() support (Varnish Enterprise)
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 14 Feb 2020 16:00:00 +0100
+
+libvmod-cfg (8.1-1) stable; urgency=low
+
+  * Fixed error in new_remote() when https URLs are used
+  * Added some Linux Alpine fixes
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Mon, 11 Nov 2019 16:00:00 +0100
+
+libvmod-cfg (8.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 6.3.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Mon, 30 Sep 2019 16:00:00 +0200
+
+libvmod-cfg (7.3-1) stable; urgency=low
+
+  * Added support for execution of ECMAScript scripts
+  * Added support for loading of arbitrary Lua extensions
+  * Added 'varnish.engine' & 'varnish.shared' helpers
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Mon, 29 Jul 2019 16:00:00 +0200
+
+libvmod-cfg (7.2-1) stable; urgency=low
+
+  * Fixed error in check_remote() when backup file can't be opened
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Mon, 27 May 2019 16:00:00 +0200
+
+libvmod-cfg (7.1-1) stable; urgency=low
+
+  * Added backup feature
+  * Added varnish.get_header() & varnish.set_header() Lua helpers
+  * Added varnish.regmatch(), varnish.regsub() & varnish.regsuball() Lua helpers
+  * Added 'engines.current' & 'regexps.current' metrics to stats
+  * Updated cJSON & inih dependencies
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Wed, 15 May 2019 16:00:00 +0200
+
+libvmod-cfg (7.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 6.2.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Mon, 18 Mar 2019 16:00:00 +0100
+
+libvmod-cfg (6.3-1) stable; urgency=low
+
+  * Triggered 'thread.tcache.flush' also on LuaJIT executions
+  * Added Lua / LuaJIT memory consumption to stats
+  * Added Lua 5.2 & 5.3 support to build system
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Thu, 25 Oct 2018 16:00:00 +0200
+
+libvmod-cfg (6.2-1) stable; urgency=low
+
+  * Flushed 'thread.tcache.flush' on Lua (not LuaJIT) script executions
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Tue, 16 Oct 2018 16:00:00 +0200
+
+libvmod-cfg (6.1-1) stable; urgency=low
+
+  * Added new parameter 'prefix' to .dump() methods
+  * Linked against LuaJIT when possible
+  * Added new parameter 'gc_collect' to .execute() method
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Sat, 13 Oct 2018 16:00:00 +0200
+
+libvmod-cfg (6.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 6.1.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Tue, 18 Sep 2018 16:00:00 +0200
+
+libvmod-cfg (5.2-1) stable; urgency=low
+
+  * Increased INI_MAX_LINE from 2KB to 16KB
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Tue, 07 Aug 2018 16:00:00 +0200
+
+libvmod-cfg (5.1-1) stable; urgency=low
+
+  * Added cfg.rules()
+  * Added cfg.script()
+  * Added stream option to .dump() methods
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Wed, 27 Jun 2018 16:00:00 +0200
+
+libvmod-cfg (5.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 6.0.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Thu, 15 Mar 2018 16:00:00 +0100
+
+libvmod-cfg (4.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 5.2.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 15 Sep 2017 16:00:00 +0200
+
+libvmod-cfg (3.1-1) stable; urgency=low
+
+  * Added JSON support
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 25 Aug 2017 16:00:00 +0200
+
+libvmod-cfg (3.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 5.1.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 17 Mar 2017 16:00:00 +0100
+
+libvmod-cfg (2.0-1) stable; urgency=low
+
+  * Migrated to Varnish Cache 5.0.x
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 17 Mar 2017 16:00:00 +0100
+
+libvmod-cfg (1.3-1) stable; urgency=low
+
+  * Fixed bug reading files from disk
+  * Added reporting of error code when failed to parse .ini files
+  * Updated .ini parser
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Thu, 02 Feb 2017 16:00:00 +0100
+
+libvmod-cfg (1.2-1) stable; urgency=low
+
+  * Initial version
+
+ -- Carlos Abalde <carlos.abalde@gmail.com>  Fri, 16 Sep 2016 16:00:00 +0200
diff --git a/debian/compat b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
@@ -0,0 +1,20 @@
+Source: libvmod-cfg
+Section: web
+Priority: extra
+Maintainer: Carlos Abalde <carlos.abalde@gmail.com>
+Build-Depends: debhelper (>= 7),
+ build-essential,
+ pkg-config,
+ python-docutils | python3-docutils,
+ varnish (>= 8.0.0),
+ libvarnishapi-dev (>= 8.0.0),
+ libcurl4-gnutls-dev,
+ libluajit-5.1-dev,
+ libjemalloc-dev,
+ vim-common
+Standards-Version: 3.8.1
+
+Package: libvmod-cfg
+Architecture: any
+Depends: varnish (>= 8.0.0), libcurl3-gnutls, libluajit-5.1-2, ${shlibs:Depends}, ${misc:Depends}, ${Varnish:ABI}
+Description: Config VMOD for Varnish
diff --git a/debian/copyright b/debian/copyright
@@ -0,0 +1,8 @@
+Copyright:
+
+    Copyright Carlos Abalde
+
+License:
+
+You're free to use and distribute this under terms in the
+LICENSE file.
diff --git a/debian/dirs b/debian/dirs
@@ -0,0 +1 @@
+usr/share/doc/libvmod-cfg
diff --git a/debian/docs b/debian/docs
@@ -0,0 +1,2 @@
+README.rst
+LICENSE
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+export DH_VERBOSE=1
+
+override_dh_gencontrol:
+	if [ -n "$$DEBIAN_OVERRIDE_BINARY_VERSION" ]; then \
+		dh_gencontrol -- -v$$DEBIAN_OVERRIDE_BINARY_VERSION; \
+	else \
+		dh_gencontrol ; \
+	fi
+
+%:
+	dh $@
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,14 +14,13 @@
 
 version: '3.7'
 
-name: libvmod-cfg-main
+name: libvmod-cfg-8_0
 
 services:
   dev:
     hostname: dev
     build:
       context: .
-      no_cache: true
     privileged: true
     environment:
       HOST_UID: ${UID:?}
diff --git a/redhat/vmod-cfg.spec b/redhat/vmod-cfg.spec
