diff --git a/packages/sysutils/systemd/build b/packages/sysutils/systemd/build index d67451f705..cf307e7952 100755 --- a/packages/sysutils/systemd/build +++ b/packages/sysutils/systemd/build @@ -50,8 +50,10 @@ cd $PKG_BUILD --disable-tcpwrap \ --disable-pam \ --disable-acl \ + --disable-gcrypt \ --disable-audit \ --disable-libcryptsetup \ + --disable-qrencode \ --disable-binfmt \ --disable-vconsole \ --disable-readahead \ diff --git a/packages/sysutils/systemd/meta b/packages/sysutils/systemd/meta index 260985f711..9dbb17edf9 100644 --- a/packages/sysutils/systemd/meta +++ b/packages/sysutils/systemd/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="188" +PKG_VERSION="189" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" PKG_URL="http://www.freedesktop.org/software/systemd/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS=" libcap dbus kmod util-linux usbutils pciutils glib" -PKG_BUILD_DEPENDS="toolchain libcap dbus kmod util-linux usbutils pciutils glib" +PKG_DEPENDS=" libcap dbus kmod util-linux usbutils pciutils glib libgcrypt" +PKG_BUILD_DEPENDS="toolchain libcap dbus kmod util-linux usbutils pciutils glib libgcrypt" PKG_PRIORITY="required" PKG_SECTION="system" PKG_SHORTDESC="systemd: a system and session manager" @@ -34,3 +34,8 @@ PKG_LONGDESC="systemd is a system and session manager for Linux, compatible with PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +# libgcrypt is needed actually only for autoreconf + PKG_DEPENDS="$PKG_DEPENDS libgcrypt" + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libgcrypt" + diff --git a/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch b/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch new file mode 100644 index 0000000000..717a2aafc6 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch @@ -0,0 +1,33 @@ +Without this, build fail if we --disable-xz or does not have xz installed in +system. + +Signed-off-by: Yin Kangkai +--- + 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 new file mode 100644 index 0000000000..19ff579cc5 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch @@ -0,0 +1,78 @@ +From: Allin Cottrell +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 + #include ++#include + + #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 ++#include + #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 + #include + #include ++#include + + #include + #include +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 ++#include + #include + + #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 + #include ++#include + #include + + #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 ++#include + #include + + #include "socket-util.h" +-- +cgit v0.9.0.2-2-gbebe