Accepting request 108532 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/108532
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=91

systemd-gtk.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 29 13:22:17 UTC 2012 - fcrozat@suse.com
+
+- Add systemd-journald-fix-endianess-bug.patch: fix journald not
+  starting on ppc architecture.
+- Add correct_plymouth_paths_and_conflicts.patch: ensure plymouth
+  is correctly called and conflicts with bootsplash.
+
 -------------------------------------------------------------------
 Tue Feb 21 08:58:31 UTC 2012 - fcrozat@suse.com
 

systemd-journald-fix-endianess-bug.patch

@@ -0,0 +1,25 @@
+From 8dc6b88fd2dad113d7dab776d623d7b301e4b754 Mon Sep 17 00:00:00 2001
+From: Dirk Eibach <eibach@gdsys.de>
+Date: Wed, 29 Feb 2012 12:45:46 +0100
+Subject: [PATCH] systemd-journald: fix endianess bug
+
+---
+ src/journal/journal-file.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index 20ca3f6..275caea 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -238,7 +238,7 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
+         if (fstat(f->fd, &f->last_stat) < 0)
+                 return -errno;
+ 
+-        f->header->arena_size = new_size - htole64(f->header->arena_offset);
++        f->header->arena_size = htole64(new_size - le64toh(f->header->arena_offset));
+ 
+         return 0;
+ }
+-- 
+1.7.7
+

systemd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 29 13:22:17 UTC 2012 - fcrozat@suse.com
+
+- Add systemd-journald-fix-endianess-bug.patch: fix journald not
+  starting on ppc architecture.
+- Add correct_plymouth_paths_and_conflicts.patch: ensure plymouth
+  is correctly called and conflicts with bootsplash.
+
 -------------------------------------------------------------------
 Tue Feb 21 08:58:31 UTC 2012 - fcrozat@suse.com
 

systemd.spec

@@ -87,6 +87,7 @@ Patch39:        correct_plymouth_paths_and_conflicts.patch
 # in the patch. Any patches added here without a very good reason to make
 # an exception will be silently removed with the next version update.
 Patch21:        no-tmpfs-fsck.patch
+Patch40:        systemd-journald-fix-endianess-bug.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -146,6 +147,7 @@ Plymouth integration for systemd
 %patch36 -p1
 %patch38 -p1
 %patch39 -p1
+%patch40 -p1
 
 %build
 autoreconf -fiv