From c135ad25b839f1a5f0ca506528f77f5c21f26d80 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 2 Mar 2025 15:50:50 +0100 Subject: [PATCH] Set an empty GDAL_RELEASE_NICKNAME by default Not that the previous default has to be denied in any way, but there are serious concerns that it could cause high collateral damage and endanger people doing good. --- gcore/gdal_misc.cpp | 4 ++-- gcore/gdal_version.h.in | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcore/gdal_misc.cpp b/gcore/gdal_misc.cpp index 06ecf3d43eac..7af39a40195f 100644 --- a/gcore/gdal_misc.cpp +++ b/gcore/gdal_misc.cpp @@ -2837,7 +2837,7 @@ int CPL_STDCALL GDALWriteWorldFile(const char *pszBaseFilename, * string. i.e. "20230312". *
  • "RELEASE_NAME": Returns the GDAL_RELEASE_NAME. ie. "3.6.3"
  • *
  • "RELEASE_NICKNAME": (>= 3.11) Returns the GDAL_RELEASE_NICKNAME. - * i.e. "Trans rights are human rights"
  • + * (may be empty) *
  • "--version": Returns one line version message suitable for * use in response to --version requests. i.e. "GDAL 3.6.3, released * 2023/03/12"
  • @@ -3002,7 +3002,7 @@ const char *CPL_STDCALL GDALVersionInfo(const char *pszRequest) else if (EQUAL(pszRequest, "RELEASE_NAME")) osVersionInfo.Printf(GDAL_RELEASE_NAME); else if (EQUAL(pszRequest, "RELEASE_NICKNAME")) - osVersionInfo.Printf(GDAL_RELEASE_NICKNAME); + osVersionInfo.Printf("%s", GDAL_RELEASE_NICKNAME); else // --version { osVersionInfo.Printf( diff --git a/gcore/gdal_version.h.in b/gcore/gdal_version.h.in index 6cbd3885139f..afe50ead06e8 100644 --- a/gcore/gdal_version.h.in +++ b/gcore/gdal_version.h.in @@ -29,6 +29,8 @@ # define GDAL_RELEASE_NAME "3.11.0dev" #endif -#define GDAL_RELEASE_NICKNAME "Trans rights are human rights" +#ifndef GDAL_RELEASE_NICKNAME +#define GDAL_RELEASE_NICKNAME "" +#endif #endif