Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2018-10-25 08:09:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Thu Oct 25 08:09:39 2018 rev:62 rq:642933 version:0.9.3+git20181016.a588b3f
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2018-09-04 22:47:24.239197073 +0200
+++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2018-10-25 08:09:42.500291554 +0200
@@ -1,0 +2,13 @@
+Thu Oct 18 11:57:15 UTC 2018 - qzhao@suse.com
+
+- Update to version 0.9.3+git20180827.0a66272:
+ * boot-server: free the argument and triggers
+ * event-loop: fix leak in error path
+ * script: fix various memory leaks
+ * key-file: ply_key_file_get_value returns duplicated memory, fix
+ memory leaks.
+ * event-loop: fix leak in error path
+ * boot-splash: fix memory leak in error path
+ * populate-initrd: drop unused local variable
+
+-------------------------------------------------------------------
Old:
----
plymouth-0.9.3+git20180827.0a66272.tar.xz
New:
----
plymouth-0.9.3+git20181016.a588b3f.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.waU6tK/_old 2018-10-25 08:09:43.024291210 +0200
+++ /var/tmp/diff_new_pack.waU6tK/_new 2018-10-25 08:09:43.028291208 +0200
@@ -22,7 +22,7 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
-Version: 0.9.3+git20180827.0a66272
+Version: 0.9.3+git20181016.a588b3f
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later
++++++ plymouth-0.9.3+git20180827.0a66272.tar.xz -> plymouth-0.9.3+git20181016.a588b3f.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/FETCH_HEAD new/plymouth-0.9.3+git20181016.a588b3f/.git/FETCH_HEAD
--- old/plymouth-0.9.3+git20180827.0a66272/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/FETCH_HEAD 2018-10-18 13:50:50.000000000 +0200
@@ -0,0 +1,27 @@
+a588b3f7d16a3a8da56c6dbaf2429889375f4d3f branch 'master' of https://gitlab.freedesktop.org/plymouth/plymouth
+133ef6f14af0cebef182750784284c4249d5166c not-for-merge branch 'bitmap-label-control' of https://gitlab.freedesktop.org/plymouth/plymouth
+cf766763f26ad0bb8e001a9ecf65b00f4c766e3c not-for-merge branch 'config-file' of https://gitlab.freedesktop.org/plymouth/plymouth
+34ad039ed0816bd7372aca95dc0d25327320154d not-for-merge branch 'cothreads' of https://gitlab.freedesktop.org/plymouth/plymouth
+efc7c11775323fd9b75f94c20896b6d7b1929ad1 not-for-merge branch 'fix-text-spew' of https://gitlab.freedesktop.org/plymouth/plymouth
+0b5b790d628f4c96e3ab9fbc0daba67a29b850da not-for-merge branch 'fix-vt-management-on-deactivate' of https://gitlab.freedesktop.org/plymouth/plymouth
+5d29689fd727d94830d31cd7a69935b6a8256e77 not-for-merge branch 'generic-drm-driver' of https://gitlab.freedesktop.org/plymouth/plymouth
+237d2ad6d625eec44c6c355a5e9348194775faab not-for-merge branch 'headless' of https://gitlab.freedesktop.org/plymouth/plymouth
+48bba4f1cdffcdb9aa8a2cde01f019f0b1b3eff0 not-for-merge branch 'improved-vt-handling' of https://gitlab.freedesktop.org/plymouth/plymouth
+424818f2917f2a5b50b7574aae8024548479d9a8 not-for-merge branch 'input-rework' of https://gitlab.freedesktop.org/plymouth/plymouth
+7fd51ca08b06ab5b26f2bef00fc29058ce07b44d not-for-merge branch 'list-optimizations' of https://gitlab.freedesktop.org/plymouth/plymouth
+1fa0bf62b7ae58db68104e4307590abab6f32ba5 not-for-merge branch 'man-page' of https://gitlab.freedesktop.org/plymouth/plymouth
+d52b4efba18c4295618302fea9674e54c36e1b7e not-for-merge branch 'no-fbcon' of https://gitlab.freedesktop.org/plymouth/plymouth
+b4c8a9ebf8b62fcb2f64edd2cf38776fedf1b174 not-for-merge branch 'no-vt-switch-on-hide-splash' of https://gitlab.freedesktop.org/plymouth/plymouth
+4f02890e059ade7bb1f4c8435f536714bd9ad25c not-for-merge branch 'optionalize-library-dependencies' of https://gitlab.freedesktop.org/plymouth/plymouth
+9a50c42636bc0179080376cffa378a3e05d2a7f0 not-for-merge branch 'scripted-plugin' of https://gitlab.freedesktop.org/plymouth/plymouth
+6ceccc7ce8a0ff0ae6efdd75b23670f77860af9b not-for-merge branch 'seat-rework' of https://gitlab.freedesktop.org/plymouth/plymouth
+3e373765765d5ab41ed8782202a82fbfec57ce39 not-for-merge branch 'tmp' of https://gitlab.freedesktop.org/plymouth/plymouth
+7432db8f2f2c87afbc789d7bcfc387341b8eb36d not-for-merge branch 'transition' of https://gitlab.freedesktop.org/plymouth/plymouth
+24cc17299df51bb59b356a77de3ce88a0806bfc8 not-for-merge branch 'wip/better-flush-notification' of https://gitlab.freedesktop.org/plymouth/plymouth
+fed69e9fff99dcaff1b2c88ad6b986a4a4d3df78 not-for-merge branch 'wip/deseatify' of https://gitlab.freedesktop.org/plymouth/plymouth
+447b1d4890b48b4fd1a272529d8225b332f0c8fa not-for-merge branch 'wip/drm-first-fb-last' of https://gitlab.freedesktop.org/plymouth/plymouth
+266d954b7a0ff5b046df6ed54c22e3322b2c80d0 not-for-merge branch 'wip/fix-non-udev-codepath' of https://gitlab.freedesktop.org/plymouth/plymouth
+8aa3b01b33a7c483591d200a74b3f3fb3df538bb not-for-merge branch 'wip/fix-text-splash' of https://gitlab.freedesktop.org/plymouth/plymouth
+f7f482174f1dcfa52c222f813e6b26dd106a12c1 not-for-merge branch 'wip/systemd-fixes' of https://gitlab.freedesktop.org/plymouth/plymouth
+90a23b832d1f113d679be1dfa60cba448a07a8ce not-for-merge branch 'wip/udev' of https://gitlab.freedesktop.org/plymouth/plymouth
+08466deaf8203ddff508d492056d2e9f705724e9 not-for-merge branch 'x11-renderer' of https://gitlab.freedesktop.org/plymouth/plymouth
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/HEAD new/plymouth-0.9.3+git20181016.a588b3f/.git/HEAD
--- old/plymouth-0.9.3+git20180827.0a66272/.git/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/HEAD 2018-08-29 08:43:26.000000000 +0200
@@ -0,0 +1 @@
+ref: refs/heads/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/ORIG_HEAD new/plymouth-0.9.3+git20181016.a588b3f/.git/ORIG_HEAD
--- old/plymouth-0.9.3+git20180827.0a66272/.git/ORIG_HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/ORIG_HEAD 2018-10-18 13:50:50.000000000 +0200
@@ -0,0 +1 @@
+a588b3f7d16a3a8da56c6dbaf2429889375f4d3f
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/config new/plymouth-0.9.3+git20181016.a588b3f/.git/config
--- old/plymouth-0.9.3+git20180827.0a66272/.git/config 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/config 2018-08-29 08:43:26.000000000 +0200
@@ -0,0 +1,11 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+[remote "origin"]
+ url = https://gitlab.freedesktop.org/plymouth/plymouth.git
+ fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/description new/plymouth-0.9.3+git20181016.a588b3f/.git/description
--- old/plymouth-0.9.3+git20180827.0a66272/.git/description 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/description 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/applypatch-msg.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/applypatch-msg.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/applypatch-msg.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit. The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/commit-msg.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/commit-msg.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/commit-msg.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message. The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit. The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+ sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
+ echo >&2 Duplicate Signed-off-by lines.
+ exit 1
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/post-update.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/post-update.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/post-update.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-applypatch.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-applypatch.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-applypatch.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-commit.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-commit.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-commit.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+ against=HEAD
+else
+ # Initial commit: diff against an empty tree object
+ against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+ # Note that the use of brackets around a tr range is ok here, (it's
+ # even required, for portability to Solaris 10's /usr/bin/tr), since
+ # the square bracket bytes happen to fall in the designated range.
+ test $(git diff --cached --name-only --diff-filter=A -z $against |
+ LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+ cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+ git config hooks.allownonascii true
+EOF
+ exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-push.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-push.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-push.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-push.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed. Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed. If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+# <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+ if [ "$local_sha" = $z40 ]
+ then
+ # Handle delete
+ :
+ else
+ if [ "$remote_sha" = $z40 ]
+ then
+ # New branch, examine all commits
+ range="$local_sha"
+ else
+ # Update to existing branch, examine new commits
+ range="$remote_sha..$local_sha"
+ fi
+
+ # Check for WIP commit
+ commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+ if [ -n "$commit" ]
+ then
+ echo >&2 "Found WIP commit in $local_ref, not pushing"
+ exit 1
+ fi
+ fi
+done
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-rebase.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-rebase.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-rebase.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+ topic="refs/heads/$2"
+else
+ topic=`git symbolic-ref HEAD` ||
+ exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+ ;;
+*)
+ exit 0 ;# we do not interrupt others.
+ ;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master. Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+ echo >&2 "No such branch $topic"
+ exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+ echo >&2 "$topic is fully merged to master; better remove it."
+ exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next? If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+ not_in_topic=`git rev-list "^$topic" master`
+ if test -z "$not_in_topic"
+ then
+ echo >&2 "$topic is already up-to-date with master"
+ exit 1 ;# we could allow it, but there is no point.
+ else
+ exit 0
+ fi
+else
+ not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+ /usr/bin/perl -e '
+ my $topic = $ARGV[0];
+ my $msg = "* $topic has commits already merged to public branch:\n";
+ my (%not_in_next) = map {
+ /^([0-9a-f]+) /;
+ ($1 => 1);
+ } split(/\n/, $ARGV[1]);
+ for my $elem (map {
+ /^([0-9a-f]+) (.*)$/;
+ [$1 => $2];
+ } split(/\n/, $ARGV[2])) {
+ if (!exists $not_in_next{$elem->[0]}) {
+ if ($msg) {
+ print STDERR $msg;
+ undef $msg;
+ }
+ print STDERR " $elem->[1]\n";
+ }
+ }
+ ' "$topic" "$not_in_next" "$not_in_master"
+ exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+ merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+ it is deleted. If you need to build on top of it to correct
+ earlier mistakes, a new topic branch is created by forking at
+ the tip of the "master". This is not strictly necessary, but
+ it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+ branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next". Young
+ topic branches can have stupid mistakes you would rather
+ clean up before publishing, and things that have not been
+ merged into other branches can be easily rebased without
+ affecting other people. But once it is published, you would
+ not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+ Then you can delete it. More importantly, you should not
+ build on top of it -- other people may already want to
+ change things related to the topic as patches against your
+ "master", so if you need further changes, it is better to
+ fork the topic (perhaps with the same name) afresh from the
+ tip of "master".
+
+Let's look at this example:
+
+ o---o---o---o---o---o---o---o---o---o "next"
+ / / / /
+ / a---a---b A / /
+ / / / /
+ / / c---c---c---c B /
+ / / / \ /
+ / / / b---b C \ /
+ / / / / \ /
+ ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished. It has been fully merged up to "master" and "next",
+ and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+ git rev-list ^master ^topic next
+ git rev-list ^master next
+
+ if these match, topic has not merged in next at all.
+
+To compute (2):
+
+ git rev-list master..topic
+
+ if this is empty, it is fully merged to "master".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-receive.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-receive.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/pre-receive.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/pre-receive.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+ i=0
+ while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+ do
+ eval "value=\$GIT_PUSH_OPTION_$i"
+ case "$value" in
+ echoback=*)
+ echo "echo from the pre-receive-hook: ${value#*=}" >&2
+ ;;
+ reject)
+ exit 1
+ esac
+ i=$((i + 1))
+ done
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/prepare-commit-msg.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/prepare-commit-msg.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/prepare-commit-msg.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source. The hook's purpose is to edit the commit
+# message file. If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output. It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited. This is rarely a good idea.
+
+case "$2,$3" in
+ merge,)
+ /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+# /usr/bin/perl -i.bak -pe '
+# print "\n" . `git diff --cached --name-status -r`
+# if /^#/ && $first++ == 0' "$1" ;;
+
+ *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/update.sample new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/update.sample
--- old/plymouth-0.9.3+git20180827.0a66272/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/hooks/update.sample 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+# This boolean sets whether unannotated tags will be allowed into the
+# repository. By default they won't be.
+# hooks.allowdeletetag
+# This boolean sets whether deleting tags will be allowed in the
+# repository. By default they won't be.
+# hooks.allowmodifytag
+# This boolean sets whether a tag may be modified after creation. By default
+# it won't be.
+# hooks.allowdeletebranch
+# This boolean sets whether deleting branches will be allowed in the
+# repository. By default they won't be.
+# hooks.denycreatebranch
+# This boolean sets whether remotely creating branches will be denied
+# in the repository. By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+ echo "Don't run this script from the command line." >&2
+ echo " (if you want, you could supply GIT_DIR then run" >&2
+ echo " $0 <ref> <oldrev> <newrev>)" >&2
+ exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+ echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+ exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+ echo "*** Project description file hasn't been set" >&2
+ exit 1
+ ;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+ newrev_type=delete
+else
+ newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+ refs/tags/*,commit)
+ # un-annotated tag
+ short_refname=${refname##refs/tags/}
+ if [ "$allowunannotated" != "true" ]; then
+ echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+ echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+ exit 1
+ fi
+ ;;
+ refs/tags/*,delete)
+ # delete tag
+ if [ "$allowdeletetag" != "true" ]; then
+ echo "*** Deleting a tag is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/tags/*,tag)
+ # annotated tag
+ if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+ then
+ echo "*** Tag '$refname' already exists." >&2
+ echo "*** Modifying a tag is not allowed in this repository." >&2
+ exit 1
+ fi
+ ;;
+ refs/heads/*,commit)
+ # branch
+ if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+ echo "*** Creating a branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/heads/*,delete)
+ # delete branch
+ if [ "$allowdeletebranch" != "true" ]; then
+ echo "*** Deleting a branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/remotes/*,commit)
+ # tracking branch
+ ;;
+ refs/remotes/*,delete)
+ # delete tracking branch
+ if [ "$allowdeletebranch" != "true" ]; then
+ echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ *)
+ # Anything else (is there anything else?)
+ echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+ exit 1
+ ;;
+esac
+
+# --- Finished
+exit 0
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/index and new/plymouth-0.9.3+git20181016.a588b3f/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/info/exclude new/plymouth-0.9.3+git20181016.a588b3f/.git/info/exclude
--- old/plymouth-0.9.3+git20180827.0a66272/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/info/exclude 2018-08-29 08:37:47.000000000 +0200
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/logs/HEAD new/plymouth-0.9.3+git20181016.a588b3f/.git/logs/HEAD
--- old/plymouth-0.9.3+git20180827.0a66272/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/logs/HEAD 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 0a66272326b7726695571fa3725009933147d27f qiangzhao 1535525006 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git
+0a66272326b7726695571fa3725009933147d27f a588b3f7d16a3a8da56c6dbaf2429889375f4d3f qiangzhao 1539861422 +0800 pull: Fast-forward
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/logs/refs/heads/master new/plymouth-0.9.3+git20181016.a588b3f/.git/logs/refs/heads/master
--- old/plymouth-0.9.3+git20180827.0a66272/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/logs/refs/heads/master 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 0a66272326b7726695571fa3725009933147d27f qiangzhao 1535525006 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git
+0a66272326b7726695571fa3725009933147d27f a588b3f7d16a3a8da56c6dbaf2429889375f4d3f qiangzhao 1539861422 +0800 pull: Fast-forward
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/logs/refs/remotes/origin/HEAD new/plymouth-0.9.3+git20181016.a588b3f/.git/logs/refs/remotes/origin/HEAD
--- old/plymouth-0.9.3+git20180827.0a66272/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/logs/refs/remotes/origin/HEAD 2018-08-29 08:43:26.000000000 +0200
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 0a66272326b7726695571fa3725009933147d27f qiangzhao 1535525006 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/logs/refs/remotes/origin/master new/plymouth-0.9.3+git20181016.a588b3f/.git/logs/refs/remotes/origin/master
--- old/plymouth-0.9.3+git20180827.0a66272/.git/logs/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/logs/refs/remotes/origin/master 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1 @@
+0a66272326b7726695571fa3725009933147d27f a588b3f7d16a3a8da56c6dbaf2429889375f4d3f qiangzhao 1539861422 +0800 pull: fast-forward
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/09/57258eb995f458464d531d5cd934dd3c02feaf and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/09/57258eb995f458464d531d5cd934dd3c02feaf differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/09/7a1114b16c8e19aba77712e5a4d2b31ec8c69d and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/09/7a1114b16c8e19aba77712e5a4d2b31ec8c69d differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/0c/d125ad8659435f5ebc6de8281c0751f41cdfac and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/0c/d125ad8659435f5ebc6de8281c0751f41cdfac differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/0e/8ad7c86d75dc79f4cfeff532119b9305539c99 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/0e/8ad7c86d75dc79f4cfeff532119b9305539c99 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/14/264bdb2897ad2a76b304c3234310e8bd5f541d and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/14/264bdb2897ad2a76b304c3234310e8bd5f541d differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/21/1fe44729034d96b249ed4f8153e70e4a70cb17 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/21/1fe44729034d96b249ed4f8153e70e4a70cb17 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/27/ad1ac96c87d93e587b0ee95c85816ff9def8e4 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/27/ad1ac96c87d93e587b0ee95c85816ff9def8e4 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/objects/31/0b63cd154552605f380fa2743b08f6cd63bcdd new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/31/0b63cd154552605f380fa2743b08f6cd63bcdd
--- old/plymouth-0.9.3+git20180827.0a66272/.git/objects/31/0b63cd154552605f380fa2743b08f6cd63bcdd 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/31/0b63cd154552605f380fa2743b08f6cd63bcdd 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1,4 @@
+xœNÄ@©÷)ÜÑp§ýËÏ"hipb¯»$íAÞ+èé¬?Ïû4Ï£«Ýdf@ª`4a4ÑꪡBmÑžzÛ¢÷GëšW+f^|5U6MÝrðhØگȱ±šÓQ·
+?eHÞpwÉrù^2ÓrîÓüŠr¡®LÛ6pÒ^kµ«{@á ªKINe°ÇoyNyñ
+ãóiEz Ãm®ŒíÀÄq
+H)!=À¥å^ îÏR¥€~DaúRwá^ÎJ}c[Ã÷KGSõô`w
\ No newline at end of file
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/32/2a3635fa8eed7c3ee4c849518e3b002cbf089a and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/32/2a3635fa8eed7c3ee4c849518e3b002cbf089a differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/38/9b636f813fd1bcf176fa8bd9c45e81cbedcf85 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/38/9b636f813fd1bcf176fa8bd9c45e81cbedcf85 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/39/45071e39ffcf4e6b17bd07a6246898c3ed1923 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/39/45071e39ffcf4e6b17bd07a6246898c3ed1923 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/40/9d03df9a2aed6a1df32844c5f05d8507f1502e and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/40/9d03df9a2aed6a1df32844c5f05d8507f1502e differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/47/157bc21c9f81fc10a4d3593fea9a44c5e48aeb and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/47/157bc21c9f81fc10a4d3593fea9a44c5e48aeb differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/objects/4f/f6d59d101768e94a1e2299345d3e129ddb0f08 new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/4f/f6d59d101768e94a1e2299345d3e129ddb0f08
--- old/plymouth-0.9.3+git20180827.0a66272/.git/objects/4f/f6d59d101768e94a1e2299345d3e129ddb0f08 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/4f/f6d59d101768e94a1e2299345d3e129ddb0f08 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1,2 @@
+xMNÄ0
YçÞ±Q:ióâÀÄU#¥Mº#ÍíIÄØYöó÷Ê<'e.\@HkrRYãz-wz2žÑ*ã¢ëŽ%±b¥
ÁºU£²^öš^õ¶÷jÆñâŽ:Tî<
+oxw®%<×í^ŒVò9ùºA5¿Î 'ÙK)Z·dúǪX˺gd:¥%qOkYa_ö"ä0ÃkBIÒ²ñgNŸbœÁž/SY RÈíÚ
ðO_ì«-!?nÐB®òí~âcJ÷ÁñÞJs¹6ÀáñCÃ|ß{Ê{á
\ No newline at end of file
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/52/25d1abb5a91fc135a86cfe565702b22c9ef56b and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/52/25d1abb5a91fc135a86cfe565702b22c9ef56b differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/54/c769650ccb2849f9388f1eb4336c4950a621aa and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/54/c769650ccb2849f9388f1eb4336c4950a621aa differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/55/248ac1708d1c3fe6a5c72d2610ca0a2a63525d and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/55/248ac1708d1c3fe6a5c72d2610ca0a2a63525d differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/objects/5b/adb95b8e419266fb69c22aa7e3eacdf6aeaf08 new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/5b/adb95b8e419266fb69c22aa7e3eacdf6aeaf08
--- old/plymouth-0.9.3+git20180827.0a66272/.git/objects/5b/adb95b8e419266fb69c22aa7e3eacdf6aeaf08 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/5b/adb95b8e419266fb69c22aa7e3eacdf6aeaf08 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1,4 @@
+xNÙMÄ0åÛULD>³ö
+!j
+&ã±b×í,€{"¶þÞMµ<@ð43HJ;~vÁ/4GöÚ+§UØ°ñmÑÍ|Ñ3ÇfKÞ§<EJMK> À}¬µÁ;ð1Z/ÿ·ÆqÅ1Q-¯ ³³ÚIxVJq²çÁÁÿN-oã
+)ÿÀ[®{Â¥¶Ÿ?»8ÛïÜò8 Õý!ñ÷CkîðØR·cåû6_Üb-
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/objects/65/6444ed2606cba8be76b9de8792dc36f72d946c new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/65/6444ed2606cba8be76b9de8792dc36f72d946c
--- old/plymouth-0.9.3+git20180827.0a66272/.git/objects/65/6444ed2606cba8be76b9de8792dc36f72d946c 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/65/6444ed2606cba8be76b9de8792dc36f72d946c 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1 @@
+xÁnà D{æ+öÖS¢5Ç®ªªßÐöaQ mó÷%éô¶³œ1é|ö
ÔA>ŽÂ#.uIb;Ñ`ó8íPÛYãÁ
%L
cžNÊØAZË µS3:Q8»ÉØIÆZA¶¥ot
÷Vex.õ~Œ¶µœIçŽZ&-Q°ÃQôolüšà¯ž)å'pþÓ'ø\JGÉÔ6!ržïŸãÍwü
|šÐà[åààÁ».+\"»CÂԲϮ·Z_{±Ù|¿ç¥q·øøŽt
\ No newline at end of file
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/91/551c0ae8670cc0564221acf2b85b3b6efbb1e8 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/91/551c0ae8670cc0564221acf2b85b3b6efbb1e8 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/a0/2a1c6ed02af7a4db36582b5f4c8ccfb6447ae7 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/a0/2a1c6ed02af7a4db36582b5f4c8ccfb6447ae7 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/a1/95910daf1f2057d6d962a13bdc28a4484a23dc and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/a1/95910daf1f2057d6d962a13bdc28a4484a23dc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/objects/a5/88b3f7d16a3a8da56c6dbaf2429889375f4d3f new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/a5/88b3f7d16a3a8da56c6dbaf2429889375f4d3f
--- old/plymouth-0.9.3+git20180827.0a66272/.git/objects/a5/88b3f7d16a3a8da56c6dbaf2429889375f4d3f 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/a5/88b3f7d16a3a8da56c6dbaf2429889375f4d3f 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1,2 @@
+xANÄ0EYçfÕÒºq !$Öl8©3S©iL1·'1À«/ÿ'}ÒR
ÝÕ"ähb!°cbO¬A²³ŠèœŠÉð<uä"[ë×#qŽ£Gc&â88"ÓûA{ŸÝ£zAc£ï'?ëiÉ:PæÞ
šø\¹À'_`WK^ŒÆuÙämxYBN¯ÐtdáA·QmÛ
+UùGT}HÙøÂ[8@ò·¥^ãò#§fèŒSêýÏ«Ô®}/]EŸÎrªp\/)·Ï7qO¿¡ÌrO
\ No newline at end of file
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/a8/12f8dc41acf3f159221dc69ad9185e6ee9c874 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/a8/12f8dc41acf3f159221dc69ad9185e6ee9c874 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/b9/70c027db7c329f14d947b15e318a776313ac73 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/b9/70c027db7c329f14d947b15e318a776313ac73 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/c2/5f992a9c2d77c42e010154c0c05cd3e11ec4e0 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/c2/5f992a9c2d77c42e010154c0c05cd3e11ec4e0 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/c2/f46c0f148c791bb4dac4aaa9e665a862368491 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/c2/f46c0f148c791bb4dac4aaa9e665a862368491 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/c5/f9f4b00c27df805114294b829e4a83eacd65b1 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/c5/f9f4b00c27df805114294b829e4a83eacd65b1 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/d0/d9ce3b80690dcaf53302d93b9681de50357c06 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/d0/d9ce3b80690dcaf53302d93b9681de50357c06 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/d5/d900daa0cf46b46447804d10512e9b1ae53221 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/d5/d900daa0cf46b46447804d10512e9b1ae53221 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/df/50715862580d1e9d822d6acc225876c58ceefb and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/df/50715862580d1e9d822d6acc225876c58ceefb differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/ea/5fdd24828a654579f37231caedb333fe413e67 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/ea/5fdd24828a654579f37231caedb333fe413e67 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/f5/4b4041036879e459af418ba434194f956af419 and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/f5/4b4041036879e459af418ba434194f956af419 differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/ff/0e6fd68a307171395cf5b3696749437c8be98a and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/ff/0e6fd68a307171395cf5b3696749437c8be98a differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/pack/pack-3c8f2a6900ded36943751595712582d20c30ad81.idx and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/pack/pack-3c8f2a6900ded36943751595712582d20c30ad81.idx differ
Binary files old/plymouth-0.9.3+git20180827.0a66272/.git/objects/pack/pack-3c8f2a6900ded36943751595712582d20c30ad81.pack and new/plymouth-0.9.3+git20181016.a588b3f/.git/objects/pack/pack-3c8f2a6900ded36943751595712582d20c30ad81.pack differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/packed-refs new/plymouth-0.9.3+git20181016.a588b3f/.git/packed-refs
--- old/plymouth-0.9.3+git20180827.0a66272/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/packed-refs 2018-08-29 08:43:26.000000000 +0200
@@ -0,0 +1,71 @@
+# pack-refs with: peeled fully-peeled
+133ef6f14af0cebef182750784284c4249d5166c refs/remotes/origin/bitmap-label-control
+cf766763f26ad0bb8e001a9ecf65b00f4c766e3c refs/remotes/origin/config-file
+34ad039ed0816bd7372aca95dc0d25327320154d refs/remotes/origin/cothreads
+efc7c11775323fd9b75f94c20896b6d7b1929ad1 refs/remotes/origin/fix-text-spew
+0b5b790d628f4c96e3ab9fbc0daba67a29b850da refs/remotes/origin/fix-vt-management-on-deactivate
+5d29689fd727d94830d31cd7a69935b6a8256e77 refs/remotes/origin/generic-drm-driver
+237d2ad6d625eec44c6c355a5e9348194775faab refs/remotes/origin/headless
+48bba4f1cdffcdb9aa8a2cde01f019f0b1b3eff0 refs/remotes/origin/improved-vt-handling
+424818f2917f2a5b50b7574aae8024548479d9a8 refs/remotes/origin/input-rework
+7fd51ca08b06ab5b26f2bef00fc29058ce07b44d refs/remotes/origin/list-optimizations
+1fa0bf62b7ae58db68104e4307590abab6f32ba5 refs/remotes/origin/man-page
+0a66272326b7726695571fa3725009933147d27f refs/remotes/origin/master
+d52b4efba18c4295618302fea9674e54c36e1b7e refs/remotes/origin/no-fbcon
+b4c8a9ebf8b62fcb2f64edd2cf38776fedf1b174 refs/remotes/origin/no-vt-switch-on-hide-splash
+4f02890e059ade7bb1f4c8435f536714bd9ad25c refs/remotes/origin/optionalize-library-dependencies
+9a50c42636bc0179080376cffa378a3e05d2a7f0 refs/remotes/origin/scripted-plugin
+6ceccc7ce8a0ff0ae6efdd75b23670f77860af9b refs/remotes/origin/seat-rework
+3e373765765d5ab41ed8782202a82fbfec57ce39 refs/remotes/origin/tmp
+7432db8f2f2c87afbc789d7bcfc387341b8eb36d refs/remotes/origin/transition
+24cc17299df51bb59b356a77de3ce88a0806bfc8 refs/remotes/origin/wip/better-flush-notification
+fed69e9fff99dcaff1b2c88ad6b986a4a4d3df78 refs/remotes/origin/wip/deseatify
+447b1d4890b48b4fd1a272529d8225b332f0c8fa refs/remotes/origin/wip/drm-first-fb-last
+266d954b7a0ff5b046df6ed54c22e3322b2c80d0 refs/remotes/origin/wip/fix-non-udev-codepath
+8aa3b01b33a7c483591d200a74b3f3fb3df538bb refs/remotes/origin/wip/fix-text-splash
+f7f482174f1dcfa52c222f813e6b26dd106a12c1 refs/remotes/origin/wip/systemd-fixes
+90a23b832d1f113d679be1dfa60cba448a07a8ce refs/remotes/origin/wip/udev
+08466deaf8203ddff508d492056d2e9f705724e9 refs/remotes/origin/x11-renderer
+1c3a90801efcc6c919c76962f4246790450c1c62 refs/tags/0.1.0
+7e85eafab617fef5478c6d9f551f044d67462466 refs/tags/0.2.0
+69fc3676ced274a0114679810f771b28c1d81045 refs/tags/0.3.0
+b4353fbca987b84ca835b9285981673e3a949608 refs/tags/0.3.1
+0a7e2c92196e4091387560ae054b62a0d7c0e3e7 refs/tags/0.3.2
+a5eb75a75a00c5a8b459c57e5042c0a63b969eea refs/tags/0.4.0
+baea12f03d3c18cbe5af5e31d73cf282b3d5830a refs/tags/0.4.5
+86c642baca5feae5e456006d2e3c910a268aaed7 refs/tags/0.5.0
+29157abbb1687d16cc54df30f04ceec27237b96d refs/tags/0.6.0
+68b8f6340cb1c3d5b09ea85d7fcb2f116fd974e6 refs/tags/0.7.0
+^25f5ddeb0553ff0a1009065fb22763e1b45d653a
+51fd29fa651181c912017ed11ec714dcd056f816 refs/tags/0.7.1
+^d2a3fbe75fe90fa9c158de73248e056a90970bc5
+a9c5347b811e24a89b0e18e122f401a44f89aecb refs/tags/0.7.2
+^a8f0572cb279ae2252cec169522a3e3e5b22f105
+50750c0ebc2a4cd54fc193778822620ea4ca45c4 refs/tags/0.8.0
+^e168de883e2b7af0b459081e62bec76a7c4db583
+431705323c1ea6cc3760bfbd1d8dfae95f7ff8be refs/tags/0.8.1
+^05dc13ad0f458c4f4a08e02acdc5faed3a2e0a7c
+d5fbc91402223492e4c628f9c7894c2207829195 refs/tags/0.8.2
+^c4f46b6262e168a10c3da6d0ac1f5962b4412ba2
+dfce70a22f3628b075eda0f2dc15d2fd87a347ba refs/tags/0.8.3
+^2ea21378ef2187858440594698e13300381f3fda
+d50add3bea64877f7097f703ae9ab5817ea25c8d refs/tags/0.8.4
+^032a30c489ad658bd03b4145806da2f989db2c7e
+0156af0835e214cf3dfde0fdc6f2ca700ce2715f refs/tags/0.8.5
+^8e932e9895bacf9b490e60e4be63d8902201e5d5
+5ed9081b40c0c324fdfb1b1fd8365fed1051f6c9 refs/tags/0.8.5.1
+^251ddbfe7acbb8b975487e6e40c48edb6a60a8c5
+00f7847357a3c196d8eee49741ced1e1f25e8df8 refs/tags/0.8.6
+^76d0db51c26fff42c03ccf89a8f84193aa95c03f
+ee77a03bd66d3027e14ff7439172f352c8d52e9a refs/tags/0.8.6.1
+^570f722106a44d831282edea83933503d8dae57b
+0bad299f38cd356be05b79ed6729e153fcb6b0dd refs/tags/0.8.7
+^b56535a5924249fbe053f5d9366e0acd8be9d893
+8e78d9f1b338fca8e037a935afb0d8f91953c794 refs/tags/0.8.8
+^f3b9d25f29011431ea3286d06643fd67c57b3c48
+15ebd0f41e2b4163b23c097f6dddac15c0dc32c6 refs/tags/0.9.0
+^e3a0ce8e6c072cd4150274aa34f63e2c3f5f8fba
+2be6201ed54a13d2ea131c9fcd1ddef1438f1264 refs/tags/0.9.2
+^2c437c364b2771651bf329181cc14fc812de379c
+db6a6dd2e0f54eae2dec7f1fbcb9a95dffe87924 refs/tags/0.9.3
+^ca06f77036ec6c37f65446046f0dfb3693803338
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/refs/heads/master new/plymouth-0.9.3+git20181016.a588b3f/.git/refs/heads/master
--- old/plymouth-0.9.3+git20180827.0a66272/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/refs/heads/master 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1 @@
+a588b3f7d16a3a8da56c6dbaf2429889375f4d3f
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/refs/remotes/origin/HEAD new/plymouth-0.9.3+git20181016.a588b3f/.git/refs/remotes/origin/HEAD
--- old/plymouth-0.9.3+git20180827.0a66272/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/refs/remotes/origin/HEAD 2018-08-29 08:43:26.000000000 +0200
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/.git/refs/remotes/origin/master new/plymouth-0.9.3+git20181016.a588b3f/.git/refs/remotes/origin/master
--- old/plymouth-0.9.3+git20180827.0a66272/.git/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/.git/refs/remotes/origin/master 2018-10-18 13:17:02.000000000 +0200
@@ -0,0 +1 @@
+a588b3f7d16a3a8da56c6dbaf2429889375f4d3f
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/scripts/plymouth-populate-initrd.in new/plymouth-0.9.3+git20181016.a588b3f/scripts/plymouth-populate-initrd.in
--- old/plymouth-0.9.3+git20180827.0a66272/scripts/plymouth-populate-initrd.in 2018-01-19 07:58:58.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/scripts/plymouth-populate-initrd.in 2018-10-18 13:17:02.000000000 +0200
@@ -168,7 +168,7 @@
# It handles making symlinks according to how the original library
# is referenced.
inst_library() {
- local _src="$1" _dest=${2:-$1} _lib _reallib _symlink
+ local _src="$1" _dest=${2:-$1} _reallib _symlink
strstr "$1" "/" || return 1
[[ -e $initdir/$_dest ]] && return 0
if [[ -L $_src ]]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/libply/ply-event-loop.c new/plymouth-0.9.3+git20181016.a588b3f/src/libply/ply-event-loop.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/libply/ply-event-loop.c 2018-01-19 07:58:58.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/libply/ply-event-loop.c 2018-10-18 13:17:02.000000000 +0200
@@ -496,8 +496,10 @@
loop->signal_dispatcher = ply_signal_dispatcher_new ();
- if (loop->signal_dispatcher == NULL)
+ if (loop->signal_dispatcher == NULL) {
+ ply_event_loop_free (loop);
return NULL;
+ }
ply_event_loop_watch_fd (loop,
ply_signal_dispatcher_receiver_fd,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/libply-splash-core/ply-boot-splash.c new/plymouth-0.9.3+git20181016.a588b3f/src/libply-splash-core/ply-boot-splash.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/libply-splash-core/ply-boot-splash.c 2018-08-22 09:08:15.000000000 +0200
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/libply-splash-core/ply-boot-splash.c 2018-10-18 13:17:02.000000000 +0200
@@ -208,8 +208,10 @@
key_file = ply_key_file_new (splash->theme_path);
- if (!ply_key_file_load (key_file))
+ if (!ply_key_file_load (key_file)) {
+ ply_key_file_free (key_file);
return false;
+ }
module_name = ply_key_file_get_value (key_file, "Plymouth Theme", "ModuleName");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/libply-splash-core/ply-device-manager.c new/plymouth-0.9.3+git20181016.a588b3f/src/libply-splash-core/ply-device-manager.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/libply-splash-core/ply-device-manager.c 2018-08-22 09:08:15.000000000 +0200
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/libply-splash-core/ply-device-manager.c 2018-10-18 13:17:02.000000000 +0200
@@ -63,6 +63,7 @@
ply_list_t *pixel_displays;
struct udev *udev_context;
struct udev_monitor *udev_monitor;
+ ply_fd_watch_t *fd_watch;
ply_keyboard_added_handler_t keyboard_added_handler;
ply_keyboard_removed_handler_t keyboard_removed_handler;
@@ -77,6 +78,9 @@
uint32_t serial_consoles_detected : 1;
uint32_t renderers_activated : 1;
uint32_t keyboards_activated : 1;
+
+ uint32_t paused : 1;
+ uint32_t device_timeout_elapsed : 1;
};
static void
@@ -375,23 +379,38 @@
assert (manager != NULL);
assert (manager->udev_monitor == NULL);
+ if (manager->fd_watch != NULL)
+ return;
+
ply_trace ("watching for udev graphics device add and remove events");
- manager->udev_monitor = udev_monitor_new_from_netlink (manager->udev_context, "udev");
+ if (manager->udev_monitor == NULL) {
+ manager->udev_monitor = udev_monitor_new_from_netlink (manager->udev_context, "udev");
- udev_monitor_filter_add_match_subsystem_devtype (manager->udev_monitor, SUBSYSTEM_DRM, NULL);
- udev_monitor_filter_add_match_subsystem_devtype (manager->udev_monitor, SUBSYSTEM_FRAME_BUFFER, NULL);
- udev_monitor_filter_add_match_tag (manager->udev_monitor, "seat");
- udev_monitor_enable_receiving (manager->udev_monitor);
+ udev_monitor_filter_add_match_subsystem_devtype (manager->udev_monitor, SUBSYSTEM_DRM, NULL);
+ udev_monitor_filter_add_match_subsystem_devtype (manager->udev_monitor, SUBSYSTEM_FRAME_BUFFER, NULL);
+ udev_monitor_filter_add_match_tag (manager->udev_monitor, "seat");
+ udev_monitor_enable_receiving (manager->udev_monitor);
+ }
fd = udev_monitor_get_fd (manager->udev_monitor);
- ply_event_loop_watch_fd (manager->loop,
- fd,
- PLY_EVENT_LOOP_FD_STATUS_HAS_DATA,
- (ply_event_handler_t)
- on_udev_event,
- NULL,
- manager);
+ manager->fd_watch = ply_event_loop_watch_fd (manager->loop,
+ fd,
+ PLY_EVENT_LOOP_FD_STATUS_HAS_DATA,
+ (ply_event_handler_t)
+ on_udev_event,
+ NULL,
+ manager);
+}
+
+static void
+stop_watching_for_udev_events (ply_device_manager_t *manager)
+{
+ if (manager->fd_watch == NULL)
+ return;
+
+ ply_event_loop_stop_watching_fd (manager->loop, manager->fd_watch);
+ manager->fd_watch = NULL;
}
#endif
@@ -801,6 +820,13 @@
{
bool found_drm_device, found_fb_device;
+ manager->device_timeout_elapsed = true;
+
+ if (manager->paused) {
+ ply_trace ("create_devices_from_udev timeout elapsed while paused, deferring execution");
+ return;
+ }
+
ply_trace ("Timeout elapsed, looking for devices from udev");
found_drm_device = create_devices_for_subsystem (manager, SUBSYSTEM_DRM);
@@ -992,3 +1018,27 @@
manager->keyboards_activated = false;
}
+
+void
+ply_device_manager_pause (ply_device_manager_t *manager)
+{
+ ply_trace ("ply_device_manager_pause() called, stopping watching for udev events");
+ manager->paused = true;
+#ifdef HAVE_UDEV
+ stop_watching_for_udev_events (manager);
+#endif
+}
+
+void
+ply_device_manager_unpause (ply_device_manager_t *manager)
+{
+ ply_trace ("ply_device_manager_unpause() called, resuming watching for udev events");
+ manager->paused = false;
+#ifdef HAVE_UDEV
+ if (manager->device_timeout_elapsed) {
+ ply_trace ("ply_device_manager_unpause(): timeout elapsed while paused, looking for udev devices");
+ create_devices_from_udev (manager);
+ }
+ watch_for_udev_events (manager);
+#endif
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/libply-splash-core/ply-device-manager.h new/plymouth-0.9.3+git20181016.a588b3f/src/libply-splash-core/ply-device-manager.h
--- old/plymouth-0.9.3+git20180827.0a66272/src/libply-splash-core/ply-device-manager.h 2018-08-22 09:08:15.000000000 +0200
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/libply-splash-core/ply-device-manager.h 2018-10-18 13:17:02.000000000 +0200
@@ -55,6 +55,8 @@
ply_text_display_added_handler_t text_display_added_handler,
ply_text_display_removed_handler_t text_display_removed_handler,
void *data);
+void ply_device_manager_pause (ply_device_manager_t *manager);
+void ply_device_manager_unpause (ply_device_manager_t *manager);
bool ply_device_manager_has_serial_consoles (ply_device_manager_t *manager);
bool ply_device_manager_has_displays (ply_device_manager_t *manager);
ply_list_t *ply_device_manager_get_keyboards (ply_device_manager_t *manager);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/main.c new/plymouth-0.9.3+git20181016.a588b3f/src/main.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/main.c 2018-08-28 09:00:02.000000000 +0200
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/main.c 2018-10-18 13:17:02.000000000 +0200
@@ -296,8 +296,8 @@
{
ply_key_file_t *key_file = NULL;
bool settings_loaded = false;
- const char *scale_string;
- const char *splash_string;
+ char *scale_string = NULL;
+ char *splash_string = NULL;
ply_trace ("Trying to load %s", path);
key_file = ply_key_file_new (path);
@@ -323,24 +323,27 @@
}
if (isnan (state->splash_delay)) {
- const char *delay_string;
+ char *delay_string;
delay_string = ply_key_file_get_value (key_file, "Daemon", "ShowDelay");
if (delay_string != NULL) {
state->splash_delay = atof (delay_string);
ply_trace ("Splash delay is set to %lf", state->splash_delay);
+ free (delay_string);
}
}
if (isnan (state->device_timeout)) {
- const char *timeout_string;
+ char *timeout_string;
timeout_string = ply_key_file_get_value (key_file, "Daemon", "DeviceTimeout");
if (timeout_string != NULL) {
state->device_timeout = atof (timeout_string);
ply_trace ("Device timeout is set to %lf", state->device_timeout);
+
+ free (timeout_string);
}
}
@@ -348,10 +351,12 @@
if (scale_string != NULL) {
ply_set_device_scale (strtoul (scale_string, NULL, 0));
+ free (scale_string);
}
settings_loaded = true;
out:
+ free (splash_string);
ply_key_file_free (key_file);
return settings_loaded;
@@ -1347,6 +1352,7 @@
ply_trace ("deactivating");
cancel_pending_delayed_show (state);
+ ply_device_manager_pause (state->device_manager);
ply_device_manager_deactivate_keyboards (state->device_manager);
if (state->boot_splash != NULL) {
@@ -1382,6 +1388,8 @@
if (state->boot_splash && ply_boot_splash_uses_pixel_displays (state->boot_splash))
ply_device_manager_activate_renderers (state->device_manager);
+ ply_device_manager_unpause (state->device_manager);
+
state->is_inactive = false;
update_display (state);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/plugins/splash/script/script-lib-image.c new/plymouth-0.9.3+git20181016.a588b3f/src/plugins/splash/script/script-lib-image.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/plugins/splash/script/script-lib-image.c 2018-01-19 07:58:58.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/plugins/splash/script/script-lib-image.c 2018-10-18 13:17:02.000000000 +0200
@@ -200,7 +200,10 @@
}
script_obj_unref (align_obj);
- if (!text) return script_return_obj_null ();
+ if (!text) {
+ free (font);
+ return script_return_obj_null ();
+ }
label = ply_label_new ();
ply_label_set_text (label, text);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/plugins/splash/script/script-lib-sprite.c new/plymouth-0.9.3+git20181016.a588b3f/src/plugins/splash/script/script-lib-sprite.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/plugins/splash/script/script-lib-sprite.c 2018-08-22 09:08:15.000000000 +0200
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/plugins/splash/script/script-lib-sprite.c 2018-10-18 13:17:02.000000000 +0200
@@ -741,12 +741,14 @@
script_lib_sprite_refresh (script_lib_sprite_data_t *data)
{
ply_list_node_t *node;
- ply_region_t *region = ply_region_new ();
+ ply_region_t *region;
ply_list_t *rectable_list;
if (!data)
return;
+ region = ply_region_new ();
+
ply_list_sort_stable (data->sprite_list, &sprite_compare_z);
node = ply_list_get_first_node (data->sprite_list);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/plugins/splash/script/script-parse.c new/plymouth-0.9.3+git20181016.a588b3f/src/plugins/splash/script/script-parse.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/plugins/splash/script/script-parse.c 2018-01-19 07:58:58.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/plugins/splash/script/script-parse.c 2018-10-18 13:17:02.000000000 +0200
@@ -54,6 +54,7 @@
static script_exp_t *script_parse_exp (script_scan_t *scan);
static ply_list_t *script_parse_op_list (script_scan_t *scan);
static void script_parse_op_list_free (ply_list_t *op_list);
+static void script_parse_exp_free (script_exp_t *exp);
static script_exp_t *script_parse_new_exp (script_exp_type_t type,
script_debug_location_t *location)
@@ -225,10 +226,33 @@
}
}
+static void
+free_parameter_list (script_scan_t *scan,
+ ply_list_t *parameter_list)
+{
+ if (parameter_list != NULL) {
+ ply_list_node_t *node;
+
+ node = ply_list_get_first_node (parameter_list);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ char *parameter;
+
+ parameter = ply_list_node_get_data (node);
+ next_node = ply_list_get_next_node (parameter_list, node);
+ free (parameter);
+ ply_list_remove_node (parameter_list, node);
+
+ node = next_node;
+ }
+ }
+}
+
static script_function_t *script_parse_function_def (script_scan_t *scan)
{
script_scan_token_t *curtoken = script_scan_get_current_token (scan);
- ply_list_t *parameter_list;
+ script_function_t *function = NULL;
+ ply_list_t *parameter_list = NULL;
if (!script_scan_token_is_symbol_of_value (curtoken, '(')) {
script_parse_error (&curtoken->location,
@@ -243,7 +267,7 @@
if (!script_scan_token_is_identifier (curtoken)) {
script_parse_error (&curtoken->location,
"Function declaration parameters must be valid identifiers");
- return NULL;
+ goto out;
}
char *parameter = strdup (curtoken->data.string);
ply_list_append_data (parameter_list, parameter);
@@ -254,7 +278,7 @@
if (!script_scan_token_is_symbol_of_value (curtoken, ',')) {
script_parse_error (&curtoken->location,
"Function declaration parameters must separated with ',' and terminated with a ')'");
- return NULL;
+ goto out;
}
curtoken = script_scan_get_next_token (scan);
}
@@ -263,9 +287,12 @@
script_op_t *func_op = script_parse_op (scan);
- script_function_t *function = script_function_script_new (func_op,
- NULL,
- parameter_list);
+ function = script_function_script_new (func_op,
+ NULL,
+ parameter_list);
+ parameter_list = NULL;
+out:
+ free_parameter_list (scan, parameter_list);
return function;
}
@@ -327,8 +354,18 @@
curtoken = script_scan_get_current_token (scan);
if (script_scan_token_is_symbol_of_value (curtoken, ']')) break;
if (!script_scan_token_is_symbol_of_value (curtoken, ',')) {
+ ply_list_node_t *node;
script_parse_error (&curtoken->location,
"Set parameters should be separated with a ',' and terminated with a ']'");
+
+
+ for (node = ply_list_get_first_node (parameters);
+ node;
+ node = ply_list_get_next_node (parameters, node)) {
+ script_exp_t *sub = ply_list_node_get_data (node);
+ script_parse_exp_free (sub);
+ }
+ ply_list_free (parameters);
return NULL;
}
curtoken = script_scan_get_next_token (scan);
@@ -377,8 +414,18 @@
curtoken = script_scan_get_current_token (scan);
if (script_scan_token_is_symbol_of_value (curtoken, ')')) break;
if (!script_scan_token_is_symbol_of_value (curtoken, ',')) {
+ ply_list_node_t *node;
+
script_parse_error (&curtoken->location,
"Function parameters should be separated with a ',' and terminated with a ')'");
+
+ for (node = ply_list_get_first_node (parameters);
+ node;
+ node = ply_list_get_next_node (parameters, node)) {
+ script_exp_t *sub = ply_list_node_get_data (node);
+ script_parse_exp_free (sub);
+ }
+ ply_list_free (parameters);
return NULL;
}
curtoken = script_scan_get_next_token (scan);
@@ -992,6 +1039,7 @@
curtoken = script_scan_get_current_token (scan);
if (curtoken->type != SCRIPT_SCAN_TOKEN_TYPE_EOF) {
script_parse_error (&curtoken->location, "Unparsed characters at end of file");
+ script_parse_op_list_free (list);
return NULL;
}
script_op_t *op = script_parse_new_op_block (list, &location);
@@ -1015,6 +1063,7 @@
curtoken = script_scan_get_current_token (scan);
if (curtoken->type != SCRIPT_SCAN_TOKEN_TYPE_EOF) {
script_parse_error (&curtoken->location, "Unparsed characters at end of file");
+ script_parse_op_list_free (list);
return NULL;
}
script_op_t *op = script_parse_new_op_block (list, &location);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/plugins/splash/two-step/plugin.c new/plymouth-0.9.3+git20181016.a588b3f/src/plugins/splash/two-step/plugin.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/plugins/splash/two-step/plugin.c 2018-08-22 09:08:15.000000000 +0200
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/plugins/splash/two-step/plugin.c 2018-10-18 13:17:02.000000000 +0200
@@ -662,6 +662,8 @@
ply_trace ("unknown progress function %s, defaulting to linear", progress_function);
plugin->progress_function = PROGRESS_FUNCTION_TYPE_LINEAR;
}
+
+ free (progress_function);
}
plugin->views = ply_list_new ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.3+git20180827.0a66272/src/ply-boot-server.c new/plymouth-0.9.3+git20181016.a588b3f/src/ply-boot-server.c
--- old/plymouth-0.9.3+git20180827.0a66272/src/ply-boot-server.c 2018-01-19 07:58:58.000000000 +0100
+++ new/plymouth-0.9.3+git20181016.a588b3f/src/ply-boot-server.c 2018-10-18 13:17:02.000000000 +0200
@@ -386,6 +386,7 @@
strlen (PLY_BOOT_PROTOCOL_RESPONSE_TYPE_NAK)))
ply_trace ("could not finish writing is-not-root nak: %m");
+ free (argument);
free (command);
return;
}
@@ -466,6 +467,8 @@
if (server->deactivate_handler != NULL)
server->deactivate_handler (server->user_data, deactivate_trigger, server);
+ else
+ ply_trigger_free (deactivate_trigger);
free (argument);
free (command);
@@ -491,6 +494,8 @@
if (server->quit_handler != NULL)
server->quit_handler (server->user_data, retain_splash, quit_trigger, server);
+ else
+ ply_trigger_free (quit_trigger);
free (argument);
free (command);
@@ -511,6 +516,9 @@
argument,
answer,
server);
+ } else {
+ ply_trigger_free (answer);
+ free (argument);
}
/* will reply later
*/
@@ -592,6 +600,9 @@
argument,
answer,
server);
+ } else {
+ ply_trigger_free (answer);
+ free (argument);
}
/* will reply later
*/
@@ -621,6 +632,9 @@
argument,
answer,
server);
+ } else {
+ ply_trigger_free (answer);
+ free (argument);
}
/* will reply later
*/
@@ -659,6 +673,7 @@
strlen (PLY_BOOT_PROTOCOL_RESPONSE_TYPE_NAK)))
ply_trace ("could not finish writing nak: %m");
+ free (argument);
free (command);
return;
}
@@ -670,6 +685,7 @@
strlen (PLY_BOOT_PROTOCOL_RESPONSE_TYPE_NAK)))
ply_trace ("could not finish writing ping reply: %m");
+ free (argument);
free (command);
return;
}
@@ -678,6 +694,7 @@
PLY_BOOT_PROTOCOL_RESPONSE_TYPE_ACK,
strlen (PLY_BOOT_PROTOCOL_RESPONSE_TYPE_ACK)))
ply_trace ("could not finish writing ack: %m");
+ free (argument);
free (command);
}