Skip to content

Commit

Permalink
Bumped version number to 0.101.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
micahsnyder committed Jul 12, 2019
1 parent 5e0e479 commit 7f92726
Show file tree
Hide file tree
Showing 9 changed files with 97 additions and 86 deletions.
109 changes: 60 additions & 49 deletions NEWS.md

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for ClamAV 0.101.2.
# Generated by GNU Autoconf 2.69 for ClamAV 0.101.3.
#
# Report bugs to <https://bugzilla.clamav.net/>.
#
Expand Down Expand Up @@ -592,8 +592,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ClamAV'
PACKAGE_TARNAME='clamav'
PACKAGE_VERSION='0.101.2'
PACKAGE_STRING='ClamAV 0.101.2'
PACKAGE_VERSION='0.101.3'
PACKAGE_STRING='ClamAV 0.101.3'
PACKAGE_BUGREPORT='https://bugzilla.clamav.net/'
PACKAGE_URL='https://www.clamav.net/'

Expand Down Expand Up @@ -1558,7 +1558,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.101.2 to adapt to many kinds of systems.
\`configure' configures ClamAV 0.101.3 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1629,7 +1629,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ClamAV 0.101.2:";;
short | recursive ) echo "Configuration of ClamAV 0.101.3:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1854,7 +1854,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ClamAV configure 0.101.2
ClamAV configure 0.101.3
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2444,7 +2444,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.101.2, which was
It was created by ClamAV $as_me 0.101.3, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -4201,7 +4201,7 @@ fi

# Define the identity of the package.
PACKAGE='clamav'
VERSION='0.101.2'
VERSION='0.101.3'


# Some tools Automake needs.
Expand Down Expand Up @@ -5929,7 +5929,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }



VERSION="0.101.2"
VERSION="0.101.3"

LC_CURRENT=9
LC_REVISION=2
Expand Down Expand Up @@ -29986,7 +29986,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.101.2, which was
This file was extended by ClamAV $as_me 0.101.3, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -30053,7 +30053,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.101.2
ClamAV config.status 0.101.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down Expand Up @@ -32875,7 +32875,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.101.2, which was
This file was extended by ClamAV $as_me 0.101.3, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -32942,7 +32942,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.101.2
ClamAV config.status 0.101.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Expand Up @@ -22,7 +22,7 @@ dnl MA 02110-1301, USA.
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.101.2], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
AC_INIT([ClamAV], [0.101.3], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])

dnl enable C++
AC_PROG_CXX()
Expand Down Expand Up @@ -252,7 +252,7 @@ else
if test "X$have_curl" != "Xyes" && test "X$have_json" != "Xyes"; then
CL_MSG_STATUS([clamsubmit ], [no (missing libjson-c-dev AND libcurl-devel. Use the website to submit FPs/FNs.)], [no])
else
if test "X$have_curl" = "Xyes"; then
if test "X$have_curl" = "Xyes"; then
CL_MSG_STATUS([clamsubmit ], [no (missing libjson-c-dev. Use the website to submit FPs/FNs.)], [no])
else
CL_MSG_STATUS([clamsubmit ], [no (missing libcurl-devel. Use the website to submit FPs/FNs.)], [no])
Expand Down Expand Up @@ -294,7 +294,7 @@ else
CL_MSG_STATUS([pcre ],[$PCRE_HOME],[$have_pcre])
fi
CL_MSG_STATUS([libmspack ],[yes],[$mspack_msg])
if test "x$XML_LIBS" = "x"; then
if test "x$XML_LIBS" = "x"; then
CL_MSG_STATUS([libxml2 ],[no],[])
else
CL_MSG_STATUS([libxml2 ],[yes, from $XML_HOME],[])
Expand Down
2 changes: 1 addition & 1 deletion docs/UserManual.md
@@ -1,4 +1,4 @@
# Clam AntiVirus 0.101.2 *User Manual*
# Clam AntiVirus 0.101.3 *User Manual*

![image](UserManual/images/demon.png)

Expand Down
8 changes: 4 additions & 4 deletions docs/UserManual/Installation-Windows.md
Expand Up @@ -6,9 +6,9 @@ If you wish to build ClamAV from source using Visual Studio 2015, please head ov

Important: Installing ClamAV using the Installer will require Administrator privileges.

1. Download: http://www.clamav.net/downloads/production/ClamAV-0.101.2.exe
1. Download: http://www.clamav.net/downloads/production/ClamAV-0.101.3.exe
2. Locate the file in your Downloads directory.
3. Right-click on `ClamAV-0.101.2.exe` and select `Run as administrator`. You may receive a warning message along the lines of "Windows protected your PC". Select `More info` and then select `Run anyway`.
3. Right-click on `ClamAV-0.101.3.exe` and select `Run as administrator`. You may receive a warning message along the lines of "Windows protected your PC". Select `More info` and then select `Run anyway`.
4. Select `I accept the agreement` and click `Next`.
5. Click `Next` again. If you've removed a previous installation of ClamAV, you may receive the prompt "The folder ... already exists...". If you do, select `Yes`.
6. Click `Install`.
Expand All @@ -28,9 +28,9 @@ Continue on to "First Time Set-Up" below...

## Install using the ClamAV Portable Install Package

1. Download: https://www.clamav.net/downloads/production/clamav-0.101.2-win-x64-portable.zip
1. Download: https://www.clamav.net/downloads/production/clamav-0.101.3-win-x64-portable.zip
2. Unzip it.
3. Open the `clamav-0.101.2-win-x64-portable` directory.
3. Open the `clamav-0.101.3-win-x64-portable` directory.
4. Hold down Shift and then right-click on the background in the current directory (but not on one of the files). Select `"Open PowerShell window here"`. If that option doesn't appear, try again.

Continue on to "First Time Set-Up"...
Expand Down
4 changes: 2 additions & 2 deletions m4/reorganization/version.m4
@@ -1,9 +1,9 @@
dnl change this on a release
dnl VERSION="devel-`date +%Y%m%d`"
VERSION="0.101.2"
VERSION="0.101.3"

LC_CURRENT=9
LC_REVISION=2
LC_REVISION=3
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
Expand Down
18 changes: 9 additions & 9 deletions win32/ClamAV-Installer.iss
@@ -1,14 +1,14 @@
; -- ClamAV-Installer.iss --
; Install ClamAV.
; Will install the correct files and DLLs built for two different
; for the system architecture (x86 or x64) using a single installer:
; Will install the correct files and DLLs built for two different
; for the system architecture (x86 or x64) using a single installer:
; on a "x86" edition of Windows the x86 version of the program will be
; installed but on a "x64" edition of Windows the x64 version will
; be installed.

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

Expand Down Expand Up @@ -65,7 +65,7 @@ Source: "Win32\Release\mspack.dll"; DestDir: "{app}"; DestName: "mspack.dll"; Ch
Source: "Win32\Release\pthreads.dll"; DestDir: "{app}"; DestName: "pthreads.dll"; Check: not Is64BitInstallMode
Source: "Win32\Release\sigtool.exe"; DestDir: "{app}"; DestName: "sigtool.exe"; Check: not Is64BitInstallMode
Source: "libcrypto-1_1.dll"; DestDir: "{app}"; DestName: "libcrypto-1_1.dll"; Check: not Is64BitInstallMode
Source: "libssl-1_1.dll"; DestDir: "{app}"; DestName: "libssl-1_1.dll"; Check: not Is64BitInstallMode
Source: "libssl-1_1.dll"; DestDir: "{app}"; DestName: "libssl-1_1.dll"; Check: not Is64BitInstallMode
Source: "C:\clam_dependencies\vcredist\vc_redist.x86.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: not Is64BitInstallMode

; Place all common files here, first one should be marked 'solidbreak'
Expand All @@ -85,7 +85,7 @@ Source: "..\COPYING.unrar"; DestDir: "{app}\COPYING"; DestName: "COPYING.unrar"
Source: "..\COPYING.YARA"; DestDir: "{app}\COPYING"; DestName: "COPYING.YARA"
Source: "..\COPYING.zlib"; DestDir: "{app}\COPYING"; DestName: "COPYING.zlib"
Source: "..\ChangeLog.md"; DestDir: "{app}\docs"; DestName: "ChangeLog.md"
Source: "..\NEWS.md"; DestDir: "{app}\docs"; DestName: "NEWS.md"
Source: "..\NEWS.md"; DestDir: "{app}\docs"; DestName: "NEWS.md"
Source: "..\README.md"; DestDir: "{app}"; DestName: "README.md"
Source: "..\docs\html\*"; DestDir: "{app}\docs"; Flags: recursesubdirs

Expand Down Expand Up @@ -145,10 +145,10 @@ const
VC_2010_SP1_REDIST_X64 = '{1D8E6291-B0D5-35EC-8441-6616F567A0F7}';
VC_2010_SP1_REDIST_IA64 = '{88C73C1C-2DE5-3B01-AFB8-B46EF4AB41CD}';
// Microsoft Visual C++ 2012 x86 Minimum Runtime - 11.0.61030.0 (Update 4)
// Microsoft Visual C++ 2012 x86 Minimum Runtime - 11.0.61030.0 (Update 4)
VC_2012_REDIST_MIN_UPD4_X86 = '{BD95A8CD-1D9F-35AD-981A-3E7925026EBB}';
VC_2012_REDIST_MIN_UPD4_X64 = '{CF2BEA3C-26EA-32F8-AA9B-331F7E34BA97}';
// Microsoft Visual C++ 2012 x86 Additional Runtime - 11.0.61030.0 (Update 4)
// Microsoft Visual C++ 2012 x86 Additional Runtime - 11.0.61030.0 (Update 4)
VC_2012_REDIST_ADD_UPD4_X86 = '{B175520C-86A2-35A7-8619-86DC379688B9}';
VC_2012_REDIST_ADD_UPD4_X64 = '{37B8F9C7-03FB-3253-8781-2517C99D7C00}';
Expand All @@ -166,7 +166,7 @@ const
VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
function MsiQueryProductState(szProduct: string): INSTALLSTATE;
function MsiQueryProductState(szProduct: string): INSTALLSTATE;
external 'MsiQueryProductState{#AW}@msi.dll stdcall';
function VCVersionInstalled(const ProductID: string): Boolean;
Expand Down
6 changes: 3 additions & 3 deletions win32/clamav-config.h
Expand Up @@ -475,7 +475,7 @@
#define PACKAGE_NAME "ClamAV"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "ClamAV 0.101.2"
#define PACKAGE_STRING "ClamAV 0.101.3"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "clamav"
Expand All @@ -484,7 +484,7 @@
#define PACKAGE_URL "https://www.clamav.net/"

/* Define to the version of this package. */
#define PACKAGE_VERSION "0.101.2"
#define PACKAGE_VERSION "0.101.3"

/* scan buffer size */
#define SCANBUFF 131072
Expand Down Expand Up @@ -520,7 +520,7 @@
/* #undef USE_SYSLOG */

/* Version number of package */
#define VERSION "0.101.2"
#define VERSION "0.101.3"

/* Version suffix for package */
#define VERSION_SUFFIX ""
Expand Down
4 changes: 2 additions & 2 deletions win32/res/common.rc
Expand Up @@ -6,8 +6,8 @@
#define REPO_VERSION VERSION
#endif

#define RES_VER_Q 0,101,2,0
#define RES_VER_S "ClamAV 0.101.2"
#define RES_VER_Q 0,101,3,0
#define RES_VER_S "ClamAV 0.101.3"

VS_VERSION_INFO VERSIONINFO
FILEVERSION RES_VER_Q
Expand Down

0 comments on commit 7f92726

Please sign in to comment.