systemd: version bump 189 -> 193

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 19 insertions, 198 deletions

diff --git a/generic/etc/systemd/systemd-journald.conf b/generic/etc/systemd/journald.conf
index 1a8b61d16..1a810025a 100644
--- a/generic/etc/systemd/systemd-journald.conf
+++ b/generic/etc/systemd/journald.conf
@@ -1,14 +1,17 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 #
-# See system-journald.conf(5) for details
+# See journald.conf(5) for details
 
 [Journal]
+#Storage=auto
 #Compress=yes
+#Seal=yes
+#SplitMode=login
 #RateLimitInterval=10s
 #RateLimitBurst=200
 #SystemMaxUse=
@@ -22,4 +25,8 @@ RuntimeMaxUse=1M
 #ForwardToSyslog=yes
 #ForwardToKMsg=no
 #ForwardToConsole=no
-#ImportKernel=yes
+#TTYPath=/dev/console
+#MaxLevelStore=debug
+#MaxLevelSyslog=debug
+#MaxLevelKMsg=notice
+#MaxLevelConsole=info
diff --git a/patches/systemd-189/0001-journald-add-missing-includes.patch b/patches/systemd-189/0001-journald-add-missing-includes.patch
deleted file mode 100644
index 41dd8c52b..000000000
--- a/patches/systemd-189/0001-journald-add-missing-includes.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Allin Cottrell <cottrell@wfu.edu>
-Date: Fri, 24 Aug 2012 01:46:38 +0200
-Subject: [PATCH] journald: add missing includes
-
----
- src/journal/journald-console.c   |    1 +
- src/journal/journald-gperf.gperf |    1 +
- src/journal/journald-kmsg.c      |    1 +
- src/journal/journald-native.c    |    1 +
- src/journal/journald-stream.c    |    1 +
- src/journal/journald-syslog.c    |    1 +
- 6 files changed, 6 insertions(+)
-
-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"
diff --git a/patches/systemd-189/0002-journald-fix-building-with-XZ-support-disabled.patch b/patches/systemd-189/0002-journald-fix-building-with-XZ-support-disabled.patch
deleted file mode 100644
index ea485ca98..000000000
--- a/patches/systemd-189/0002-journald-fix-building-with-XZ-support-disabled.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 24 Aug 2012 11:25:56 +0200
-Subject: [PATCH] journald: fix building with XZ support disabled
-
-uncompress_blob() is not defined when XZ support is disabled. Without this
-patch building fails with
-[...]
-.../systemd-189/src/journal/journal-verify.c:69: undefined reference to `uncompress_blob'
-[...]
----
- src/journal/journal-verify.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-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));
- 
diff --git a/patches/systemd-189/0003-libsystemd-core-needs-libsystemd-id128-internal.patch b/patches/systemd-189/0003-libsystemd-core-needs-libsystemd-id128-internal.patch
deleted file mode 100644
index 013e52dbf..000000000
--- a/patches/systemd-189/0003-libsystemd-core-needs-libsystemd-id128-internal.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 3 Sep 2012 13:45:34 +0200
-Subject: [PATCH] libsystemd-core needs libsystemd-id128-internal
-
-Otherwise compiling may fail with e.g.:
-
-./.libs/libsystemd-core.a(libsystemd_core_la-condition.o): In function `test_host':
-[...]/systemd-189/src/core/condition.c:205: undefined reference to `sd_id128_from_string'
-[...]/systemd-189/src/core/condition.c:207: undefined reference to `sd_id128_get_machine'
-collect2: ld returned 1 exit status
-
-It seems that in most cases the compiler removes the relevant functions
-when optimizing. In some cases this does not happen, e.g. here with a PPC
-toolchain.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.am |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index d200dc3..cc98722 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1003,6 +1003,7 @@ libsystemd_core_la_LIBADD = \
- 	libsystemd-label.la \
- 	libsystemd-shared.la \
- 	libsystemd-dbus.la \
-+	libsystemd-id128-internal.la \
- 	libudev.la \
- 	$(LIBWRAP_LIBS) \
- 	$(PAM_LIBS) \
diff --git a/patches/systemd-189/0004-journal-don-t-try-to-compress-without-XZ.patch b/patches/systemd-189/0004-journal-don-t-try-to-compress-without-XZ.patch
deleted file mode 100644
index 4212274c4..000000000
--- a/patches/systemd-189/0004-journal-don-t-try-to-compress-without-XZ.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 3 Sep 2012 15:38:37 +0200
-Subject: [PATCH] journal: don't try to compress without XZ
-
-otherwise the header contains the HEADER_INCOMPATIBLE_COMPRESSED
-flag even though the data is not compressed and reading the journal
-fails.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/journal/journal-file.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 79f7598..81ba45c 100644
---- a/src/journal/journal-file.c
-+++ b/src/journal/journal-file.c
-@@ -2007,7 +2007,9 @@ int journal_file_open(
-         f->flags = flags;
-         f->prot = prot_from_flags(flags);
-         f->writable = (flags & O_ACCMODE) != O_RDONLY;
-+#ifdef HAVE_XZ
-         f->compress = compress;
-+#endif
-         f->seal = seal;
- 
-         if (mmap_cache)
diff --git a/patches/systemd-189/autogen.sh b/patches/systemd-189/autogen.sh
deleted file mode 100755
index 12cd04671..000000000
--- a/patches/systemd-189/autogen.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# don't recreate configure. Otherwise we would need libgcrypt for
-# AM_PATH_LIBGCRYPT
-aclocal -I m4 &&
-automake
diff --git a/patches/systemd-189/series b/patches/systemd-189/series
deleted file mode 100644
index d2fff40c0..000000000
--- a/patches/systemd-189/series
+++ /dev/null
@@ -1,7 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-journald-add-missing-includes.patch
-0002-journald-fix-building-with-XZ-support-disabled.patch
-0003-libsystemd-core-needs-libsystemd-id128-internal.patch
-0004-journal-don-t-try-to-compress-without-XZ.patch
-# eacc235884ee4d67122a32c6e69111a1  - git-ptx-patches magic
diff --git a/rules/systemd.make b/rules/systemd.make
index d9b85ed76..bbd5e06f2 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
 #
 # Paths and names
 #
-SYSTEMD_VERSION	:= 189
-SYSTEMD_MD5	:= ac2eb313f5dce79622f60aac56bca66d
+SYSTEMD_VERSION	:= 193
+SYSTEMD_MD5	:= 732a9de2b1d2a15cab639c987ff9e90e
 SYSTEMD		:= systemd-$(SYSTEMD_VERSION)
 SYSTEMD_SUFFIX	:= tar.xz
 SYSTEMD_URL	:= http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX)
@@ -29,11 +29,16 @@ SYSTEMD_LICENSE	:= GPLv2+
 # Prepare
 # ----------------------------------------------------------------------------
 
+# python is used for the journal python bindings, which are not installed
+SYSTEMD_CONF_ENV := \
+	$(CROSS_ENV) \
+	ac_cv_path_PYTHON=:
+
 #
 # autoconf
 #
 SYSTEMD_CONF_TOOL	:= autoconf
-SYSTEMD_CONF_OPT += \
+SYSTEMD_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-silent-rules \