Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 10:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Version increment from 0.102 -> 0.103.

Browse source 
Bumps the version from 0.102.0 to 0.103.0-devel-<date>.
Bumps the FLEVEL from 111 to 120.
Bumps the libclamav and libfreshclam revision numbers from 4 -> 5, and 0 -> 1, respectively.
This commit is contained in:
Micah Snyder 2019-10-03 18:32:41 -04:00
parent 8925c55dfc
commit d4a9a760fc
13 changed files with 69 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Jenkinsfile vendored
View file

@ -7,31 +7,31 @@ properties(
defaultValue: "${env.BRANCH_NAME}",
description: 'clamav-devel branch'),
string(name: 'VERSION',
defaultValue: '0.102.0',
defaultValue: '0.103.0-devel',
description: 'ClamAV version string'),
string(name: 'BUILD_BRANCH',
defaultValue: 'build-0.102',
defaultValue: 'build-0.103',
description: 'build-acceptance branch'),
string(name: 'BUILD_ENGINE_BRANCH',
defaultValue: 'master',
description: 'build-acceptance engine branch'),
string(name: 'TEST_BRANCH',
defaultValue: 'dev/0.102',
defaultValue: 'dev/0.103',
description: 'tests branch'),
string(name: 'REGULAR_PIPELINE',
defaultValue: 'regular-scripted-chain-0.102',
defaultValue: 'regular-scripted-chain-0.103',
description: 'test-pipelines branch for regular tests.'),
string(name: 'CUSTOM_PIPELINE',
defaultValue: 'custom-scripted-chain-0.102',
defaultValue: 'custom-scripted-chain-0.103',
description: 'test-pipelines branch for custom tests'),
string(name: 'FUZZ_PIPELINE',
defaultValue: 'fuzz-regression-chain-0.102',
defaultValue: 'fuzz-regression-chain-0.103',
description: 'test-pipelines branch for fuzz regression tests'),
string(name: 'FUZZ_BRANCH',
defaultValue: 'master',
description: 'private-fuzz-corpus branch'),
string(name: 'FUZZ_TEST_BRANCH',
defaultValue: 'dev/0.102',
defaultValue: 'dev/0.103',
description: 'tests-fuzz-regression branch')
]
)

4
Makefile.in
View file

@ -326,8 +326,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \
$(top_srcdir)/docs/man/sigtool.1.in \
$(top_srcdir)/libclammspack/config.h.in COPYING config/ar-lib \
config/compile config/config.guess config/config.rpath \
config/config.sub config/depcomp config/install-sh \
config/ltmain.sh config/missing config/ylwrap
config/config.sub config/install-sh config/ltmain.sh \
config/missing config/ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)

20
NEWS.md
View file

@ -3,6 +3,26 @@
Note: This file refers to the source tarball. Things described here may differ
slightly from the binary packages.
## 0.103.0
ClamAV 0.103.0 includes the following improvements and changes.
### Major changes
### Notable changes
### Other improvements
### Bug fixes
### New Requirements
### Acknowledgements
The ClamAV team thanks the following individuals for their code submissions:
-
## 0.102.0
ClamAV 0.102.0 includes an assortment improvements and a couple of significant

26
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for ClamAV 0.102.0.
# Generated by GNU Autoconf 2.69 for ClamAV 0.103.0-devel.
#
# Report bugs to <https://bugzilla.clamav.net/>.
#
@ -592,8 +592,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ClamAV'
PACKAGE_TARNAME='clamav'
PACKAGE_VERSION='0.102.0'
PACKAGE_STRING='ClamAV 0.102.0'
PACKAGE_VERSION='0.103.0-devel'
PACKAGE_STRING='ClamAV 0.103.0-devel'
PACKAGE_BUGREPORT='https://bugzilla.clamav.net/'
PACKAGE_URL='https://www.clamav.net/'
@ -1600,7 +1600,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ClamAV 0.102.0 to adapt to many kinds of systems.
\`configure' configures ClamAV 0.103.0-devel to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1681,7 +1681,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ClamAV 0.102.0:";;
short | recursive ) echo "Configuration of ClamAV 0.103.0-devel:";;
esac
cat <<\_ACEOF
--enable-dependency-tracking
@ -1908,7 +1908,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ClamAV configure 0.102.0
ClamAV configure 0.103.0-devel
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2536,7 +2536,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ClamAV $as_me 0.102.0, which was
It was created by ClamAV $as_me 0.103.0-devel, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -4323,7 +4323,7 @@ fi
# Define the identity of the package.
PACKAGE='clamav'
VERSION='0.102.0'
VERSION='0.103.0-devel'
# Some tools Automake needs.
@ -6052,7 +6052,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
VERSION="0.102.0"
VERSION="0.103.0-devel-`date +%Y%m%d`"
major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/^0-9//g"`
minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/^0-9//g"`
@ -31574,7 +31574,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ClamAV $as_me 0.102.0, which was
This file was extended by ClamAV $as_me 0.103.0-devel, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -31641,7 +31641,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ClamAV config.status 0.102.0
ClamAV config.status 0.103.0-devel
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -34492,7 +34492,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ClamAV $as_me 0.102.0, which was
This file was extended by ClamAV $as_me 0.103.0-devel, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -34559,7 +34559,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ClamAV config.status 0.102.0
ClamAV config.status 0.103.0-devel
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
configure.ac
View file

@ -22,7 +22,7 @@ AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
AC_INIT([ClamAV], [0.102.0], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
AC_INIT([ClamAV], [0.103.0-devel], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
dnl put configure auxiliary into config
AC_CONFIG_AUX_DIR([config])

9
libclamav/bytecode_api.h
View file

@ -135,10 +135,17 @@ enum FunctionalityLevels {
FUNC_LEVEL_0101_BETA = 100, /**< LibClamAV release 0.101.0-BETA */
FUNC_LEVEL_0101 = 101, /**< LibClamAV release 0.101.0 */
FUNC_LEVEL_0101_1 = 102, /**< LibClamAV release 0.101.1 */
FUNC_LEVEL_0101_2 = 103, /**< LibClamAV release 0.101.2 */
FUNC_LEVEL_0101_2 = 102, /**< LibClamAV release 0.101.2 */
FUNC_LEVEL_0101_3 = 102, /**< LibClamAV release 0.101.3 */
FUNC_LEVEL_0101_4 = 105, /**< LibClamAV release 0.101.4 */
FUNC_LEVEL_0101_5 = 106, /**< LibClamAV release 0.101.5 */
FUNC_LEVEL_0102_BETA = 110, /**< LibClamAV release 0.102.0-BETA */
FUNC_LEVEL_0102 = 111, /**< LibClamAV release 0.102.0 */
FUNC_LEVEL_0102_1 = 112, /**< LibClamAV release 0.102.1 */
FUNC_LEVEL_0103_BETA = 120, /**< LibClamAV release 0.103.0-BETA */
FUNC_LEVEL_0103 = 121, /**< LibClamAV release 0.103.0 */
};
/**

2
libclamav/others.h
View file

@ -71,7 +71,7 @@
* in re-enabling affected modules.
*/
#define CL_FLEVEL 111
#define CL_FLEVEL 120
#define CL_FLEVEL_DCONF CL_FLEVEL
#define CL_FLEVEL_SIGTOOL CL_FLEVEL

11
m4/reorganization/version.m4
View file

@ -1,6 +1,9 @@
dnl change this on a release
dnl VERSION="devel-`date +%Y%m%d`"
VERSION="0.102.0"
dnl During active development, set: VERSION="<version>-devel-`date +%Y%m%d`"
dnl For beta, set: VERSION="<version>-beta"
dnl For release candidate, set: VERSION="<version>-rc"
dnl For release, set: VERSION="<version>"
VERSION="0.103.0-devel-`date +%Y%m%d`"
major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"`
minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/[^0-9]//g"`
@ -11,7 +14,7 @@ AC_SUBST(PACKAGE_VERSION_NUM)
dnl libclamav version info
LC_CURRENT=9
LC_REVISION=4
LC_REVISION=5
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
@ -25,7 +28,7 @@ AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $LC_MAJOR, ["Major clamav library versi
dnl libfreshclam version info
LFC_CURRENT=2
LFC_REVISION=0
LFC_REVISION=1
LFC_AGE=0
LIBFRESHCLAM_VERSION="$LFC_CURRENT":"$LFC_REVISION":"$LFC_AGE"
AC_SUBST([LIBFRESHCLAM_VERSION])

4
win32/ClamAV-Installer.iss
View file

@ -8,7 +8,7 @@
[Setup]
AppName=ClamAV
AppVersion=0.102.0
AppVersion=0.103.0
DefaultDirName={pf}\ClamAV
DefaultGroupName=ClamAV
AppCopyright=2019 Cisco Systems, Inc.
@ -20,7 +20,7 @@ UninstallDisplayName=ClamAV
Compression=lzma2
SolidCompression=yes
OutputDir=.
OutputBaseFilename=ClamAV-0.102.0
OutputBaseFilename=ClamAV-0.103.0-devel
WizardImageFile=demon.bmp
WizardSmallImageFile=talos.bmp

6
win32/clamav-config.h
View file

@ -483,7 +483,7 @@
#define PACKAGE_NAME "ClamAV"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "ClamAV 0.102.0"
#define PACKAGE_STRING "ClamAV 0.103.0-devel"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "clamav"
@ -492,7 +492,7 @@
#define PACKAGE_URL "https://www.clamav.net/"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.102.0"
#define PACKAGE_VERSION "0.103.0-devel"
/* scan buffer size */
#define SCANBUFF 131072
@ -528,7 +528,7 @@
/* #undef USE_SYSLOG */
/* Version number of package */
#define VERSION "0.102.0"
#define VERSION "0.103.0-devel"
/* Version suffix for package */
#define VERSION_SUFFIX ""

2
win32/clamav-version.h
View file

@ -27,7 +27,7 @@
* @macro
* Version number of the clamav package release
*/
#define CLAMAV_VERSION "0.102.0"
#define CLAMAV_VERSION "0.103.0-devel"
/**
* @macro

4
win32/res/common.rc
View file

@ -6,8 +6,8 @@
#define REPO_VERSION VERSION
#endif
#define RES_VER_Q 0,102,0,0
#define RES_VER_S "ClamAV 0.102.0"
#define RES_VER_Q 0,103,0,0
#define RES_VER_S "ClamAV 0.103.0-devel"
VS_VERSION_INFO VERSIONINFO
FILEVERSION RES_VER_Q

4
win32/update-win32.pl
View file

@ -181,10 +181,10 @@ my %CONF = (
'PACKAGE' => 'PACKAGE_NAME',
'PACKAGE_BUGREPORT' => '"https://bugzilla.clamav.net/"',
'PACKAGE_NAME' => '"ClamAV"',
'PACKAGE_STRING' => '"ClamAV 0.102.0-devel"',
'PACKAGE_STRING' => '"ClamAV 0.103.0-devel"',
'PACKAGE_TARNAME' => '"clamav"',
'PACKAGE_URL' => '"https://www.clamav.net/"',
'PACKAGE_VERSION' => '"0.102.0-devel"',
'PACKAGE_VERSION' => '"0.103.0-devel"',
'SCANBUFF' => '131072',
'SETPGRP_VOID' => '1',
'SIZEOF_INT' => '4',