Re: [ptxdist] [APPLIED] freetype: Version bump. 2.14.3 -> 2.15.0

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 3c3a4206cdd07c513d3613528d58e6653c696126.

Michael

[sent from post-receive hook]

On Sat, 24 Oct 2026 09:16:31 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Doesn't look that major.
> https://gitlab.freedesktop.org/freetype/freetype/-/blob/VER-2-15-0/docs/CHANGES
> 
> Plugs CVE:
> CVE-2026-95512: Fix DoS from specially crafted CID-keyed font.
> 
> * Forward patchset with slight offset adjustment.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20261015182212.786390-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/freetype-2.14.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.15.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> similarity index 95%
> rename from patches/freetype-2.14.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> rename to patches/freetype-2.15.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> index a903b2480e38..39222bc8972d 100644
> --- a/patches/freetype-2.14.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> +++ b/patches/freetype-2.15.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>   4 files changed, 18 insertions(+), 26 deletions(-)
>  
>  diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
> -index 5c4ccf1e8b34..e3cd66f0638b 100644
> +index a0e86517d347..968c4f6d3104 100644
>  --- a/builds/unix/configure.ac
>  +++ b/builds/unix/configure.ac
> -@@ -1200,7 +1200,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
> +@@ -1245,7 +1245,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
>   # and `builds/unix/unix-cc.mk' that will be used by the build system
>   #
>   AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
> @@ -26,7 +26,7 @@ index 5c4ccf1e8b34..e3cd66f0638b 100644
>   AC_OUTPUT
>   
>  diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
> -index 911b5347c715..db82729d1cd1 100644
> +index 4e69a06725cd..05047c245314 100644
>  --- a/builds/unix/freetype-config.in
>  +++ b/builds/unix/freetype-config.in
>  @@ -16,13 +16,6 @@ export LC_ALL
> @@ -96,7 +96,7 @@ index fe389f4b6fef..885444efebf7 100644
>  +Libs.private: @PKGCONFIG_LIBS_PRIVATE@
>   Cflags: -I${includedir}/freetype2
>  diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
> -index fe629272d5fe..53977e7e7410 100644
> +index 9bf2e2b57235..fe4165d99cea 100644
>  --- a/builds/unix/unix-def.in
>  +++ b/builds/unix/unix-def.in
>  @@ -157,7 +157,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
> diff --git a/patches/freetype-2.14.3/autogen.sh b/patches/freetype-2.15.0/autogen.sh
> similarity index 100%
> rename from patches/freetype-2.14.3/autogen.sh
> rename to patches/freetype-2.15.0/autogen.sh
> diff --git a/patches/freetype-2.14.3/series b/patches/freetype-2.15.0/series
> similarity index 100%
> rename from patches/freetype-2.14.3/series
> rename to patches/freetype-2.15.0/series
> diff --git a/rules/freetype.make b/rules/freetype.make
> index cfa0c2f3f590..75f01038debd 100644
> --- a/rules/freetype.make
> +++ b/rules/freetype.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
>  #
>  # Paths and names
>  #
> -FREETYPE_VERSION	:= 2.14.3
> -FREETYPE_SHA256		:= 36bc4f1cc413335368ee656c42afca65c5a3987e8768cc28cf11ba775e785a5f
> +FREETYPE_VERSION	:= 2.15.0
> +FREETYPE_SHA256		:= 93cd47eb719c325107f2d3cf087d06299e944c3b48a40b55537302304dea1dd5
>  FREETYPE		:= freetype-$(FREETYPE_VERSION)
>  FREETYPE_SUFFIX		:= tar.xz
>  FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)