From 4e8354fb43d55b52d5da7cc5b879d0e9d2884438 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 6 Mar 2009 22:35:01 +0000 Subject: [PATCH] - Updated to development snapshot - Guess progress better on second boot of persistent live images - Drop upstream patches - swap "solar" and "spinfinity" scriptlet behavior --- .cvsignore | 2 +- plymouth-0.6.0-drop-nash.patch | 52 ------------------------- plymouth-0.6.0-fix-heap-corruptor.patch | 41 ------------------- plymouth.spec | 23 ++++++----- sources | 2 +- 5 files changed, 16 insertions(+), 104 deletions(-) delete mode 100644 plymouth-0.6.0-drop-nash.patch delete mode 100644 plymouth-0.6.0-fix-heap-corruptor.patch diff --git a/.cvsignore b/.cvsignore index 67fd3e1..d8e6a52 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -plymouth-0.6.0.tar.bz2 +plymouth-0.7.0.tar.bz2 diff --git a/plymouth-0.6.0-drop-nash.patch b/plymouth-0.6.0-drop-nash.patch deleted file mode 100644 index 5b35f52..0000000 --- a/plymouth-0.6.0-drop-nash.patch +++ /dev/null @@ -1,52 +0,0 @@ -============================================================ - Create pseudo-terminal if one isn't passed in - - This may help us drop the nash depedency for -pty handling. - -diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c ---- a/src/libply/ply-terminal-session.c -+++ b/src/libply/ply-terminal-session.c -@@ -309,12 +309,24 @@ ply_terminal_session_attach (ply_terminal_session_t *session, - assert (session->loop != NULL); - assert (!session->is_running); - assert (session->done_handler == NULL); -- assert (ptmx >= 0); - - should_redirect_console = - (flags & PLY_TERMINAL_SESSION_FLAGS_REDIRECT_CONSOLE) != 0; - -- ply_terminal_set_fd(session->terminal, ptmx); -+ if (ptmx >= 0) -+ { -+ ply_trace ("ptmx passed in, using it"); -+ ply_terminal_set_fd(session->terminal, ptmx); -+ } -+ else -+ { -+ ply_trace ("ptmx not passed in, creating one"); -+ if (!ply_terminal_create_device (session->terminal)) -+ { -+ ply_trace ("could not create pseudo-terminal: %m"); -+ return false; -+ } -+ } - - if (should_redirect_console) - ply_trace ("redirecting system console to terminal device"); -diff --git a/src/main.c b/src/main.c ---- a/src/main.c -+++ b/src/main.c -@@ -838,12 +838,6 @@ main (int argc, - } - } - -- if ((attach_to_session && argc != 3) || (attach_to_session && state.ptmx == -1)) -- { -- ply_error ("%s [--attach-to-session ]", argv[0]); -- return EX_USAGE; -- } -- - if (geteuid () != 0) - { - ply_error ("plymouthd must be run as root user"); diff --git a/plymouth-0.6.0-fix-heap-corruptor.patch b/plymouth-0.6.0-fix-heap-corruptor.patch deleted file mode 100644 index 6ded558..0000000 --- a/plymouth-0.6.0-fix-heap-corruptor.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit e1619f36bf849ba183ae5fb53f4794d5273ea65c -Author: Ray Strode -Date: Tue Feb 24 13:36:15 2009 -0500 - - Fix heap corruptor in ply-boot-server - - This fixes a memory corruption bug that - cropped up during a round of leak fixes - a while back. - -diff --git a/src/ply-boot-server.c b/src/ply-boot-server.c -index 8615f3b..77115e5 100644 ---- a/src/ply-boot-server.c -+++ b/src/ply-boot-server.c -@@ -196,7 +196,7 @@ ply_boot_connection_read_request (ply_boot_connection_t *connection, - - if (!ply_read (connection->fd, &argument_size, sizeof (uint8_t))) - { -- free(command); -+ free (*command); - return false; - } - -@@ -204,7 +204,7 @@ ply_boot_connection_read_request (ply_boot_connection_t *connection, - - if (!ply_read (connection->fd, *argument, argument_size)) - { -- free(command); -+ free (*command); - return false; - } - } -@@ -307,7 +307,7 @@ ply_boot_connection_on_request (ply_boot_connection_t *connection) - strlen (PLY_BOOT_PROTOCOL_RESPONSE_TYPE_NAK))) - ply_error ("could not write bytes: %m"); - -- free(command); -+ free (command); - return; - } - diff --git a/plymouth.spec b/plymouth.spec index 68493d6..4db57ae 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -4,8 +4,8 @@ Summary: Graphical Boot Animation and Logger Name: plymouth -Version: 0.6.0 -Release: 3%{?dist} +Version: 0.7.0 +Release: 0.2009.03.06%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -20,9 +20,6 @@ Requires: initscripts >= 8.83-1 Obsoletes: plymouth-text-and-details-only < %{version}-%{release} -Patch0: plymouth-0.6.0-drop-nash.patch -Patch1: plymouth-0.6.0-fix-heap-corruptor.patch - %description Plymouth provides an attractive graphical boot animation in place of the text messages that normally get shown. Text @@ -152,8 +149,6 @@ Plymouth. It features a blue flamed sun with animated solar flares. %prep %setup -q -%patch0 -p1 -b .drop-nash -%patch1 -p1 -b .fix-heap-corruptor %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -173,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# Glow isn't quite ready for primetime +rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/glow/ +rm -f $RPM_BUILD_ROOT%{_libdir}/plymouth/glow.so + find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \; find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \; @@ -201,7 +200,7 @@ fi export LIB=%{_lib} if [ $1 -eq 0 ]; then if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "spinfinity" ]; then - %{_sbindir}/plymouth-set-default-plugin --reset + %{_sbindir}/plymouth-set-default-plugin text fi fi @@ -223,7 +222,7 @@ fi export LIB=%{_lib} if [ $1 -eq 0 ]; then if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "solar" ]; then - %{_sbindir}/plymouth-set-default-plugin text + %{_sbindir}/plymouth-set-default-plugin --reset fi fi @@ -316,6 +315,12 @@ fi %defattr(-, root, root) %changelog +* Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06 +- Updated to development snapshot +- Guess progress better on second boot of persistent live images +- Drop upstream patches +- swap "solar" and "spinfinity" scriptlet behavior + * Tue Feb 24 2009 Ray Strode 0.6.0-3 - Add fix-heap-corruptor patch from master. Problem spotted by Mr. McCann. diff --git a/sources b/sources index 9d6a7c9..a9eca27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e29e754e942e6fcaf5185772d18fd97e plymouth-0.6.0.tar.bz2 +8e0a1cd4e4cf8ada175c763ed23e5a92 plymouth-0.7.0.tar.bz2