mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libass: security bump to version 0.15

Browse Source 
- harfbuzz is mandatory since
  f3e2c97e18
- Fix CVE-2020-26682 (In libass 0.14.0, the `ass_outline_construct`'s
  call to `outline_stroke` causes a signed integer overflow.) through
  676f9dc5b5
  which does not apply cleanly over version 0.14.
  It should be noted that version 0.15 also fixes other integer
  overflows (which have no CVE assigned)
- Update indentation in hash file (two spaces)

https://github.com/libass/libass/releases/tag/0.15.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 4ae8ecea8f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2020-10-29 14:24:29 +01:00
committed by Peter Korsgaard
parent 52c315baf7
commit 19c24b7f03
6 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/gstreamer1/gst1-plugins-bad/Config.in
View File

@@ -306,8 +306,16 @@ comment "plugins with external dependencies"
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
bool "assrender" bool "assrender"
depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz
select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBASS
comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ
bool "bluez" bool "bluez"
depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_USE_WCHAR # bluez5_utils -> libglib2

2
package/harfbuzz/Config.in
View File

@@ -11,7 +11,7 @@ config BR2_PACKAGE_HARFBUZZ
Harfbuzz can make optional use of cairo, freetype, Harfbuzz can make optional use of cairo, freetype,
glib2 and icu packages if they are selected. glib2 and icu packages if they are selected.
comment "harfbuzz needs a toolchain w/ C++, gcc => 4.8" comment "harfbuzz needs a toolchain w/ C++, gcc >= 4.8"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || \ depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8

2
package/kodi/Config.in
View File

@@ -7,6 +7,7 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS
comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.8" comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.8"
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
@@ -61,6 +62,7 @@ comment "kodi needs an OpenGL EGL backend with OpenGL support"
menuconfig BR2_PACKAGE_KODI menuconfig BR2_PACKAGE_KODI
bool "kodi" bool "kodi"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_USES_MUSL

9
package/libass/Config.in
View File

@@ -1,9 +1,18 @@
config BR2_PACKAGE_LIBASS config BR2_PACKAGE_LIBASS
bool "libass" bool "libass"
depends on BR2_INSTALL_LIBSTDCPP # harfbuzz
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz
select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_HARFBUZZ
select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBFRIBIDI
help help
libass is a portable subtitle renderer for the ASS/SSA libass is a portable subtitle renderer for the ASS/SSA
(Advanced Substation Alpha/Substation Alpha) subtitle format (Advanced Substation Alpha/Substation Alpha) subtitle format
https://github.com/libass/libass https://github.com/libass/libass
comment "libass needs a toolchain w/ C++, gcc >= 4.8"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8

4
package/libass/libass.hash
View File

@@ -1,3 +1,3 @@
# Locally computed # Locally computed
sha256 881f2382af48aead75b7a0e02e65d88c5ebd369fe46bc77d9270a94aa8fd38a2 libass-0.14.0.tar.xz sha256 9f09230c9a0aa68ef7aa6a9e2ab709ca957020f842e52c5b2e52b801a7d9e833 libass-0.15.0.tar.xz
sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING

10
package/libass/libass.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBASS_VERSION = 0.14.0 LIBASS_VERSION = 0.15.0
LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz
# Do not use the github helper here, the generated tarball is *NOT* # Do not use the github helper here, the generated tarball is *NOT*
# the same as the one uploaded by upstream for the release. # the same as the one uploaded by upstream for the release.
@@ -15,6 +15,7 @@ LIBASS_LICENSE_FILES = COPYING
LIBASS_DEPENDENCIES = \ LIBASS_DEPENDENCIES = \
host-pkgconf \ host-pkgconf \
freetype \ freetype \
harfbuzz \
libfribidi \ libfribidi \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
@@ -31,11 +32,4 @@ else
LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider
endif endif
ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
LIBASS_DEPENDENCIES += harfbuzz
LIBASS_CONF_OPTS += --enable-harfbuzz
else
LIBASS_CONF_OPTS += --disable-harfbuzz
endif
$(eval $(autotools-package)) $(eval $(autotools-package))