[7.7] 71fc9d211 Prepare for 7.7.0

[Walid Boudebouda]

commit 71fc9d211c471106e4be590f3816a56ba156a833
Author: Walid Boudebouda <walid.boudebouda at gmail.com>
Date:   Mon Mar 17 10:27:43 2025 +0100

    Prepare for 7.7.0

diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
index 635b3f0aa..22bd4ba71 100644
--- a/bin/varnishtest/tests/m00003.vtc
+++ b/bin/varnishtest/tests/m00003.vtc
@@ -96,7 +96,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so "\x03"
 varnish v1 -errvcl {VMOD wants ABI version 1.0} { import wrong; }
 
 #############################################################
-# NB: in the tests below "20" should track VRT_MAJOR_VERSION
+# NB: in the tests below "21" should track VRT_MAJOR_VERSION
 
 filewrite ${tmpdir}/libvmod_wrong.so "VMOD_JSON_SPEC\x02"
 filewrite -a ${tmpdir}/libvmod_wrong.so {
@@ -108,7 +108,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_wrong_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "20",
+	    "21",
 	    "0"
 	], [
 	    "$FOOBAR"
@@ -128,7 +128,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_wrong_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "20",
+	    "21",
 	    "0"
 	]
     ]
@@ -146,7 +146,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_wrong_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "20",
+	    "21",
 	    "0"
 	], [
 	    "$CPROTO"
@@ -168,7 +168,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_std_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "20",
+	    "21",
 	    "0"
 	], [
 	    "$CPROTO", "/* blabla */"
diff --git a/bin/varnishtest/tests/m00055.vtc b/bin/varnishtest/tests/m00055.vtc
index 7d17010aa..7c4c70342 100644
--- a/bin/varnishtest/tests/m00055.vtc
+++ b/bin/varnishtest/tests/m00055.vtc
@@ -21,7 +21,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_wrong_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "20",
+	    "21",
 	    "0"
 	],
 	[
diff --git a/configure.ac b/configure.ac
index 8e683eb02..e2779521f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 AC_PREREQ([2.69])
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
-Copyright (c) 2006-2024 Varnish Software
-Copyright 2010-2024 UPLEX - Nils Goroll Systemoptimierung])
+Copyright (c) 2006-2025 Varnish Software
+Copyright 2010-2025 UPLEX - Nils Goroll Systemoptimierung])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [trunk], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [7.7.0], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/changes.rst b/doc/changes.rst
index 35a15d8bc..61ee71669 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -35,7 +35,7 @@ individual releases. These documents are updated as part of the
 release process.
 
 ==============================
-Varnish-Cache 7.7 (2025-03-15)
+Varnish-Cache 7.7 (2025-03-17)
 ==============================
 
 .. PLEASE keep this roughly in commit order as shown by git-log / tig
diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index 489910406..59678cebf 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -40,9 +40,9 @@ Conventions used in this manual include:
 Longer listings like example command output and VCL look like this::
 
     $ /opt/varnish/sbin/varnishd -V
-    varnishd (varnish-7.5.0 revision 1234567)
+    varnishd (varnish-7.7.0 revision 1234567)
     Copyright (c) 2006 Verdens Gang AS
-    Copyright (c) 2006-2024 Varnish Software
+    Copyright (c) 2006-2025 Varnish Software
 
 
 .. For maintainers:
diff --git a/include/vrt.h b/include/vrt.h
index 1f3c6d400..49e3f5960 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -46,9 +46,9 @@
 #  error "include vdef.h before vrt.h"
 #endif
 
-#define VRT_MAJOR_VERSION	20U
+#define VRT_MAJOR_VERSION	21U
 
-#define VRT_MINOR_VERSION	1U
+#define VRT_MINOR_VERSION	0U
 
 /***********************************************************************
  * Major and minor VRT API versions.
@@ -57,7 +57,7 @@
  * Whenever something is deleted or changed in a way which is not
  * binary/load-time compatible, increment MAJOR version
  *
- * NEXT (2025-03-15)
+ * 21.0 (2025-03-17)
  *	VRT_u_req_grace() added
  *	VRT_u_req_ttl() added
  *	VRT_r_req_filters() added
diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c
index 4f5983c0d..651e739f6 100644
--- a/lib/libvarnish/version.c
+++ b/lib/libvarnish/version.c
@@ -76,8 +76,8 @@ VCS_String(const char *which)
 		    ")"
 		    "\n"
 		    "Copyright (c) 2006 Verdens Gang AS\n"
-		    "Copyright (c) 2006-2024 Varnish Software\n"
-		    "Copyright 2010-2024 UPLEX - Nils Goroll Systemoptimierung\n"
+		    "Copyright (c) 2006-2025 Varnish Software\n"
+		    "Copyright 2010-2025 UPLEX - Nils Goroll Systemoptimierung\n"
 		);
 	default:
 		WRONG("Wrong argument to VCS_String");