Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2016-02-16 09:18:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2016-01-20 09:54:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2016-02-16 09:18:14.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Feb 8 15:00:06 UTC 2016 - [email protected] + +- Add 0003-fix_null_deref.patch as well + - Avoid potential SEGV if label plugin fails to load + +------------------------------------------------------------------- +Wed Jan 20 13:14:31 UTC 2016 - [email protected] + +- Add 0001-Add-label-ft-plugin.patch and + 0002-Install-label-ft-plugin-into-initrd-if-available.patch: + - Ability to output text in initrd, needed for encryption + - boo#959986 + +------------------------------------------------------------------- New: ---- 0001-Add-label-ft-plugin.patch 0002-Install-label-ft-plugin-into-initrd-if-available.patch 0003-fix_null_deref.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.yL9fDg/_old 2016-02-16 09:18:15.000000000 +0100 +++ /var/tmp/diff_new_pack.yL9fDg/_new 2016-02-16 09:18:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package plymouth # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,6 +50,10 @@ Patch26: plymouth-ignore-cirrusdrm.patch Patch28: plymouth-boot-vga-framebuffer.patch Patch29: 0001-let-it-become-a-real-daemon.patch +# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch [email protected] -- add ability to output text in initrd +Patch30: 0001-Add-label-ft-plugin.patch +Patch31: 0002-Install-label-ft-plugin-into-initrd-if-available.patch +Patch32: 0003-fix_null_deref.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets @@ -72,6 +76,7 @@ Requires(post): plymouth-scripts = %{version} BuildRequires: suse-module-tools Suggests: plymouth-plugin-label +Recommends: plymouth-plugin-label-ft Provides: bootsplash = 3.4 Obsoletes: bootsplash <= 3.4 Provides: systemd-plymouth = 44-10.2 @@ -166,13 +171,25 @@ Group: System/Base BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(pango) >= 1.21.0 -Requires: libply-splash-core4 = %{version} +Requires: libply-splash-graphics4 = %{version} %description plugin-label This package contains the label control plugin for Plymouth. It provides the ability to render text on graphical boot splashes using pango and cairo. +%package plugin-label-ft +Summary: Plymouth FreeType label plugin +Group: System/Base +BuildRequires: pkgconfig(freetype2) +Requires: fontconfig +Requires: libply-splash-graphics4 = %{version} + +%description plugin-label-ft +This package contains the label control plugin for +Plymouth. It provides the ability to render text on +graphical boot splashes using FreeTyoe + %package plugin-fade-throbber Summary: Plymouth "Fade-Throbber" plugin Group: System/Base @@ -336,6 +353,9 @@ %patch26 -p1 %patch28 -p1 %patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c @@ -570,6 +590,10 @@ %defattr(-, root, root) %{_libdir}/plymouth/label.so +%files plugin-label-ft +%defattr(-, root, root) +%{_libdir}/plymouth/label-ft.so + %files plugin-fade-throbber %defattr(-, root, root) %{_libdir}/plymouth/fade-throbber.so ++++++ 0001-Add-label-ft-plugin.patch ++++++ ++++ 620 lines (skipped) ++++++ 0002-Install-label-ft-plugin-into-initrd-if-available.patch ++++++ >From 2c4145e4b7e146541ba8e33aee5e0125423d97bc Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Wed, 20 Jan 2016 14:03:18 +0100 Subject: [PATCH 2/2] Install label-ft plugin into initrd, if available It is small and useful enough to include it by default. Signed-off-by: Fabian Vogt <[email protected]> --- scripts/plymouth-populate-initrd.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index 43c7f22..a109c59 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -414,6 +414,15 @@ if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then done fi +if [ -f "${PLYMOUTH_PLUGIN_PATH}/label-ft.so" ]; then + inst ${PLYMOUTH_PLUGIN_PATH}/label-ft.so $INITRDDIR + font=$(fc-match -f %{file}) + inst "$font" $INITRDDIR + # The label-ft plugin expects it at this location + mkdir -p $INITRDDIR/usr/share/fonts + ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf +fi + if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes fi -- 2.7.0 ++++++ 0003-fix_null_deref.patch ++++++ >From 99ee02fe20ae53323fe5756416e6a7d96a3baf8a Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Thu, 21 Jan 2016 10:39:21 +0100 Subject: [PATCH 1/3] ply-label: Don't crash if label plugin fails The label plugin's create_control function can return NULL if allocation failed, for example, but ply-label.c ignores that and uses the NULL control, causing various SEGVs. Signed-off-by: Fabian Vogt <[email protected]> --- src/libply-splash-graphics/ply-label.c | 8 ++++++++ 1 file changed, 8 insertions(+) Index: plymouth-0.9.2/src/libply-splash-graphics/ply-label.c =================================================================== --- plymouth-0.9.2.orig/src/libply-splash-graphics/ply-label.c +++ plymouth-0.9.2/src/libply-splash-graphics/ply-label.c @@ -130,6 +130,15 @@ ply_label_load_plugin (ply_label_t *labe label->control = label->plugin_interface->create_control (); + if (label->control == NULL) { + ply_save_errno (); + label->plugin_interface = NULL; + ply_close_module (label->module_handle); + label->module_handle = NULL; + ply_restore_errno (); + return false; + } + if (label->text != NULL) label->plugin_interface->set_text_for_control (label->control, label->text);
