Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory
checked in at 2013-08-02 15:28:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2013-08-01
17:14:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2013-08-02
15:28:28.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Aug 1 14:08:53 UTC 2013 - tittiatc...@gmail.com
+
+- Update to version 0.8.8_git201308011340
+ - Drop patch plymouth-correct-systemd-prefix.patch
+ - Drop patch plymouth-close.patch
+ - Drop patch plymouth-close-unredirect.patch
+ - Drop patch plymouth-redirect-null.patch
+ - Drop patch plymouth-exit-code.patch
+ - Drop patch plymouth-terminal-session-close.patch
+
+-------------------------------------------------------------------
Old:
----
plymouth-0.8.8_git201304161248.tar.xz
plymouth-close-unredirect.patch
plymouth-close.patch
plymouth-correct-systemd-prefix.patch
plymouth-exit-code.patch
plymouth-redirect-null.patch
plymouth-terminal-session-close.patch
New:
----
plymouth-0.8.8_git201308011340.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.SO48vL/_old 2013-08-02 15:28:29.000000000 +0200
+++ /var/tmp/diff_new_pack.SO48vL/_new 2013-08-02 15:28:29.000000000 +0200
@@ -22,7 +22,7 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
-Version: 0.8.8_git201304161248
+Version: 0.8.8_git201308011340
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0+
@@ -43,18 +43,6 @@
Patch10: 0001-Some-greenish-openSUSE-colors.patch
# PATCH-OPENSUSE -- plymouth-correct-runtime-dir.patch tittiatc...@gmail.com
-- make sure the runtime directory is /run and not /var/run
Patch16: plymouth-correct-runtime-dir.patch
-# PATCH-FIX-UPSTREAM plymouth-close.patch fcro...@suse.com -- do not try to
close negative fd
-Patch17: plymouth-close.patch
-# PATCH-FIX-UPSTREAM plymouth-close-deactivate.patch bnc#811185
fcro...@suse.com -- close stdout/stderr on deactivate
-Patch18: plymouth-close-unredirect.patch
-# PATCH-FIX-UPSTREAM plymouth-redirect-null.patch bnc#811185 fcro...@suse.com
-- redirect standard io to /dev/null
-Patch19: plymouth-redirect-null.patch
-# PATCH-FIX-UPSTREAM plymouth-exit-code.patch fcro...@suse.com -- ensure all
exit code are ignored in ExecStartPost
-Patch20: plymouth-exit-code.patch
-# PATCH-FIX-UPSTREAM plymouth-terminal-session-close.patch fcro...@suse.com --
do not close already closed terminal session fd
-Patch21: plymouth-terminal-session-close.patch
-# PATCH-FIX-UPSTREAM plymouth-correct-systemd-prefix.patch
tittiatc...@gmail.com -- Use the correct systemd prefixes
-Patch22: plymouth-correct-systemd-prefix.patch
BuildRequires: automake
BuildRequires: kernel-headers
BuildRequires: libtool
@@ -326,12 +314,6 @@
%patch9 -p0
%patch10 -p1
%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
# replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
++++++ plymouth-0.8.8_git201304161248.tar.xz ->
plymouth-0.8.8_git201308011340.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201304161248/.git/HEAD
new/plymouth-0.8.8_git201308011340/.git/HEAD
--- old/plymouth-0.8.8_git201304161248/.git/HEAD 1970-01-01
01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/HEAD 2013-08-01
15:44:09.000000000 +0200
@@ -0,0 +1 @@
+ref: refs/heads/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201304161248/.git/config
new/plymouth-0.8.8_git201308011340/.git/config
--- old/plymouth-0.8.8_git201304161248/.git/config 1970-01-01
01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/config 2013-08-01
15:44:09.000000000 +0200
@@ -0,0 +1,11 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+[remote "origin"]
+ url = git://anongit.freedesktop.org/plymouth
+ 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.8.8_git201304161248/.git/description
new/plymouth-0.8.8_git201308011340/.git/description
--- old/plymouth-0.8.8_git201304161248/.git/description 1970-01-01
01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/description 2013-08-01
15:43:42.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.8.8_git201304161248/.git/hooks/applypatch-msg.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/applypatch-msg.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/applypatch-msg.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/applypatch-msg.sample
2013-08-01 15:43:42.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
+test -x "$GIT_DIR/hooks/commit-msg" &&
+ exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/.git/hooks/commit-msg.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/commit-msg.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/commit-msg.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/commit-msg.sample
2013-08-01 15:43:42.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.8.8_git201304161248/.git/hooks/post-update.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/post-update.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/post-update.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/post-update.sample
2013-08-01 15:43:42.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.8.8_git201304161248/.git/hooks/pre-applypatch.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/pre-applypatch.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/pre-applypatch.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/pre-applypatch.sample
2013-08-01 15:43:42.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
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/.git/hooks/pre-commit.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/pre-commit.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/pre-commit.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/pre-commit.sample
2013-08-01 15:43:42.000000000 +0200
@@ -0,0 +1,50 @@
+#!/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 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
+ echo "Error: Attempt to add a non-ascii file name."
+ echo
+ echo "This can cause problems if you want to work"
+ echo "with people on other platforms."
+ echo
+ echo "To be portable it is advisable to rename the file ..."
+ echo
+ echo "If you know what you are doing you can disable this"
+ echo "check using:"
+ echo
+ echo " git config hooks.allownonascii true"
+ echo
+ 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.8.8_git201304161248/.git/hooks/pre-push.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/pre-push.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/pre-push.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/pre-push.sample
2013-08-01 15:43:42.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
+
+IFS=' '
+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 "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.8.8_git201304161248/.git/hooks/pre-rebase.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/pre-rebase.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/pre-rebase.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/pre-rebase.sample
2013-08-01 15:43:42.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.8.8_git201304161248/.git/hooks/prepare-commit-msg.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/prepare-commit-msg.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/prepare-commit-msg.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/prepare-commit-msg.sample
2013-08-01 15:43:42.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.8.8_git201304161248/.git/hooks/update.sample
new/plymouth-0.8.8_git201308011340/.git/hooks/update.sample
--- old/plymouth-0.8.8_git201304161248/.git/hooks/update.sample 1970-01-01
01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/hooks/update.sample 2013-08-01
15:43:42.000000000 +0200
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks 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
Files old/plymouth-0.8.8_git201304161248/.git/index and
new/plymouth-0.8.8_git201308011340/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201304161248/.git/info/exclude
new/plymouth-0.8.8_git201308011340/.git/info/exclude
--- old/plymouth-0.8.8_git201304161248/.git/info/exclude 1970-01-01
01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/info/exclude 2013-08-01
15:43:42.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.8.8_git201304161248/.git/logs/HEAD
new/plymouth-0.8.8_git201308011340/.git/logs/HEAD
--- old/plymouth-0.8.8_git201304161248/.git/logs/HEAD 1970-01-01
01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/logs/HEAD 2013-08-01
15:44:09.000000000 +0200
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000
53f6b44e11cf552e67fb3b45f480eb55dbf2a975 Raymond Wooninck
<tittiatc...@gmail.com> 1375364649 +0200 clone: from
git://anongit.freedesktop.org/plymouth
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/.git/logs/refs/heads/master
new/plymouth-0.8.8_git201308011340/.git/logs/refs/heads/master
--- old/plymouth-0.8.8_git201304161248/.git/logs/refs/heads/master
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/logs/refs/heads/master
2013-08-01 15:44:09.000000000 +0200
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000
53f6b44e11cf552e67fb3b45f480eb55dbf2a975 Raymond Wooninck
<tittiatc...@gmail.com> 1375364649 +0200 clone: from
git://anongit.freedesktop.org/plymouth
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/.git/logs/refs/remotes/origin/HEAD
new/plymouth-0.8.8_git201308011340/.git/logs/refs/remotes/origin/HEAD
--- old/plymouth-0.8.8_git201304161248/.git/logs/refs/remotes/origin/HEAD
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/logs/refs/remotes/origin/HEAD
2013-08-01 15:44:09.000000000 +0200
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000
53f6b44e11cf552e67fb3b45f480eb55dbf2a975 Raymond Wooninck
<tittiatc...@gmail.com> 1375364649 +0200 clone: from
git://anongit.freedesktop.org/plymouth
Files
old/plymouth-0.8.8_git201304161248/.git/objects/pack/pack-730fe3beaba0a5ddd32fd9aa870f6b025a41d464.idx
and
new/plymouth-0.8.8_git201308011340/.git/objects/pack/pack-730fe3beaba0a5ddd32fd9aa870f6b025a41d464.idx
differ
Files
old/plymouth-0.8.8_git201304161248/.git/objects/pack/pack-730fe3beaba0a5ddd32fd9aa870f6b025a41d464.pack
and
new/plymouth-0.8.8_git201308011340/.git/objects/pack/pack-730fe3beaba0a5ddd32fd9aa870f6b025a41d464.pack
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201304161248/.git/packed-refs
new/plymouth-0.8.8_git201308011340/.git/packed-refs
--- old/plymouth-0.8.8_git201304161248/.git/packed-refs 1970-01-01
01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/packed-refs 2013-08-01
15:44:09.000000000 +0200
@@ -0,0 +1,58 @@
+# 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
+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
+53f6b44e11cf552e67fb3b45f480eb55dbf2a975 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
+7432db8f2f2c87afbc789d7bcfc387341b8eb36d refs/remotes/origin/transition
+24cc17299df51bb59b356a77de3ce88a0806bfc8
refs/remotes/origin/wip/better-flush-notification
+f7f482174f1dcfa52c222f813e6b26dd106a12c1 refs/remotes/origin/wip/systemd-fixes
+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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/.git/refs/heads/master
new/plymouth-0.8.8_git201308011340/.git/refs/heads/master
--- old/plymouth-0.8.8_git201304161248/.git/refs/heads/master 1970-01-01
01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/refs/heads/master 2013-08-01
15:44:09.000000000 +0200
@@ -0,0 +1 @@
+53f6b44e11cf552e67fb3b45f480eb55dbf2a975
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/.git/refs/remotes/origin/HEAD
new/plymouth-0.8.8_git201308011340/.git/refs/remotes/origin/HEAD
--- old/plymouth-0.8.8_git201304161248/.git/refs/remotes/origin/HEAD
1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.8_git201308011340/.git/refs/remotes/origin/HEAD
2013-08-01 15:44:09.000000000 +0200
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/src/libply/ply-key-file.c
new/plymouth-0.8.8_git201308011340/src/libply/ply-key-file.c
--- old/plymouth-0.8.8_git201304161248/src/libply/ply-key-file.c
2013-04-16 14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/src/libply/ply-key-file.c
2013-08-01 15:44:09.000000000 +0200
@@ -25,6 +25,7 @@
#include "ply-key-file.h"
#include <assert.h>
+#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <string.h>
@@ -179,7 +180,12 @@
key = NULL;
value = NULL;
- first_byte = fgetc (key_file->fp);
+ do
+ {
+ first_byte = fgetc (key_file->fp);
+ }
+ while (isspace (first_byte));
+
if (first_byte == '#')
{
char *line_to_toss;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/src/libply/ply-logger.c
new/plymouth-0.8.8_git201308011340/src/libply/ply-logger.c
--- old/plymouth-0.8.8_git201304161248/src/libply/ply-logger.c 2013-04-16
14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/src/libply/ply-logger.c 2013-08-01
15:44:09.000000000 +0200
@@ -357,6 +357,9 @@
{
assert (logger != NULL);
+ if (logger->output_fd < 0)
+ return;
+
close (logger->output_fd);
ply_logger_set_output_fd (logger, -1);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/src/libply/ply-terminal-session.c
new/plymouth-0.8.8_git201308011340/src/libply/ply-terminal-session.c
--- old/plymouth-0.8.8_git201304161248/src/libply/ply-terminal-session.c
2013-04-16 14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/src/libply/ply-terminal-session.c
2013-08-01 15:44:09.000000000 +0200
@@ -148,7 +148,8 @@
ply_free_string_array (session->argv);
- close (session->pseudoterminal_master_fd);
+ if (session->pseudoterminal_master_fd >= 0)
+ close (session->pseudoterminal_master_fd);
free (session);
}
@@ -213,8 +214,12 @@
assert (session->console_is_redirected);
fd = open ("/dev/console", O_RDWR | O_NOCTTY);
- if (fd >= 0)
+ if (fd >= 0) {
ioctl (fd, TIOCCONS);
+ close (fd);
+ } else {
+ ply_trace ("couldn't open /dev/console to stop redirecting it: %m");
+ }
session->console_is_redirected = false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201304161248/src/main.c
new/plymouth-0.8.8_git201308011340/src/main.c
--- old/plymouth-0.8.8_git201304161248/src/main.c 2013-04-16
14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/src/main.c 2013-08-01
15:44:09.000000000 +0200
@@ -150,8 +150,10 @@
const char *default_tty,
bool should_add_displays);
static void toggle_between_splash_and_details (state_t *state);
+#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
static void tell_systemd_to_print_details (state_t *state);
static void tell_systemd_to_stop_printing_details (state_t *state);
+#endif
static const char * get_cache_file_for_mode (ply_mode_t mode);
static void
@@ -616,7 +618,7 @@
filename = NULL;
break;
default:
- fprintf (stderr, "Unhandled case in %s line %d\n", __FILE__, __LINE__);
+ ply_error ("Unhandled case in %s line %d\n", __FILE__, __LINE__);
abort ();
break;
}
@@ -640,7 +642,7 @@
filename = _PATH_DEVNULL;
break;
default:
- fprintf (stderr, "Unhandled case in %s line %d\n", __FILE__, __LINE__);
+ ply_error ("Unhandled case in %s line %d\n", __FILE__, __LINE__);
abort ();
break;
}
@@ -664,7 +666,7 @@
filename = NULL;
break;
default:
- fprintf (stderr, "Unhandled case in %s line %d\n", __FILE__, __LINE__);
+ ply_error ("Unhandled case in %s line %d\n", __FILE__, __LINE__);
abort ();
break;
}
@@ -1098,6 +1100,13 @@
ply_terminal_stop_watching_for_vt_changes
(state->local_console_terminal);
ply_terminal_set_buffered_input (state->local_console_terminal);
ply_terminal_ignore_mode_changes (state->local_console_terminal, true);
+ ply_terminal_close (state->local_console_terminal);
+ }
+
+ /* do not let any tty opened where we could write after deactivate */
+ if (command_line_has_argument (state->kernel_command_line, "plymouth.debug"))
+ {
+ ply_logger_close_file (ply_logger_get_error_default ());
}
state->is_inactive = true;
@@ -1191,6 +1200,7 @@
if (state->local_console_terminal != NULL)
{
+ ply_terminal_open (state->local_console_terminal);
ply_terminal_watch_for_vt_changes (state->local_console_terminal);
ply_terminal_set_unbuffered_input (state->local_console_terminal);
ply_terminal_ignore_mode_changes (state->local_console_terminal, false);
@@ -1890,6 +1900,33 @@
ply_logger_set_output_fd (ply_logger_get_error_default (), fd);
}
free (stream_copy);
+ } else {
+ const char* device;
+ char *file;
+
+ if (state->kernel_console_tty != NULL)
+ device = state->kernel_console_tty;
+ else
+ device = state->default_tty;
+
+ ply_trace ("redirecting debug output to %s", device);
+
+ if (strncmp (device, "/dev/", strlen ("/dev/")) == 0)
+ file = strdup (device);
+ else
+ asprintf (&file, "/dev/%s", device);
+
+ fd = open (file, O_RDWR | O_APPEND);
+
+ if (fd < 0)
+ {
+ ply_trace ("could not redirected debug output to %s: %m",
device);
+ }
+ else {
+ ply_logger_set_output_fd (ply_logger_get_error_default (), fd);
+ }
+
+ free (file);
}
}
else
@@ -2157,21 +2194,11 @@
}
static bool
-redirect_standard_io_to_device (const char *device)
+redirect_standard_io_to_dev_null (void)
{
int fd;
- char *file;
-
- ply_trace ("redirecting stdio to %s", device);
-
- if (strncmp (device, "/dev/", strlen ("/dev/")) == 0)
- file = strdup (device);
- else
- asprintf (&file, "/dev/%s", device);
- fd = open (file, O_RDWR | O_APPEND);
-
- free (file);
+ fd = open ("/dev/null", O_RDWR | O_APPEND);
if (fd < 0)
return false;
@@ -2214,19 +2241,6 @@
if (!get_kernel_command_line (state))
return false;
- check_verbosity (state);
- check_logging (state);
-
- ply_trace ("source built on %s", __DATE__);
-
- state->keystroke_triggers = ply_list_new ();
- state->entry_triggers = ply_list_new ();
- state->entry_buffer = ply_buffer_new();
- state->pixel_displays = ply_list_new ();
- state->text_displays = ply_list_new ();
- state->messages = ply_list_new ();
- state->keyboard = NULL;
-
if (!state->default_tty)
{
if (state->mode == PLY_MODE_SHUTDOWN)
@@ -2247,12 +2261,23 @@
}
}
+ check_verbosity (state);
+ check_logging (state);
+
+ ply_trace ("source built on %s", __DATE__);
+
+ state->keystroke_triggers = ply_list_new ();
+ state->entry_triggers = ply_list_new ();
+ state->entry_buffer = ply_buffer_new();
+ state->pixel_displays = ply_list_new ();
+ state->text_displays = ply_list_new ();
+ state->messages = ply_list_new ();
+ state->keyboard = NULL;
+
+
check_for_consoles (state, state->default_tty, false);
- if (state->kernel_console_tty != NULL)
- redirect_standard_io_to_device (state->kernel_console_tty);
- else
- redirect_standard_io_to_device (state->default_tty);
+ redirect_standard_io_to_dev_null ();
ply_trace ("Making sure " PLYMOUTH_RUNTIME_DIR " exists");
if (!ply_create_directory (PLYMOUTH_RUNTIME_DIR))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-math.c
new/plymouth-0.8.8_git201308011340/src/plugins/splash/script/script-lib-math.c
---
old/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-math.c
2013-04-16 14:48:40.000000000 +0200
+++
new/plymouth-0.8.8_git201308011340/src/plugins/splash/script/script-lib-math.c
2013-08-01 15:44:09.000000000 +0200
@@ -22,6 +22,7 @@
#include "config.h"
+#include "ply-utils.h"
#include "script.h"
#include "script-parse.h"
#include "script-execute.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-plymouth.c
new/plymouth-0.8.8_git201308011340/src/plugins/splash/script/script-lib-plymouth.c
---
old/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-plymouth.c
2013-04-16 14:48:40.000000000 +0200
+++
new/plymouth-0.8.8_git201308011340/src/plugins/splash/script/script-lib-plymouth.c
2013-08-01 15:44:09.000000000 +0200
@@ -64,6 +64,7 @@
case PLY_BOOT_SPLASH_MODE_UPDATES:
obj = script_obj_new_string ("updates");
break;
+ case PLY_BOOT_SPLASH_MODE_INVALID:
default:
obj = script_obj_new_string ("unknown");
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-scan.c
new/plymouth-0.8.8_git201308011340/src/plugins/splash/script/script-scan.c
--- old/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-scan.c
2013-04-16 14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/src/plugins/splash/script/script-scan.c
2013-08-01 15:44:09.000000000 +0200
@@ -30,6 +30,7 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
+#include <limits.h>
#include "ply-bitarray.h"
#include "script-scan.h"
@@ -371,11 +372,13 @@
{
int i;
- if (scan->tokencount <= n)
+ /* we're screwed long before we ever actually hit INT_MAX; but at least
+ * we shouldn't get ourselves stuck in an infinite loop. */
+ if (scan->tokencount <= n && n < INT_MAX)
{
scan->tokens =
realloc (scan->tokens, (n + 1) * sizeof (script_scan_token_t *));
- for (i = scan->tokencount; i <= n; i++)
/* FIXME warning about possibely inifnite loop */
+ for (i = scan->tokencount; i <= n; i++)
{
scan->tokens[i] = malloc (sizeof (script_scan_token_t));
scan->tokens[i]->type = SCRIPT_SCAN_TOKEN_TYPE_EMPTY;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-halt.service.in
new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-halt.service.in
--- old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-halt.service.in
2013-04-16 14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-halt.service.in
2013-08-01 15:44:09.000000000 +0200
@@ -1,7 +1,7 @@
[Unit]
Description=Show Plymouth Halt Screen
-After=getty@tty1.service prefdm.service plymouth-start.service
-Before=halt.service
+After=getty@tty1.service display-manager.service plymouth-start.service
+Before=systemd-halt.service
DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-kexec.service.in
new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-kexec.service.in
--- old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-kexec.service.in
2013-04-16 14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-kexec.service.in
2013-08-01 15:44:09.000000000 +0200
@@ -1,7 +1,7 @@
[Unit]
Description=Show Plymouth Reboot with kexec Screen
-After=getty@tty1.service prefdm.service plymouth-start.service
-Before=kexec.service
+After=getty@tty1.service display-manager.service plymouth-start.service
+Before=systemd-kexec.service
DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-poweroff.service.in
new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-poweroff.service.in
---
old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-poweroff.service.in
2013-04-16 14:48:40.000000000 +0200
+++
new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-poweroff.service.in
2013-08-01 15:44:09.000000000 +0200
@@ -1,7 +1,7 @@
[Unit]
Description=Show Plymouth Power Off Screen
-After=getty@tty1.service prefdm.service plymouth-start.service
-Before=poweroff.service
+After=getty@tty1.service display-manager.service plymouth-start.service
+Before=systemd-poweroff.service
DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-reboot.service.in
new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-reboot.service.in
--- old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-reboot.service.in
2013-04-16 14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-reboot.service.in
2013-08-01 15:44:09.000000000 +0200
@@ -1,7 +1,7 @@
[Unit]
Description=Show Plymouth Reboot Screen
-After=getty@tty1.service prefdm.service plymouth-start.service
-Before=reboot.service
+After=getty@tty1.service display-manager.service plymouth-start.service
+Before=systemd-reboot.service
DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-start.service.in
new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-start.service.in
--- old/plymouth-0.8.8_git201304161248/systemd-units/plymouth-start.service.in
2013-04-16 14:48:40.000000000 +0200
+++ new/plymouth-0.8.8_git201308011340/systemd-units/plymouth-start.service.in
2013-08-01 15:44:09.000000000 +0200
@@ -8,7 +8,7 @@
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot
--pid-file=@plymouthruntimedir@/pid --attach-to-session
-ExecStartPost=-@UDEVADM@ settle --timeout=30
--exit-if-exists=/sys/class/drm/card0/dev ; @UDEVADM@ settle --timeout=30
--exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth
show-splash
+ExecStartPost=-@UDEVADM@ settle --timeout=30
--exit-if-exists=/sys/class/drm/card0/dev ; -@UDEVADM@ settle --timeout=30
--exit-if-exists=/sys/class/graphics/fb0/dev ; -@PLYMOUTH_CLIENT_DIR@/plymouth
show-splash
Type=forking
KillMode=none
SendSIGKILL=no
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
