Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory
checked in at 2017-12-21 11:21:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Thu Dec 21 11:21:50 2017 rev:57 rq:558604 version:0.9.3+git20171130.fa66a5b
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2017-12-08
21:47:22.239114385 +0100
+++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2017-12-21
11:21:52.057420702 +0100
@@ -1,0 +2,15 @@
+Mon Dec 04 11:23:27 UTC 2017 - zai...@opensuse.org
+
+- Update to version 0.9.3+git20171130.fa66a5b:
+ * INSTALL: Fix a spelling error in the command example
+ * populate-initrd: handle themes with subdirs
+ * device-manager: fall back to text mode if graphical devices
+ fail
+ * scripts: Use >&2 instead of /dev/stderr
+ * terminal: add include for sysmacros.h
+ * configure: bump to 0.9.4
+ * terminal-session: don't delete boot.log
+ * Revert "Make boot.log world readable by default"
+- Rebase 0002-Install-label-ft-plugin-into-initrd-if-available.patch
+
+-------------------------------------------------------------------
Old:
----
plymouth-0.9.2+git20170424.6fd5c6b.tar.xz
New:
----
plymouth-0.9.3+git20171130.fa66a5b.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.C6MyWv/_old 2017-12-21 11:21:53.301360049 +0100
+++ /var/tmp/diff_new_pack.C6MyWv/_new 2017-12-21 11:21:53.305359854 +0100
@@ -21,7 +21,7 @@
%define plymouth_libdir %{_libdir}
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
-Version: 0.9.2+git20170424.6fd5c6b
+Version: 0.9.3+git20171130.fa66a5b
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0+
++++++ 0002-Install-label-ft-plugin-into-initrd-if-available.patch ++++++
--- /var/tmp/diff_new_pack.C6MyWv/_old 2017-12-21 11:21:53.321359074 +0100
+++ /var/tmp/diff_new_pack.C6MyWv/_new 2017-12-21 11:21:53.321359074 +0100
@@ -14,8 +14,8 @@
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
+@@ -427,6 +427,15 @@
+ inst_recur "${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}"
fi
+if [ -f "${PLYMOUTH_PLUGIN_PATH}/label-ft.so" ]; then
++++++ _service ++++++
--- /var/tmp/diff_new_pack.C6MyWv/_old 2017-12-21 11:21:53.341358099 +0100
+++ /var/tmp/diff_new_pack.C6MyWv/_new 2017-12-21 11:21:53.345357904 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">plymouth</param>
- <param name="versionformat">0.9.2+git%cd.%h</param>
+ <param name="versionformat">0.9.3+git%cd.%h</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.C6MyWv/_old 2017-12-21 11:21:53.361357124 +0100
+++ /var/tmp/diff_new_pack.C6MyWv/_new 2017-12-21 11:21:53.361357124 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://anongit.freedesktop.org/plymouth</param>
- <param
name="changesrevision">6fd5c6b260b89604f2ff7d65a4f1a011db23a726</param></service></servicedata>
+ <param
name="changesrevision">fa66a5b66700779dafc73f1034ad771d56db9e84</param></service></servicedata>
\ No newline at end of file
++++++ plymouth-0.9.2+git20170424.6fd5c6b.tar.xz ->
plymouth-0.9.3+git20171130.fa66a5b.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.9.2+git20170424.6fd5c6b/INSTALL
new/plymouth-0.9.3+git20171130.fa66a5b/INSTALL
--- old/plymouth-0.9.2+git20170424.6fd5c6b/INSTALL 2017-04-24
22:16:47.000000000 +0200
+++ new/plymouth-0.9.3+git20171130.fa66a5b/INSTALL 2017-11-30
15:10:46.000000000 +0100
@@ -61,7 +61,7 @@
To decrypt your root, run
-lymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T ..."
+plymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T ..."
where the --command is whatever makes sense for you.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.9.2+git20170424.6fd5c6b/configure.ac
new/plymouth-0.9.3+git20171130.fa66a5b/configure.ac
--- old/plymouth-0.9.2+git20170424.6fd5c6b/configure.ac 2017-04-24
22:16:47.000000000 +0200
+++ new/plymouth-0.9.3+git20171130.fa66a5b/configure.ac 2017-11-30
15:10:46.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([plymouth],[0.9.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth])
+AC_INIT([plymouth],[0.9.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth])
AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR(build-tools)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.9.2+git20170424.6fd5c6b/scripts/plymouth-populate-initrd.in
new/plymouth-0.9.3+git20171130.fa66a5b/scripts/plymouth-populate-initrd.in
--- old/plymouth-0.9.2+git20170424.6fd5c6b/scripts/plymouth-populate-initrd.in
2017-04-24 22:16:47.000000000 +0200
+++ new/plymouth-0.9.3+git20171130.fa66a5b/scripts/plymouth-populate-initrd.in
2017-11-30 15:10:46.000000000 +0100
@@ -336,11 +336,24 @@
return 1
}
+inst_recur() {
+ for x in "${1%/}"/* ; do
+ if [[ -d "$x" ]]; then
+ inst_dir "$x"
+ inst_recur "$x"
+ elif [[ -f "$x" ]]; then
+ inst "$x"
+ else
+ break
+ fi
+ done
+}
+
function usage() {
- local output="/dev/stdout"
+ local output="/proc/self/fd/1"
local rc=0
if [ "$1" == "error" ]; then
- output="/dev/stderr"
+ output="/proc/self/fd/2"
rc=1
fi
@@ -385,13 +398,13 @@
inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR
if [ -z "$PLYMOUTH_THEME_NAME" ]; then
- echo "No default plymouth plugin is set" > /dev/stderr
+ echo "No default plymouth plugin is set" >&2
exit 1
fi
if [ $THEME_OVERRIDE ]; then
conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf
- echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" > /dev/stderr
+ echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" >&2
# make sure the section and key exist so we can modify them
grep -q "^ *\[Daemon\]" $conf || echo "[Daemon]" >> $conf
grep -q "^ *Theme *=" $conf || echo "Theme=fade-in" >> $conf
@@ -401,7 +414,7 @@
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *"
${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth
| sed 's/ModuleName *= *//')
if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
- echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist"
> /dev/stderr
+ echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist"
>&2
exit 1
fi
@@ -411,10 +424,7 @@
inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR
if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
- for x in ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
- [ ! -f "$x" ] && continue
- inst $x $INITRDDIR
- done
+ inst_recur "${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}"
fi
if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.9.2+git20170424.6fd5c6b/scripts/plymouth-set-default-theme.in
new/plymouth-0.9.3+git20171130.fa66a5b/scripts/plymouth-set-default-theme.in
---
old/plymouth-0.9.2+git20170424.6fd5c6b/scripts/plymouth-set-default-theme.in
2017-04-24 22:16:47.000000000 +0200
+++
new/plymouth-0.9.3+git20171130.fa66a5b/scripts/plymouth-set-default-theme.in
2017-11-30 15:10:46.000000000 +0100
@@ -84,14 +84,14 @@
-l|--list)
if [ -n "$THEME_NAME" ]; then
- echo "You can only specify --list or a theme name, not
both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --list or a theme name, not
both" >&2
+ echo $(usage) >&2
exit 1
fi
if [ $DO_RESET -ne 0 ]; then
- echo "You can only specify --reset or --list, not
both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --reset or --list, not
both" >&2
+ echo $(usage) >&2
exit 1
fi
@@ -104,14 +104,14 @@
-r|--reset|default)
if [ -n "$THEME_NAME" ]; then
- echo "You can only specify --reset or a theme name,
not both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --reset or a theme name,
not both" >&2
+ echo $(usage) >&2
exit 1
fi
if [ $DO_LIST -ne 0 ]; then
- echo "You can only specify --reset or --list, not
both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --reset or --list, not
both" >&2
+ echo $(usage) >&2
exit 1
fi
@@ -124,20 +124,20 @@
*)
if [ -n "$THEME_NAME" ]; then
- echo "You can only specify one theme at a time" >
/dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify one theme at a time" >&2
+ echo $(usage) >&2
exit 1
fi
if [ $DO_RESET -ne 0 ]; then
- echo "You can only specify --reset or a theme name,
not both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --reset or a theme name,
not both" >&2
+ echo $(usage) >&2
exit 1
fi
if [ $DO_LIST -ne 0 ]; then
- echo "You can only specify --list or a theme name, not
both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --list or a theme name, not
both" >&2
+ echo $(usage) >&2
exit 1
fi
@@ -163,7 +163,7 @@
fi
if [ `id -u` -ne 0 ]; then
- echo "This program must be run as root" > /dev/stderr
+ echo "This program must be run as root" >&2
exit 1
fi
@@ -174,14 +174,14 @@
fi
if [ ! -e
${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
- echo
"${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does
not exist" > /dev/stderr
+ echo
"${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does
not exist" >&2
exit 1
fi
MODULE_NAME=$(grep "ModuleName *= *"
${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth | sed
's/ModuleName *= *//')
if [ ! -e ${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so ]; then
- echo "${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so does not exist" >
/dev/stderr
+ echo "${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so does not exist" >&2
exit 1
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply/ply-logger.c
new/plymouth-0.9.3+git20171130.fa66a5b/src/libply/ply-logger.c
--- old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply/ply-logger.c
2017-04-24 22:16:47.000000000 +0200
+++ new/plymouth-0.9.3+git20171130.fa66a5b/src/libply/ply-logger.c
2017-11-30 15:10:46.000000000 +0100
@@ -310,8 +310,7 @@
bool
ply_logger_open_file (ply_logger_t *logger,
- const char *filename,
- bool world_readable)
+ const char *filename)
{
int fd;
mode_t mode;
@@ -319,21 +318,11 @@
assert (logger != NULL);
assert (filename != NULL);
- if (world_readable)
- mode = 0644;
- else
- mode = 0600;
-
- fd = open (filename, PLY_LOGGER_OPEN_FLAGS, mode);
+ fd = open (filename, PLY_LOGGER_OPEN_FLAGS, 0600);
if (fd < 0)
return false;
- if (fchmod (fd, mode) < 0) {
- close (fd);
- return false;
- }
-
ply_logger_set_output_fd (logger, fd);
free (logger->filename);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply/ply-logger.h
new/plymouth-0.9.3+git20171130.fa66a5b/src/libply/ply-logger.h
--- old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply/ply-logger.h
2017-04-24 22:16:47.000000000 +0200
+++ new/plymouth-0.9.3+git20171130.fa66a5b/src/libply/ply-logger.h
2017-11-30 15:10:46.000000000 +0100
@@ -46,8 +46,7 @@
ply_logger_t *ply_logger_new (void);
void ply_logger_free (ply_logger_t *logger);
bool ply_logger_open_file (ply_logger_t *logger,
- const char *filename,
- bool world_readable);
+ const char *filename);
void ply_logger_close_file (ply_logger_t *logger);
void ply_logger_set_output_fd (ply_logger_t *logger,
int fd);
@@ -108,7 +107,7 @@
/* convenience macros
*/
#define ply_open_log_file(filename)
\
- ply_logger_open_file (ply_logger_get_default (), filename, false)
+ ply_logger_open_file (ply_logger_get_default (), filename)
#define ply_close_log_file()
\
ply_logger_close_file (ply_logger_get_default ())
#define ply_flush_log()
\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply/ply-terminal-session.c
new/plymouth-0.9.3+git20171130.fa66a5b/src/libply/ply-terminal-session.c
--- old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply/ply-terminal-session.c
2017-04-24 22:16:47.000000000 +0200
+++ new/plymouth-0.9.3+git20171130.fa66a5b/src/libply/ply-terminal-session.c
2017-11-30 15:10:46.000000000 +0100
@@ -554,8 +554,7 @@
assert (session->logger != NULL);
ply_save_errno ();
- unlink (filename);
- log_is_opened = ply_logger_open_file (session->logger, filename, true);
+ log_is_opened = ply_logger_open_file (session->logger, filename);
if (log_is_opened)
ply_logger_flush (session->logger);
ply_restore_errno ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-device-manager.c
new/plymouth-0.9.3+git20171130.fa66a5b/src/libply-splash-core/ply-device-manager.c
---
old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-device-manager.c
2017-04-24 22:16:47.000000000 +0200
+++
new/plymouth-0.9.3+git20171130.fa66a5b/src/libply-splash-core/ply-device-manager.c
2017-11-30 15:10:46.000000000 +0100
@@ -47,7 +47,7 @@
static void create_devices_from_udev (ply_device_manager_t *manager);
#endif
-static void create_devices_for_terminal_and_renderer_type
(ply_device_manager_t *manager,
+static bool create_devices_for_terminal_and_renderer_type
(ply_device_manager_t *manager,
const char
*device_path,
ply_terminal_t
*terminal,
ply_renderer_type_t
renderer_type);
@@ -212,11 +212,12 @@
return has_drm_device;
}
-static void
+static bool
create_devices_for_udev_device (ply_device_manager_t *manager,
struct udev_device *device)
{
const char *device_path;
+ bool created = false;
device_path = udev_device_get_devnode (device);
@@ -245,12 +246,14 @@
terminal = manager->local_console_terminal;
}
- create_devices_for_terminal_and_renderer_type (manager,
-
device_path,
- terminal,
-
renderer_type);
+ created =
create_devices_for_terminal_and_renderer_type (manager,
+
device_path,
+
terminal,
+
renderer_type);
}
}
+
+ return created;
}
static void
@@ -310,8 +313,7 @@
node = udev_device_get_devnode (device);
if (node != NULL) {
ply_trace ("found node %s", node);
- found_device = true;
- create_devices_for_udev_device
(manager, device);
+ found_device =
create_devices_for_udev_device (manager, device);
}
} else {
ply_trace ("device doesn't have a devices
tag");
@@ -656,7 +658,7 @@
manager->text_display_added_handler (manager->event_handler_data,
display);
}
-static void
+static bool
create_devices_for_terminal_and_renderer_type (ply_device_manager_t *manager,
const char
*device_path,
ply_terminal_t *terminal,
@@ -670,7 +672,7 @@
if (renderer != NULL) {
ply_trace ("ignoring device %s since it's already managed",
device_path);
- return;
+ return true;
}
ply_trace ("creating devices for %s (renderer type: %u) (terminal:
%s)",
@@ -686,7 +688,7 @@
renderer = NULL;
if (renderer_type != PLY_RENDERER_TYPE_AUTO)
- return;
+ return false;
}
if (renderer != NULL) {
@@ -743,6 +745,8 @@
ply_trace ("activating keyboards");
ply_keyboard_watch_for_input (keyboard);
}
+
+ return true;
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-terminal.c
new/plymouth-0.9.3+git20171130.fa66a5b/src/libply-splash-core/ply-terminal.c
---
old/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-terminal.c
2017-04-24 22:16:47.000000000 +0200
+++
new/plymouth-0.9.3+git20171130.fa66a5b/src/libply-splash-core/ply-terminal.c
2017-11-30 15:10:46.000000000 +0100
@@ -32,6 +32,7 @@
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <termios.h>
#include <unistd.h>
#include <wchar.h>
