OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=116

plymouth-close.patch

@@ -1,27 +0,0 @@
-From 5784c8ff0c425b0948b653541c58fb8493515aa7 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 6 Jun 2013 10:08:55 -0400
-Subject: [PATCH] logger: don't close already logger if already closed
-
-This prevents close(-1) from showing up in strace
----
- src/libply/ply-logger.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/libply/ply-logger.c b/src/libply/ply-logger.c
-index 5ea0b5e..ec5b6e5 100644
---- a/src/libply/ply-logger.c
-+++ b/src/libply/ply-logger.c
-@@ -357,6 +357,9 @@ ply_logger_close_file (ply_logger_t *logger)
- {
-   assert (logger != NULL);
- 
-+  if (logger->output_fd < 0)
-+      return;
-+
-   close (logger->output_fd);
-   ply_logger_set_output_fd (logger, -1);
- }
--- 
-1.8.1.4
-

plymouth.changes

@@ -3,6 +3,7 @@ Thu Aug  1 14:08:53 UTC 2013 - tittiatcoke@gmail.com
 
 - Update to version 0.8.8_git201308011340
   - Drop patch plymouth-correct-systemd-prefix.patch
+  - Drop patch plymouth-close.patch
 
 -------------------------------------------------------------------
 Mon Jul 29 16:23:21 UTC 2013 - tittiatcoke@gmail.com

plymouth.spec

@@ -43,8 +43,6 @@ Patch9:         plymouth-dracut-path.patch
 Patch10:        0001-Some-greenish-openSUSE-colors.patch
 # PATCH-OPENSUSE -- plymouth-correct-runtime-dir.patch tittiatcoke@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 fcrozat@suse.com -- do not try to close negative fd
-Patch17:        plymouth-close.patch
 # PATCH-FIX-UPSTREAM plymouth-close-deactivate.patch bnc#811185 fcrozat@suse.com -- close stdout/stderr on deactivate 
 Patch18:        plymouth-close-unredirect.patch
 # PATCH-FIX-UPSTREAM plymouth-redirect-null.patch bnc#811185 fcrozat@suse.com -- redirect standard io to /dev/null
@@ -324,7 +322,6 @@ plugin.
 %patch9 -p0
 %patch10 -p1
 %patch16 -p1
-%patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1