configure.ac, config: Change supported config versions to work based …

…on PACKAGE_VERSION For git this means 0.0.0, but the supported versions still include hardcoded 2.4.0 / 3.0.0, which can be used.
dovecot · Nov 8, 2024 · a432da6 · a432da6
1 parent 14132fb
commit a432da6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -264,16 +264,16 @@ AM_ICONV
 # SIZE_MAX is missing without this
 CXXFLAGS="$CXXFLAGS -D__STDC_LIMIT_MACROS"
 
+# Use the first x.y.z numbers of the version.
+DOVECOT_CONFIG_VERSION=$(echo "$PACKAGE_VERSION" | sed 's/^\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
 if test "$is_pro_build" = "yes"; then
   SET_PRO_DEFINES
-  DOVECOT_CONFIG_VERSION=3.0.0
   AC_SUBST(DOVECOT_ASSET_URL, "doc.dovecotpro.com")
   AC_SUBST(DOVECOT_PRO_BUILD, 1)
 else
   AC_DEFINE_UNQUOTED(DOVECOT_NAME, "$PACKAGE_NAME", [Dovecot name])
   AC_SUBST(DOVECOT_ASSET_URL, "doc.dovecot.org")
   AC_SUBST(DOVECOT_PRO_BUILD, 0)
-  DOVECOT_CONFIG_VERSION=2.4.0
 fi
 AC_DEFINE_UNQUOTED(DOVECOT_CONFIG_VERSION, "$DOVECOT_CONFIG_VERSION", [Dovecot configuration version])
 AC_SUBST(DOVECOT_CONFIG_VERSION)

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
@@ -1367,10 +1367,21 @@ config_parser_check_warnings(struct config_parser_context *ctx, const char *key)
 
 static bool config_version_find(const char *version, const char **error_r)
 {
+	const char *const supported_versions[] = {
+#ifdef DOVECOT_PRO_EDITION
+		"3.0.0",
+		DOVECOT_CONFIG_VERSION,
+#else
+		"2.4.0",
+		DOVECOT_CONFIG_VERSION,
+#endif
+		NULL
+	};
 	/* FIXME: implement full version checking later */
-	if (strcmp(version, DOVECOT_CONFIG_VERSION) != 0) {
-		*error_r = t_strdup_printf("Only '%s' is supported currently",
-					   DOVECOT_CONFIG_VERSION);
+	if (!str_array_find(supported_versions, version)) {
+		*error_r = t_strdup_printf(
+			"Currently supported versions are: %s",
+			t_strarray_join(supported_versions, " "));
 		return FALSE;
 	}
 	return TRUE;