diff options
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | ChangeLog | 23 | ||||
-rw-r--r-- | README | 8 | ||||
-rw-r--r-- | builds/unix/configure.raw | 2 | ||||
-rw-r--r-- | builds/wince/vc2005-ce/index.html | 2 | ||||
-rw-r--r-- | builds/wince/vc2008-ce/index.html | 2 | ||||
-rw-r--r-- | builds/windows/vc2010/index.html | 2 | ||||
-rw-r--r-- | builds/windows/visualc/index.html | 2 | ||||
-rw-r--r-- | builds/windows/visualce/index.html | 2 | ||||
-rw-r--r-- | docs/CHANGES | 15 | ||||
-rw-r--r-- | docs/VERSIONS.TXT | 1 | ||||
-rw-r--r-- | docs/freetype-config.1 | 2 | ||||
-rw-r--r-- | include/freetype/freetype.h | 2 | ||||
-rw-r--r-- | src/base/ftver.rc | 4 |
14 files changed, 54 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d13417be..3ed55aad7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,7 +147,7 @@ project(freetype C) set(VERSION_MAJOR "2") set(VERSION_MINOR "10") -set(VERSION_PATCH "3") +set(VERSION_PATCH "4") # Generate LIBRARY_VERSION and LIBRARY_SOVERSION. set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'") @@ -1,3 +1,26 @@ +2020-10-20 Werner Lemberg <wl@gnu.org> + + * Version 2.10.4 released. + ========================== + + + Tag sources with `VER-2-10-4'. + + * docs/VERSION.TXT: Add entry for version 2.10.4. + * docs/CHANGES: Updated. + + * README, src/base/ftver.rc, builds/windows/vc2010/index.html, + builds/windows/visualc/index.html, + builds/windows/visualce/index.html, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/index.html, docs/freetype-config.1: + s/2.10.3/2.10.4/, s/2103/2104/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 4. + + * builds/unix/configure.raw (version_info): Set to 23:4:17. + * CMakeLists.txt (VERSION_PATCH): Set to 4. + 2020-10-19 Werner Lemberg <wl@gnu.org> [sfnt] Fix heap buffer overflow (#59308). @@ -1,4 +1,4 @@ - FreeType 2.10.3 + FreeType 2.10.4 =============== Homepage: https://www.freetype.org @@ -27,9 +27,9 @@ and download one of the following files. - freetype-doc-2.10.3.tar.xz - freetype-doc-2.10.3.tar.gz - ftdoc2103.zip + freetype-doc-2.10.4.tar.xz + freetype-doc-2.10.4.tar.gz + ftdoc2104.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 7ac44fb85..bc65e452a 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='23:3:17' +version_info='23:4:17' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index 9fdf09153..6936a8909 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,7 +21,7 @@ the following targets: <li>PPC/SP WM6 (Windows Mobile 6)</li> </ul> -It compiles the following libraries from the FreeType 2.10.3 sources:</p> +It compiles the following libraries from the FreeType 2.10.4 sources:</p> <ul> <pre> diff --git a/builds/wince/vc2008-ce/index.html b/builds/wince/vc2008-ce/index.html index b90214fa7..ee385af86 100644 --- a/builds/wince/vc2008-ce/index.html +++ b/builds/wince/vc2008-ce/index.html @@ -21,7 +21,7 @@ the following targets: <li>PPC/SP WM6 (Windows Mobile 6)</li> </ul> -It compiles the following libraries from the FreeType 2.10.3 sources:</p> +It compiles the following libraries from the FreeType 2.10.4 sources:</p> <ul> <pre> diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index 91ffa2084..3b60c5fe1 100644 --- a/builds/windows/vc2010/index.html +++ b/builds/windows/vc2010/index.html @@ -12,7 +12,7 @@ <p>This directory contains solution and project files for Visual C++ 2010 or newer, named <tt>freetype.sln</tt>, and <tt>freetype.vcxproj</tt>. It compiles the following libraries -from the FreeType 2.10.3 sources:</p> +from the FreeType 2.10.4 sources:</p> <ul> <li>freetype.dll using 'Release' or 'Debug' configurations</li> diff --git a/builds/windows/visualc/index.html b/builds/windows/visualc/index.html index e8986d071..cec26d27a 100644 --- a/builds/windows/visualc/index.html +++ b/builds/windows/visualc/index.html @@ -12,7 +12,7 @@ <p>This directory contains project files <tt>freetype.dsp</tt> for Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002 through 2008, which you might need to upgrade automatically. -It compiles the following libraries from the FreeType 2.10.3 sources:</p> +It compiles the following libraries from the FreeType 2.10.4 sources:</p> <ul> <li>freetype.dll using 'Release' or 'Debug' configurations</li> diff --git a/builds/windows/visualce/index.html b/builds/windows/visualce/index.html index 733dff691..474e85c37 100644 --- a/builds/windows/visualce/index.html +++ b/builds/windows/visualce/index.html @@ -21,7 +21,7 @@ the following targets: <li>PPC/SP WM6 (Windows Mobile 6)</li> </ul> -It compiles the following libraries from the FreeType 2.10.3 sources:</p> +It compiles the following libraries from the FreeType 2.10.4 sources:</p> <ul> <pre> diff --git a/docs/CHANGES b/docs/CHANGES index a2f6d87fd..3bd5291ae 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,3 +1,18 @@ +CHANGES BETWEEN 2.10.3 and 2.10.4 + + I. IMPORTANT BUG FIXES + + - A heap buffer overflow has been found in the handling of embedded + PNG bitmaps, introduced in FreeType version 2.6. + + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15999 + + If you use option FT_CONFIG_OPTION_USE_PNG you should upgrade + immediately. + + +====================================================================== + CHANGES BETWEEN 2.10.2 and 2.10.3 I. IMPORTANT CHANGES diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT index 60fac1524..4e281a725 100644 --- a/docs/VERSIONS.TXT +++ b/docs/VERSIONS.TXT @@ -60,6 +60,7 @@ found on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.10.4 23.4.17 6.17.4 2.10.3 23.3.17 6.17.3 2.10.2 23.2.17 6.17.2 2.10.1 23.1.17 6.17.1 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index 1b048e46d..7dea66afa 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "October 2020" "FreeType 2.10.3" +.TH FREETYPE-CONFIG 1 "October 2020" "FreeType 2.10.4" . . .SH NAME diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index ffde9669d..be191f5aa 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4767,7 +4767,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 10 -#define FREETYPE_PATCH 3 +#define FREETYPE_PATCH 4 /************************************************************************** diff --git a/src/base/ftver.rc b/src/base/ftver.rc index 15dda7f4f..0b92e9b89 100644 --- a/src/base/ftver.rc +++ b/src/base/ftver.rc @@ -18,8 +18,8 @@ #include<windows.h> -#define FT_VERSION 2,10,3,0 -#define FT_VERSION_STR "2.10.3" +#define FT_VERSION 2,10,4,0 +#define FT_VERSION_STR "2.10.4" VS_VERSION_INFO VERSIONINFO FILEVERSION FT_VERSION |