Browse code

Drop "rc2" from version string for 0.103.0 release

Remove the "-rc2" from the version string.
Also bump FLEVEL from 120 -> 121.

Also fixes two issues:
- The VERSION_SUFFIX defined by clamav-config.h.cmake.in must be defined
with #define instead of #cmakedefine, so it is defined as an empty
string even if there is no suffix (eg for an actual release)
- Removed a bashism in the libcheck detection code for autotools,
resolving https://bugzilla.clamav.net/show_bug.cgi?id=12598

Micah Snyder authored on 2020/09/04 04:00:34
Showing 12 changed files
... ...
@@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
12 12
 #  For release candidate:     set(VERSION_SUFFIX "-rc")
13 13
 #  For release:               set(VERSION_SUFFIX "")
14 14
 string(TIMESTAMP TODAY "%Y%m%d")
15
-set(VERSION_SUFFIX "-rc2")
15
+set(VERSION_SUFFIX "")
16 16
 
17 17
 project( ClamAV
18 18
          VERSION "0.103.0"
... ...
@@ -7,7 +7,7 @@ properties(
7 7
                        defaultValue: "${env.BRANCH_NAME}",
8 8
                        description: 'clamav-devel branch'),
9 9
                 string(name: 'VERSION',
10
-                       defaultValue: '0.103.0-rc2',
10
+                       defaultValue: '0.103.0',
11 11
                        description: 'ClamAV version string'),
12 12
                 string(name: 'BUILD_BRANCH',
13 13
                        defaultValue: 'build-0.103',
... ...
@@ -524,7 +524,7 @@
524 524
 #cmakedefine VERSION "@PACKAGE_VERSION@"
525 525
 
526 526
 /* Version suffix for package */
527
-#cmakedefine VERSION_SUFFIX "@VERSION_SUFFIX@"
527
+#define VERSION_SUFFIX "@VERSION_SUFFIX@"
528 528
 
529 529
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
530 530
    significant byte first (like Motorola and SPARC, unlike Intel). */
... ...
@@ -22,7 +22,7 @@ AC_PREREQ([2.59])
22 22
 
23 23
 dnl For a release change [devel] to the real version [0.xy]
24 24
 dnl also change VERSION below
25
-AC_INIT([ClamAV], [0.103.0-rc2], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
25
+AC_INIT([ClamAV], [0.103.0], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
26 26
 
27 27
 dnl put configure auxiliary into config
28 28
 AC_CONFIG_AUX_DIR([config])
... ...
@@ -72,7 +72,7 @@
72 72
  * in re-enabling affected modules.
73 73
  */
74 74
 
75
-#define CL_FLEVEL 120
75
+#define CL_FLEVEL 121
76 76
 #define CL_FLEVEL_DCONF CL_FLEVEL
77 77
 #define CL_FLEVEL_SIGTOOL CL_FLEVEL
78 78
 
... ...
@@ -7,7 +7,7 @@ if test "$enable_check_ut" != "no" ; then
7 7
 
8 8
 PKG_CHECK_MODULES(CHECK, [check], [HAVE_LIBCHECK=yes], [HAVE_LIBCHECK=])
9 9
 
10
-if test "X$HAVE_LIBCHECK" == "Xyes"; then
10
+if test "X$HAVE_LIBCHECK" = "Xyes"; then
11 11
     CHECK_CPPFLAGS=$CHECK_CFLAGS
12 12
 else
13 13
 
... ...
@@ -3,7 +3,7 @@ dnl During active development, set: VERSION="<version>-devel-`date +%Y%m%d`"
3 3
 dnl For beta,                  set: VERSION="<version>-beta"
4 4
 dnl For release candidate,     set: VERSION="<version>-rc"
5 5
 dnl For release,               set: VERSION="<version>"
6
-VERSION="0.103.0-rc2"
6
+VERSION="0.103.0"
7 7
 
8 8
 major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"`
9 9
 minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/[^0-9]//g"`
... ...
@@ -20,7 +20,7 @@ UninstallDisplayName=ClamAV
20 20
 Compression=lzma2
21 21
 SolidCompression=yes
22 22
 OutputDir=.
23
-OutputBaseFilename=ClamAV-0.103.0-rc2
23
+OutputBaseFilename=ClamAV-0.103.0
24 24
 WizardImageFile=demon.bmp
25 25
 WizardSmallImageFile=talos.bmp
26 26
 
... ...
@@ -480,7 +480,7 @@
480 480
 #define PACKAGE_NAME "ClamAV"
481 481
 
482 482
 /* Define to the full name and version of this package. */
483
-#define PACKAGE_STRING "ClamAV 0.103.0-rc2"
483
+#define PACKAGE_STRING "ClamAV 0.103.0"
484 484
 
485 485
 /* Define to the one symbol short name of this package. */
486 486
 #define PACKAGE_TARNAME "clamav"
... ...
@@ -489,7 +489,7 @@
489 489
 #define PACKAGE_URL "https://www.clamav.net/"
490 490
 
491 491
 /* Define to the version of this package. */
492
-#define PACKAGE_VERSION "0.103.0-rc2"
492
+#define PACKAGE_VERSION "0.103.0"
493 493
 
494 494
 /* scan buffer size */
495 495
 #define SCANBUFF 131072
... ...
@@ -525,7 +525,7 @@
525 525
 /* #undef USE_SYSLOG */
526 526
 
527 527
 /* Version number of package */
528
-#define VERSION "0.103.0-rc2"
528
+#define VERSION "0.103.0"
529 529
 
530 530
 /* Version suffix for package */
531 531
 #define VERSION_SUFFIX ""
... ...
@@ -27,7 +27,7 @@
27 27
  * @macro
28 28
  * Version number of the clamav package release
29 29
  */
30
-#define CLAMAV_VERSION "0.103.0-rc2"
30
+#define CLAMAV_VERSION "0.103.0"
31 31
 
32 32
 /**
33 33
  * @macro
... ...
@@ -7,7 +7,7 @@
7 7
 #endif
8 8
 
9 9
 #define RES_VER_Q 0,103,0,0
10
-#define RES_VER_S "ClamAV 0.103.0-rc2"
10
+#define RES_VER_S "ClamAV 0.103.0"
11 11
 
12 12
 VS_VERSION_INFO VERSIONINFO
13 13
     FILEVERSION RES_VER_Q
... ...
@@ -180,10 +180,10 @@ my %CONF = (
180 180
     'PACKAGE' => 'PACKAGE_NAME',
181 181
     'PACKAGE_BUGREPORT' => '"https://bugzilla.clamav.net/"',
182 182
     'PACKAGE_NAME' => '"ClamAV"',
183
-    'PACKAGE_STRING' => '"ClamAV 0.103.0-rc2"',
183
+    'PACKAGE_STRING' => '"ClamAV 0.103.0"',
184 184
     'PACKAGE_TARNAME' => '"clamav"',
185 185
     'PACKAGE_URL' => '"https://www.clamav.net/"',
186
-    'PACKAGE_VERSION' => '"0.103.0-rc2"',
186
+    'PACKAGE_VERSION' => '"0.103.0"',
187 187
     'SCANBUFF' => '131072',
188 188
     'SETPGRP_VOID' => '1',
189 189
     'SIZEOF_INT' => '4',