Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2019-09-19 15:48:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Thu Sep 19 15:48:21 2019 rev:77 rq:730064 version:0.9.5+git20190908+3abfab2 Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2019-08-05 11:18:54.130498257 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new.7948/plymouth.changes 2019-09-19 15:48:26.891322511 +0200 @@ -1,0 +2,17 @@ +Wed Sep 11 07:54:48 UTC 2019 - Cliff Zhao <[email protected]> + +- Add patch plymouth-avoid-umount-hanging-shutdown.patch: + To avoid grantpt() call nsslookup, it will hanging system unmount + /var during shutdown period(bsc#1105688, bsc#1129386, + bsc#1134660). + +------------------------------------------------------------------- +Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao <[email protected]> + +- Update to version 0.9.5+git20190908+3abfab2: + * two-step: Deal with buggy firmware which does not pre-rotate the bgrt image + * configure: bump so name + * Internationalization: Add zh_HK and zh_TW translations. + * add delay time to 8 seconds to fit AMD graphic card. + +------------------------------------------------------------------- Old: ---- plymouth-0.9.4+git20190612+9359382.tar.xz New: ---- plymouth-0.9.5+git20190908+3abfab2.tar.xz plymouth-avoid-umount-hanging-shutdown.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.e1KboB/_old 2019-09-19 15:48:27.731322341 +0200 +++ /var/tmp/diff_new_pack.e1KboB/_new 2019-09-19 15:48:27.743322339 +0200 @@ -26,7 +26,7 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.4+git20190612+9359382 +Version: 0.9.5+git20190908+3abfab2 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later @@ -45,17 +45,23 @@ Patch3: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 [email protected] -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch +# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 [email protected] -- Drop grantpt() to avoid system failed to unmount /var during shutdown. +Patch5: plymouth-avoid-umount-hanging-shutdown.patch + # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 [email protected] -- add ability to output text in initrd needed for encryption. -Patch5: 0001-Add-label-ft-plugin.patch +Patch1000: 0001-Add-label-ft-plugin.patch # PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 [email protected] -- add ability to output text in initrd needed for encryption. -Patch6: 0002-Install-label-ft-plugin-into-initrd-if-available.patch +Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch # PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 [email protected] -- add ability to output text in initrd needed for encryption. -Patch7: 0003-fix_null_deref.patch +Patch1002: 0003-fix_null_deref.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets +BuildRequires: gcc +BuildRequires: git BuildRequires: kernel-headers BuildRequires: libtool +BuildRequires: libtool BuildRequires: libxslt BuildRequires: module-init-tools BuildRequires: pkgconfig @@ -71,14 +77,11 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(pango) >= 1.21.0 BuildRequires: pkgconfig(systemd) >= 186 - %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif -#BuildRequires: translation-update-upstream Recommends: %{name}-lang - Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts Requires: systemd >= 186 @@ -98,36 +101,36 @@ messages are instead redirected to a log file for viewing after boot. -%package -n libply-boot-client4 +%package -n libply-boot-client5 Summary: Plymouth core library Group: Development/Libraries/C and C++ -%description -n libply-boot-client4 +%description -n libply-boot-client5 This package contains the libply-boot-client library used by Plymouth. -%package -n libply-splash-core4 +%package -n libply-splash-core5 Summary: Plymouth core library Group: Development/Libraries/C and C++ -%description -n libply-splash-core4 +%description -n libply-splash-core5 This package contains the libply-splash-core library used by graphical Plymouth splashes. -%package -n libply-splash-graphics4 +%package -n libply-splash-graphics5 Summary: Plymouth graphics libraries Group: Development/Libraries/C and C++ BuildRequires: libpng-devel -%description -n libply-splash-graphics4 +%description -n libply-splash-graphics5 This package contains the libply-splash-graphics library used by graphical Plymouth splashes. -%package -n libply4 +%package -n libply5 Summary: Plymouth core library Group: Development/Libraries/C and C++ -Requires: libply-boot-client4 = %{version} +Requires: libply-boot-client5 = %{version} -%description -n libply4 +%description -n libply5 This package contains the libply library used by Plymouth. %package devel @@ -137,10 +140,10 @@ %if %{with x11_renderer} Requires: %{name}-x11-renderer = %{version} %endif -Requires: libply-boot-client4 = %{version} -Requires: libply-splash-core4 = %{version} -Requires: libply-splash-graphics4 = %{version} -Requires: libply4 = %{version} +Requires: libply-boot-client5 = %{version} +Requires: libply-splash-core5 = %{version} +Requires: libply-splash-graphics5 = %{version} +Requires: libply5 = %{version} Requires: pkgconfig %description devel @@ -182,7 +185,7 @@ %package plugin-label Summary: Plymouth label plugin Group: System/Base -Requires: libply-splash-graphics4 = %{version} +Requires: libply-splash-graphics5 = %{version} %description plugin-label This package contains the label control plugin for @@ -193,7 +196,7 @@ Summary: Plymouth FreeType label plugin Group: System/Base Requires: fontconfig -Requires: libply-splash-graphics4 = %{version} +Requires: libply-splash-graphics5 = %{version} %description plugin-label-ft This package contains the label control plugin for @@ -203,9 +206,9 @@ %package plugin-fade-throbber Summary: Plymouth "Fade-Throbber" plugin Group: System/Base -Requires: libply-splash-core4 = %{version} -Requires: libply-splash-graphics4 = %{version} -Requires: libply4 = %{version} +Requires: libply-splash-core5 = %{version} +Requires: libply-splash-graphics5 = %{version} +Requires: libply5 = %{version} %description plugin-fade-throbber This package contains the "Fade-In" boot splash plugin for @@ -216,9 +219,9 @@ Summary: Plymouth "Throbgress" plugin Group: System/Base Requires: %{name}-plugin-label = %{version} -Requires: libply-splash-core4 = %{version} -Requires: libply-splash-graphics4 = %{version} -Requires: libply4 = %{version} +Requires: libply-splash-core5 = %{version} +Requires: libply-splash-graphics5 = %{version} +Requires: libply5 = %{version} %description plugin-throbgress This package contains the "throbgress" boot splash plugin for @@ -230,9 +233,9 @@ Summary: Plymouth "space-flares" plugin Group: System/Base Requires: %{name}-plugin-label = %{version} -Requires: libply-splash-core4 = %{version} -Requires: libply-splash-graphics4 = %{version} -Requires: libply4 = %{version} +Requires: libply-splash-core5 = %{version} +Requires: libply-splash-graphics5 = %{version} +Requires: libply5 = %{version} %description plugin-space-flares This package contains the "space-flares" boot splash plugin for @@ -241,9 +244,9 @@ %package plugin-two-step Summary: Plymouth "two-step" plugin Group: System/Base -Requires: libply-splash-core4 = %{version} -Requires: libply-splash-graphics4 = %{version} -Requires: libply4 = %{version} +Requires: libply-splash-core5 = %{version} +Requires: libply-splash-graphics5 = %{version} +Requires: libply5 = %{version} Requires: plymouth-plugin-label = %{version} %description plugin-two-step @@ -255,9 +258,9 @@ %package plugin-script Summary: Plymouth "script" plugin Group: System/Base -Requires: libply-splash-core4 = %{version} -Requires: libply-splash-graphics4 = %{version} -Requires: libply4 = %{version} +Requires: libply-splash-core5 = %{version} +Requires: libply-splash-graphics5 = %{version} +Requires: libply5 = %{version} %description plugin-script This package contains the "script" boot splash plugin for @@ -268,9 +271,9 @@ %package plugin-tribar Summary: Plymouth "script" plugin Group: System/Base -Requires: libply-splash-core4 = %{version} -Requires: libply-splash-graphics4 = %{version} -Requires: libply4 = %{version} +Requires: libply-splash-core5 = %{version} +Requires: libply-splash-graphics5 = %{version} +Requires: libply5 = %{version} %description plugin-tribar This package contains the "tribar" boot splash plugin for @@ -363,12 +366,10 @@ Plymouth. %prep -%autosetup -p1 -#translation-update-upstream - +%autosetup -S git +autoreconf -ivf -Wno-portabilty # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c - # Change the default theme %if 0%{?is_opensuse} sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults @@ -377,7 +378,6 @@ %endif %build -autoreconf -fiv %configure \ --enable-systemd-integration \ --enable-tracing \ @@ -385,6 +385,8 @@ --disable-static \ --disable-gdm-transition \ --disable-upstart-monitoring \ + --disable-tests \ + --disable-libkms \ %if %{without x11_renderer} --disable-gtk \ %endif @@ -441,14 +443,14 @@ %posttrans %{?regenerate_initrd_posttrans} -%post -n libply-boot-client4 -p /sbin/ldconfig -%postun -n libply-boot-client4 -p /sbin/ldconfig -%post -n libply-splash-core4 -p /sbin/ldconfig -%postun -n libply-splash-core4 -p /sbin/ldconfig -%post -n libply-splash-graphics4 -p /sbin/ldconfig -%postun -n libply-splash-graphics4 -p /sbin/ldconfig -%post -n libply4 -p /sbin/ldconfig -%postun -n libply4 -p /sbin/ldconfig +%post -n libply-boot-client5 -p /sbin/ldconfig +%postun -n libply-boot-client5 -p /sbin/ldconfig +%post -n libply-splash-core5 -p /sbin/ldconfig +%postun -n libply-splash-core5 -p /sbin/ldconfig +%post -n libply-splash-graphics5 -p /sbin/ldconfig +%postun -n libply-splash-graphics5 -p /sbin/ldconfig +%post -n libply5 -p /sbin/ldconfig +%postun -n libply5 -p /sbin/ldconfig %post theme-spinfinity if [ $1 -eq 1 ]; then set -x @@ -546,7 +548,6 @@ %ghost %{_localstatedir}/lib/plymouth/boot-duration %{_unitdir}/* %ghost %{_localstatedir}/log/boot.log -%ghost %{_localstatedir}/spool/plymouth/boot.log /usr/share/locale/ %files dracut @@ -565,21 +566,21 @@ %{_libdir}/pkgconfig/ply-boot-client.pc %{_includedir}/plymouth-1 -%files -n libply-boot-client4 +%files -n libply-boot-client5 %defattr(-, root, root) -%{_libdir}/libply-boot-client.so.4* +%{_libdir}/libply-boot-client.so.5* -%files -n libply-splash-core4 +%files -n libply-splash-core5 %defattr(-, root, root) -%{plymouth_libdir}/libply-splash-core.so.4* +%{plymouth_libdir}/libply-splash-core.so.5* -%files -n libply-splash-graphics4 +%files -n libply-splash-graphics5 %defattr(-, root, root) -%{_libdir}/libply-splash-graphics.so.4* +%{_libdir}/libply-splash-graphics.so.5* -%files -n libply4 +%files -n libply5 %defattr(-, root, root) -%{plymouth_libdir}/libply.so.4* +%{plymouth_libdir}/libply.so.5* %files scripts %defattr(-, root, root) ++++++ plymouth-0.9.4+git20190612+9359382.tar.xz -> plymouth-0.9.5+git20190908+3abfab2.tar.xz ++++++ /work/SRC/openSUSE:Factory/plymouth/plymouth-0.9.4+git20190612+9359382.tar.xz /work/SRC/openSUSE:Factory/.plymouth.new.7948/plymouth-0.9.5+git20190908+3abfab2.tar.xz differ: char 26, line 1 ++++++ plymouth-avoid-umount-hanging-shutdown.patch ++++++ diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c --- plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c 2019-09-09 07:31:37.000000000 +0000 +++ plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c 2019-09-11 07:41:17.432945317 +0000 @@ -183,6 +183,7 @@ ply_trace (" opened device '/dev/ptmx'"); +#if 0 ply_trace ("creating pseudoterminal"); if (grantpt (session->pseudoterminal_master_fd) < 0) { ply_save_errno (); @@ -192,6 +193,7 @@ return false; } ply_trace ("done creating pseudoterminal"); +#endif ply_trace ("unlocking pseudoterminal"); if (unlockpt (session->pseudoterminal_master_fd) < 0) {
