From d5084b220dbe966769ef97284124a9561d38f345 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 23 Sep 2012 02:32:55 +0200
Subject: [PATCH] systemd: update to systemd-191

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/systemd/meta                |  2 +-
 .../patches/systemd-189-broken-HAVE_XZ.patch  | 33 --------
 .../systemd-189-missing_includes.patch        | 78 -------------------
 3 files changed, 1 insertion(+), 112 deletions(-)
 delete mode 100644 packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch
 delete mode 100644 packages/sysutils/systemd/patches/systemd-189-missing_includes.patch

diff --git a/packages/sysutils/systemd/meta b/packages/sysutils/systemd/meta
index 9dbb17edf9..cf26819121 100644
--- a/packages/sysutils/systemd/meta
+++ b/packages/sysutils/systemd/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="systemd"
-PKG_VERSION="189"
+PKG_VERSION="191"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch b/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch
deleted file mode 100644
index 717a2aafc6..0000000000
--- a/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Without this, build fail if we --disable-xz or does not have xz installed in
-system.
-
-Signed-off-by: Yin Kangkai <kangkai.yin at intel.com>
----
- src/journal/journal-verify.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index 2401293..5d134bd 100644
---- a/src/journal/journal-verify.c
-+++ b/src/journal/journal-verify.c
-@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
-                 h1 = le64toh(o->data.hash);
- 
-                 if (o->object.flags & OBJECT_COMPRESSED) {
-+#ifdef HAVE_XZ
-                         void *b = NULL;
-                         uint64_t alloc = 0, b_size;
- 
-@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
- 
-                         h2 = hash64(b, b_size);
-                         free(b);
-+#else
-+                        return -EPROTONOSUPPORT;
-+#endif
-                 } else
-                         h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
- 
--- 
-1.7.3.4
-
diff --git a/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch b/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch
deleted file mode 100644
index 19ff579cc5..0000000000
--- a/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Allin Cottrell <cottrell@wfu.edu>
-Date: Thu, 23 Aug 2012 23:46:38 +0000
-Subject: journald: add missing includes
-
----
-diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
-index 6cd2397..2596d44 100644
---- a/src/journal/journald-console.c
-+++ b/src/journal/journald-console.c
-@@ -21,6 +21,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/socket.h>
- 
- #include "journald.h"
- #include "journald-console.h"
-diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
-index 2f83cbd..32474df 100644
---- a/src/journal/journald-gperf.gperf
-+++ b/src/journal/journald-gperf.gperf
-@@ -1,5 +1,6 @@
- %{
- #include <stddef.h>
-+#include <sys/socket.h>
- #include "conf-parser.h"
- #include "journald.h"
- %}
-diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
-index aebca5d..b259480 100644
---- a/src/journal/journald-kmsg.c
-+++ b/src/journal/journald-kmsg.c
-@@ -23,6 +23,7 @@
- #include <sys/epoll.h>
- #include <fcntl.h>
- #include <sys/mman.h>
-+#include <sys/socket.h>
- 
- #include <systemd/sd-messages.h>
- #include <libudev.h>
-diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
-index 7aa99a3..4e44c3a 100644
---- a/src/journal/journald-native.c
-+++ b/src/journal/journald-native.c
-@@ -20,6 +20,7 @@
- ***/
- 
- #include <unistd.h>
-+#include <stddef.h>
- #include <sys/epoll.h>
- 
- #include "socket-util.h"
-diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 3e4022a..113c421 100644
---- a/src/journal/journald-stream.c
-+++ b/src/journal/journald-stream.c
-@@ -21,6 +21,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
-+#include <stddef.h>
- #include <sys/epoll.h>
- 
- #ifdef HAVE_SELINUX
-diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index daed095..9db9198 100644
---- a/src/journal/journald-syslog.c
-+++ b/src/journal/journald-syslog.c
-@@ -20,6 +20,7 @@
- ***/
- 
- #include <unistd.h>
-+#include <stddef.h>
- #include <sys/epoll.h>
- 
- #include "socket-util.h"
---
-cgit v0.9.0.2-2-gbebe