From cf901cfae010c1b052e16cbb583e25eebe688c26 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 20 Aug 2014 19:21:54 +0200 Subject: systemd: version bump 215 -> 216 Signed-off-by: Michael Olbrich --- generic/etc/group | 2 + ...k-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch | 112 -------- .../0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch | 46 ---- .../0003-Add-IFLA_VTI-defines-to-missing.h.patch | 44 ---- ...-include-missing.h-for-struct-file_handle.patch | 50 ---- .../0005-missing-defined-extra-clock-ids.patch | 31 --- .../0006-add-m4-files-needed-for-autogen.sh.patch | 282 --------------------- patches/systemd-215/autogen.sh | 1 - patches/systemd-215/series | 9 - .../0001-missing-defined-extra-clock-ids.patch | 34 +++ patches/systemd-216/series | 4 + rules/systemd.make | 56 ++-- 12 files changed, 75 insertions(+), 596 deletions(-) delete mode 100644 patches/systemd-215/0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch delete mode 100644 patches/systemd-215/0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch delete mode 100644 patches/systemd-215/0003-Add-IFLA_VTI-defines-to-missing.h.patch delete mode 100644 patches/systemd-215/0004-util.h-include-missing.h-for-struct-file_handle.patch delete mode 100644 patches/systemd-215/0005-missing-defined-extra-clock-ids.patch delete mode 100644 patches/systemd-215/0006-add-m4-files-needed-for-autogen.sh.patch delete mode 120000 patches/systemd-215/autogen.sh delete mode 100644 patches/systemd-215/series create mode 100644 patches/systemd-216/0001-missing-defined-extra-clock-ids.patch create mode 100644 patches/systemd-216/series diff --git a/generic/etc/group b/generic/etc/group index 4bd883a1a..078ebe80a 100644 --- a/generic/etc/group +++ b/generic/etc/group @@ -17,6 +17,8 @@ tty:x:112: video:x:113: lock:x:114: audio:x:115: +input:x:116: systemd-journal:x:201: systemd-network:x:202: +systemd-journal-remote:x:203: nogroup:x:65534: diff --git a/patches/systemd-215/0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch b/patches/systemd-215/0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch deleted file mode 100644 index b9617d2d8..000000000 --- a/patches/systemd-215/0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch +++ /dev/null @@ -1,112 +0,0 @@ -From: Lennart Poettering -Date: Fri, 11 Jul 2014 15:56:16 +0200 -Subject: [PATCH] always check for __BYTE_ORDER == __BIG_ENDIAN when checking - for endianess - -Let's always stick to glibc's way to determine byte order, and not mix -autoconf-specific checks with gcc checks. ---- - src/shared/architecture.h | 12 ++++++------ - src/shared/gpt.h | 4 ++-- - src/shared/time-dst.c | 6 +++--- - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/src/shared/architecture.h b/src/shared/architecture.h -index 4821d5d..58e97e5 100644 ---- a/src/shared/architecture.h -+++ b/src/shared/architecture.h -@@ -80,7 +80,7 @@ Architecture uname_architecture(void); - # define native_architecture() ARCHITECTURE_X86 - # define LIB_ARCH_TUPLE "i386-linux-gnu" - #elif defined(__powerpc64__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_PPC64 - # define LIB_ARCH_TUPLE "ppc64-linux-gnu" - # else -@@ -88,7 +88,7 @@ Architecture uname_architecture(void); - # error "Missing LIB_ARCH_TUPLE for PPC64LE" - # endif - #elif defined(__powerpc__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_PPC - # define LIB_ARCH_TUPLE "powerpc-linux-gnu" - # else -@@ -117,7 +117,7 @@ Architecture uname_architecture(void); - # define native_architecture() ARCHITECTURE_SPARC - # define LIB_ARCH_TUPLE "sparc-linux-gnu" - #elif defined(__mips64__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_MIPS64 - # error "Missing LIB_ARCH_TUPLE for MIPS64" - # else -@@ -125,7 +125,7 @@ Architecture uname_architecture(void); - # error "Missing LIB_ARCH_TUPLE for MIPS64_LE" - # endif - #elif defined(__mips__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_MIPS - # define LIB_ARCH_TUPLE "mips-linux-gnu" - # else -@@ -136,7 +136,7 @@ Architecture uname_architecture(void); - # define native_architecture() ARCHITECTURE_ALPHA - # define LIB_ARCH_TUPLE "alpha-linux-gnu" - #elif defined(__aarch64__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_ARM64_BE - # define LIB_ARCH_TUPLE "aarch64_be-linux-gnu" - # else -@@ -144,7 +144,7 @@ Architecture uname_architecture(void); - # define LIB_ARCH_TUPLE "aarch64-linux-gnu" - # endif - #elif defined(__arm__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_ARM_BE - # if defined(__ARM_EABI__) - # if defined(__ARM_PCS_VFP) -diff --git a/src/shared/gpt.h b/src/shared/gpt.h -index 64090e0..278940b 100644 ---- a/src/shared/gpt.h -+++ b/src/shared/gpt.h -@@ -42,10 +42,10 @@ - # define GPT_ROOT_NATIVE GPT_ROOT_X86 - #endif - --#if defined(__aarch64__) && !defined(WORDS_BIGENDIAN) -+#if defined(__aarch64__) && (__BYTE_ORDER != __BIG_ENDIAN) - # define GPT_ROOT_NATIVE GPT_ROOT_ARM_64 - # define GPT_ROOT_SECONDARY GPT_ROOT_ARM --#elif defined(__arm__) && !defined(WORDS_BIGENDIAN) -+#elif defined(__arm__) && (__BYTE_ORDER != __BIG_ENDIAN) - # define GPT_ROOT_NATIVE GPT_ROOT_ARM - #endif - -diff --git a/src/shared/time-dst.c b/src/shared/time-dst.c -index ceca2fa..6195b11 100644 ---- a/src/shared/time-dst.c -+++ b/src/shared/time-dst.c -@@ -207,8 +207,8 @@ read_again: - if (type_idxs[i] >= num_types) - return -EINVAL; - -- if (BYTE_ORDER == BIG_ENDIAN ? sizeof(time_t) == 8 && trans_width == 4 -- : sizeof(time_t) == 4 || trans_width == 4) { -+ if (__BYTE_ORDER == __BIG_ENDIAN ? sizeof(time_t) == 8 && trans_width == 4 -+ : sizeof(time_t) == 4 || trans_width == 4) { - /* Decode the transition times, stored as 4-byte integers in - network (big-endian) byte order. We work from the end of - the array so as not to clobber the next element to be -@@ -216,7 +216,7 @@ read_again: - i = num_transitions; - while (i-- > 0) - transitions[i] = decode((char *)transitions + i * 4); -- } else if (BYTE_ORDER != BIG_ENDIAN && sizeof(time_t) == 8) { -+ } else if (__BYTE_ORDER != __BIG_ENDIAN && sizeof(time_t) == 8) { - /* Decode the transition times, stored as 8-byte integers in - network (big-endian) byte order. */ - for (i = 0; i < num_transitions; ++i) diff --git a/patches/systemd-215/0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch b/patches/systemd-215/0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch deleted file mode 100644 index 85a895db3..000000000 --- a/patches/systemd-215/0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 16 Jul 2014 16:44:45 -0400 -Subject: [PATCH] missing.h: add IFLA_MACVLAN_FLAGS - -Now we are getting into kernel < 3.4 territory... - -https://bugs.freedesktop.org/show_bug.cgi?id=80095 ---- - configure.ac | 3 ++- - src/shared/missing.h | 9 +++++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ae88382..df6b357 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -310,7 +310,8 @@ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, LO_FLAGS_PARTSCAN] - #include - ]]) - --AC_CHECK_DECLS([IFLA_PHYS_PORT_ID, -+AC_CHECK_DECLS([IFLA_MACVLAN_FLAGS, -+ IFLA_PHYS_PORT_ID, - IFLA_BOND_AD_INFO, - IFLA_VLAN_PROTOCOL, - IFLA_VXLAN_LOCAL6, -diff --git a/src/shared/missing.h b/src/shared/missing.h -index f129f0b..818d704 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -371,6 +371,15 @@ static inline int setns(int fd, int nstype) { - #define LOOP_CTL_GET_FREE 0x4C82 - #endif - -+#if !HAVE_DECL_IFLA_MACVLAN_FLAGS -+#define IFLA_MACVLAN_UNSPEC 0 -+#define IFLA_MACVLAN_MODE 1 -+#define IFLA_MACVLAN_FLAGS 2 -+#define __IFLA_MACVLAN_MAX 3 -+ -+#define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1) -+#endif -+ - #if !HAVE_DECL_IFLA_PHYS_PORT_ID - #undef IFLA_PROMISCUITY - #define IFLA_PROMISCUITY 30 diff --git a/patches/systemd-215/0003-Add-IFLA_VTI-defines-to-missing.h.patch b/patches/systemd-215/0003-Add-IFLA_VTI-defines-to-missing.h.patch deleted file mode 100644 index 767b11d4c..000000000 --- a/patches/systemd-215/0003-Add-IFLA_VTI-defines-to-missing.h.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= -Date: Mon, 21 Jul 2014 21:04:44 -0400 -Subject: [PATCH] Add IFLA_VTI defines to missing.h - ---- - configure.ac | 1 + - src/shared/missing.h | 12 ++++++++++++ - 2 files changed, 13 insertions(+) - -diff --git a/configure.ac b/configure.ac -index df6b357..8925eb5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -311,6 +311,7 @@ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, LO_FLAGS_PARTSCAN] - ]]) - - AC_CHECK_DECLS([IFLA_MACVLAN_FLAGS, -+ IFLA_VTI_REMOTE, - IFLA_PHYS_PORT_ID, - IFLA_BOND_AD_INFO, - IFLA_VLAN_PROTOCOL, -diff --git a/src/shared/missing.h b/src/shared/missing.h -index 818d704..2985285 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -380,6 +380,18 @@ static inline int setns(int fd, int nstype) { - #define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1) - #endif - -+#if !HAVE_DECL_IFLA_VTI_REMOTE -+#define IFLA_VTI_UNSPEC 0 -+#define IFLA_VTI_LINK 1 -+#define IFLA_VTI_IKEY 2 -+#define IFLA_VTI_OKEY 3 -+#define IFLA_VTI_LOCAL 4 -+#define IFLA_VTI_REMOTE 5 -+#define __IFLA_VTI_MAX 6 -+ -+#define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -+#endif -+ - #if !HAVE_DECL_IFLA_PHYS_PORT_ID - #undef IFLA_PROMISCUITY - #define IFLA_PROMISCUITY 30 diff --git a/patches/systemd-215/0004-util.h-include-missing.h-for-struct-file_handle.patch b/patches/systemd-215/0004-util.h-include-missing.h-for-struct-file_handle.patch deleted file mode 100644 index 35665cf9f..000000000 --- a/patches/systemd-215/0004-util.h-include-missing.h-for-struct-file_handle.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Simon McVittie -Date: Fri, 1 Aug 2014 15:53:07 +0100 -Subject: [PATCH] util.h: include missing.h, for struct file_handle - -This breaks udev-builtin-btrfs.c, which reinvents some of missing.h, -so use missing.h there too. - -[zj: removed #include "config.h" and wrapped #include - in ifdef HAVE_LINUX_BTRFS_H as discussed on the mailing list.] ---- - src/shared/util.h | 1 + - src/udev/udev-builtin-btrfs.c | 10 ++++------ - 2 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/src/shared/util.h b/src/shared/util.h -index e23069c..6566ed5 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -84,6 +84,7 @@ - #endif - - #include "macro.h" -+#include "missing.h" - #include "time-util.h" - - /* What is interpreted as whitespace? */ -diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c -index 2baafe6..adbdd8c 100644 ---- a/src/udev/udev-builtin-btrfs.c -+++ b/src/udev/udev-builtin-btrfs.c -@@ -24,15 +24,13 @@ - #include - #include - #include -+#ifdef HAVE_LINUX_BTRFS_H -+#include -+#endif - -+#include "missing.h" - #include "udev.h" - --#define BTRFS_PATH_NAME_MAX 4087 --struct btrfs_ioctl_vol_args { -- int64_t fd; -- char name[BTRFS_PATH_NAME_MAX + 1]; --}; --#define BTRFS_IOCTL_MAGIC 0x94 - #define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, struct btrfs_ioctl_vol_args) - - static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test) diff --git a/patches/systemd-215/0005-missing-defined-extra-clock-ids.patch b/patches/systemd-215/0005-missing-defined-extra-clock-ids.patch deleted file mode 100644 index e91fc2fbc..000000000 --- a/patches/systemd-215/0005-missing-defined-extra-clock-ids.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Michael Olbrich -Date: Thu, 19 Jun 2014 10:48:55 +0200 -Subject: [PATCH] missing: defined extra clock ids - -This is required for glibc <= 2.13 - -Upstream requires glibc 2.14 but this is useful for host-systemd. - -Signed-off-by: Michael Olbrich ---- - src/shared/missing.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/shared/missing.h b/src/shared/missing.h -index 2985285..40160fe 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -499,3 +499,13 @@ static inline int setns(int fd, int nstype) { - - #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1) - #endif -+ -+#ifndef CLOCK_BOOTTIME -+#define CLOCK_BOOTTIME 7 -+#endif -+#ifndef CLOCK_REALTIME_ALARM -+#define CLOCK_REALTIME_ALARM 8 -+#endif -+#ifndef CLOCK_BOOTTIME_ALARM -+#define CLOCK_BOOTTIME_ALARM 9 -+#endif diff --git a/patches/systemd-215/0006-add-m4-files-needed-for-autogen.sh.patch b/patches/systemd-215/0006-add-m4-files-needed-for-autogen.sh.patch deleted file mode 100644 index 66e67a340..000000000 --- a/patches/systemd-215/0006-add-m4-files-needed-for-autogen.sh.patch +++ /dev/null @@ -1,282 +0,0 @@ -From: Michael Olbrich -Date: Fri, 8 Aug 2014 12:06:45 +0200 -Subject: [PATCH] add m4 files needed for autogen.sh - -Signed-off-by: Michael Olbrich ---- - m4/introspection.m4 | 96 ++++++++++++++++++++++++++++++++++++++++ - m4/libgcrypt.m4 | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ - m4/nls.m4 | 32 ++++++++++++++ - 3 files changed, 250 insertions(+) - create mode 100644 m4/introspection.m4 - create mode 100644 m4/libgcrypt.m4 - create mode 100644 m4/nls.m4 - -diff --git a/m4/introspection.m4 b/m4/introspection.m4 -new file mode 100644 -index 0000000..d89c3d9 ---- /dev/null -+++ b/m4/introspection.m4 -@@ -0,0 +1,96 @@ -+dnl -*- mode: autoconf -*- -+dnl Copyright 2009 Johan Dahlin -+dnl -+dnl This file is free software; the author(s) gives unlimited -+dnl permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+ -+# serial 1 -+ -+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -+ -+ dnl enable/disable introspection -+ m4_if([$2], [require], -+ [dnl -+ enable_introspection=yes -+ ],[dnl -+ AC_ARG_ENABLE(introspection, -+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -+ [Enable introspection for this build]),, -+ [enable_introspection=auto]) -+ ])dnl -+ -+ AC_MSG_CHECKING([for gobject-introspection]) -+ -+ dnl presence/version checking -+ AS_CASE([$enable_introspection], -+ [no], [dnl -+ found_introspection="no (disabled, use --enable-introspection to enable)" -+ ],dnl -+ [yes],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0],, -+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -+ found_introspection=yes, -+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -+ ],dnl -+ [auto],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -+ dnl Canonicalize enable_introspection -+ enable_introspection=$found_introspection -+ ],dnl -+ [dnl -+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -+ ])dnl -+ -+ AC_MSG_RESULT([$found_introspection]) -+ -+ INTROSPECTION_SCANNER= -+ INTROSPECTION_COMPILER= -+ INTROSPECTION_GENERATE= -+ INTROSPECTION_GIRDIR= -+ INTROSPECTION_TYPELIBDIR= -+ if test "x$found_introspection" = "xyes"; then -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ fi -+ AC_SUBST(INTROSPECTION_SCANNER) -+ AC_SUBST(INTROSPECTION_COMPILER) -+ AC_SUBST(INTROSPECTION_GENERATE) -+ AC_SUBST(INTROSPECTION_GIRDIR) -+ AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ AC_SUBST(INTROSPECTION_CFLAGS) -+ AC_SUBST(INTROSPECTION_LIBS) -+ AC_SUBST(INTROSPECTION_MAKEFILE) -+ -+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -+]) -+ -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -+]) -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -+ -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -+]) -diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 -new file mode 100644 -index 0000000..6cf482f ---- /dev/null -+++ b/m4/libgcrypt.m4 -@@ -0,0 +1,122 @@ -+dnl Autoconf macros for libgcrypt -+dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. -+dnl -+dnl This file is free software; as a special exception the author gives -+dnl unlimited permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+dnl This file is distributed in the hope that it will be useful, but -+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, -+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. -+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed -+dnl with the API version to also check the API compatibility. Example: -+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using -+dnl this features allows to prevent build against newer versions of libgcrypt -+dnl with a changed API. -+dnl -+AC_DEFUN([AM_PATH_LIBGCRYPT], -+[ AC_REQUIRE([AC_CANONICAL_HOST]) -+ AC_ARG_WITH(libgcrypt-prefix, -+ AC_HELP_STRING([--with-libgcrypt-prefix=PFX], -+ [prefix where LIBGCRYPT is installed (optional)]), -+ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") -+ if test x$libgcrypt_config_prefix != x ; then -+ if test x${LIBGCRYPT_CONFIG+set} != xset ; then -+ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config -+ fi -+ fi -+ -+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) -+ tmp=ifelse([$1], ,1:1.2.0,$1) -+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -+ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -+ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` -+ else -+ req_libgcrypt_api=0 -+ min_libgcrypt_version="$tmp" -+ fi -+ -+ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) -+ ok=no -+ if test "$LIBGCRYPT_CONFIG" != "no" ; then -+ req_major=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -+ req_minor=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -+ req_micro=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` -+ major=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -+ minor=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` -+ micro=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` -+ if test "$major" -gt "$req_major"; then -+ ok=yes -+ else -+ if test "$major" -eq "$req_major"; then -+ if test "$minor" -gt "$req_minor"; then -+ ok=yes -+ else -+ if test "$minor" -eq "$req_minor"; then -+ if test "$micro" -ge "$req_micro"; then -+ ok=yes -+ fi -+ fi -+ fi -+ fi -+ fi -+ fi -+ if test $ok = yes; then -+ AC_MSG_RESULT([yes ($libgcrypt_config_version)]) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ if test $ok = yes; then -+ # If we have a recent libgcrypt, we should also check that the -+ # API is compatible -+ if test "$req_libgcrypt_api" -gt 0 ; then -+ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` -+ if test "$tmp" -gt 0 ; then -+ AC_MSG_CHECKING([LIBGCRYPT API version]) -+ if test "$req_libgcrypt_api" -eq "$tmp" ; then -+ AC_MSG_RESULT([okay]) -+ else -+ ok=no -+ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) -+ fi -+ fi -+ fi -+ fi -+ if test $ok = yes; then -+ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` -+ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` -+ ifelse([$2], , :, [$2]) -+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` -+ if test x"$libgcrypt_config_host" != xnone ; then -+ if test x"$libgcrypt_config_host" != x"$host" ; then -+ AC_MSG_WARN([[ -+*** -+*** The config script $LIBGCRYPT_CONFIG was -+*** built for $libgcrypt_config_host and thus may not match the -+*** used host $host. -+*** You may want to use the configure option --with-libgcrypt-prefix -+*** to specify a matching config script. -+***]]) -+ fi -+ fi -+ else -+ LIBGCRYPT_CFLAGS="" -+ LIBGCRYPT_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(LIBGCRYPT_CFLAGS) -+ AC_SUBST(LIBGCRYPT_LIBS) -+]) -diff --git a/m4/nls.m4 b/m4/nls.m4 -new file mode 100644 -index 0000000..53cdc8b ---- /dev/null -+++ b/m4/nls.m4 -@@ -0,0 +1,32 @@ -+# nls.m4 serial 5 (gettext-0.18) -+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, -+dnl Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper , 1995-2000. -+dnl Bruno Haible , 2000-2003. -+ -+AC_PREREQ([2.50]) -+ -+AC_DEFUN([AM_NLS], -+[ -+ AC_MSG_CHECKING([whether NLS is requested]) -+ dnl Default is enabled NLS -+ AC_ARG_ENABLE([nls], -+ [ --disable-nls do not use Native Language Support], -+ USE_NLS=$enableval, USE_NLS=yes) -+ AC_MSG_RESULT([$USE_NLS]) -+ AC_SUBST([USE_NLS]) -+]) diff --git a/patches/systemd-215/autogen.sh b/patches/systemd-215/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/systemd-215/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/systemd-215/series b/patches/systemd-215/series deleted file mode 100644 index 719abe2e6..000000000 --- a/patches/systemd-215/series +++ /dev/null @@ -1,9 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch -0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch -0003-Add-IFLA_VTI-defines-to-missing.h.patch -0004-util.h-include-missing.h-for-struct-file_handle.patch -0005-missing-defined-extra-clock-ids.patch -0006-add-m4-files-needed-for-autogen.sh.patch -# ba3832df21ec41fc64ab637e609ca30f - git-ptx-patches magic diff --git a/patches/systemd-216/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-216/0001-missing-defined-extra-clock-ids.patch new file mode 100644 index 000000000..76e7eb94c --- /dev/null +++ b/patches/systemd-216/0001-missing-defined-extra-clock-ids.patch @@ -0,0 +1,34 @@ +From: Michael Olbrich +Date: Thu, 19 Jun 2014 10:48:55 +0200 +Subject: [PATCH] missing: defined extra clock ids + +This is required for glibc <= 2.13 + +Upstream requires glibc 2.14 but this is useful for host-systemd. + +Signed-off-by: Michael Olbrich +--- + src/shared/missing.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/shared/missing.h b/src/shared/missing.h +index 3ff1a2172083..1ba0104c4aab 100644 +--- a/src/shared/missing.h ++++ b/src/shared/missing.h +@@ -550,6 +550,16 @@ static inline int setns(int fd, int nstype) { + #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1) + #endif + ++#ifndef CLOCK_BOOTTIME ++#define CLOCK_BOOTTIME 7 ++#endif ++#ifndef CLOCK_REALTIME_ALARM ++#define CLOCK_REALTIME_ALARM 8 ++#endif ++#ifndef CLOCK_BOOTTIME_ALARM ++#define CLOCK_BOOTTIME_ALARM 9 ++#endif ++ + #ifndef IPV6_UNICAST_IF + #define IPV6_UNICAST_IF 76 + #endif diff --git a/patches/systemd-216/series b/patches/systemd-216/series new file mode 100644 index 000000000..a97d2b1f7 --- /dev/null +++ b/patches/systemd-216/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-missing-defined-extra-clock-ids.patch +# f56a29c719fa0e1109c6ac12872cacd3 - git-ptx-patches magic diff --git a/rules/systemd.make b/rules/systemd.make index c60e2c384..fb2a51c73 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 215 -SYSTEMD_MD5 := d2603e9fffd8b18d242543e36f2e7d31 +SYSTEMD_VERSION := 216 +SYSTEMD_MD5 := 04fda588a04f549da0f397dce3ae6a39 SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.xz SYSTEMD_URL := http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX) @@ -36,10 +36,16 @@ SYSTEMD_WRAPPER_BLACKLIST := TARGET_HARDEN_PIE endif SYSTEMD_CONF_ENV := \ $(CROSS_ENV) \ - CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)" \ ac_cv_path_INTLTOOL_MERGE=: \ ac_cv_path_KMOD=/bin/kmod +ifndef PTXCONF_ARCH_X86 +SYSTEMD_CONF_ENV += cc_cv_CFLAGS__flto=no +endif + +SYSTEMD_CFLAGS := \ + -I$(KERNEL_HEADERS_INCLUDE_DIR) + # # autoconf # @@ -68,6 +74,7 @@ SYSTEMD_CONF_OPT := \ $(GLOBAL_SELINUX_OPTION) \ --disable-apparmor \ --$(call ptx/endis,PTXCONF_SYSTEMD_XZ)-xz \ + --disable-lz4 \ --disable-pam \ --disable-acl \ --disable-smack \ @@ -78,6 +85,8 @@ SYSTEMD_CONF_OPT := \ --disable-qrencode \ --disable-microhttpd \ --disable-gnutls \ + --disable-libcurl \ + --disable-libidn \ --disable-binfmt \ --$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \ --enable-readahead \ @@ -85,6 +94,7 @@ SYSTEMD_CONF_OPT := \ --enable-quotacheck \ --enable-tmpfiles \ --disable-sysusers \ + --disable-firstboot \ --$(call ptx/disen,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED)-randomseed \ --disable-backlight \ --disable-rfkill \ @@ -95,15 +105,17 @@ SYSTEMD_CONF_OPT := \ --$(call ptx/endis,PTXCONF_SYSTEMD_TIMEDATE)-timesyncd \ --$(call ptx/endis,PTXCONF_SYSTEMD_LOCALES)-localed \ --disable-coredump \ - --enable-polkit \ + --disable-polkit \ --$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-resolved \ --$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-networkd \ --disable-efi \ --disable-multi-seat-x \ + --disable-terminal \ --disable-kdbus \ --enable-myhostname \ --$(call ptx/endis,PTXCONF_UDEV_LIBGUDEV)-gudev \ --disable-manpages \ + --disable-ldconfig \ --enable-split-usr \ --disable-tests \ --without-python \ @@ -143,15 +155,10 @@ endif ifndef PTXCONF_SYSTEMD_VCONSOLE @rm -v $(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service endif -# # ldconfig is not installed - @rm -v $(SYSTEMD_PKGDIR)/lib/systemd/system/sysinit.target.wants/ldconfig.service +# # don't touch /etc + @rm -v $(SYSTEMD_PKGDIR)/usr/lib/tmpfiles.d/etc.conf # # the upstream default (graphical.target) wants display-manager.service @ln -sf multi-user.target $(SYSTEMD_PKGDIR)/lib/systemd/system/default.target -ifdef PTXCONF_SYSTEMD_TIMEDATE - @install -d $(SYSTEMD_PKGDIR)/etc/systemd/system/sysinit.target.wants/ - @mv $(SYSTEMD_PKGDIR)/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service \ - $(SYSTEMD_PKGDIR)/etc/systemd/system/sysinit.target.wants/ -endif @$(call touch) # ---------------------------------------------------------------------------- @@ -172,7 +179,6 @@ SYSTEMD_HELPER := \ $(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed,) \ $(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-logind,) \ systemd-modules-load \ - $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-resolved,) \ $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd,) \ $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd-wait-online,) \ systemd-quotacheck \ @@ -180,6 +186,8 @@ SYSTEMD_HELPER := \ systemd-readahead \ systemd-remount-fs \ systemd-reply-password \ + $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-resolve-host,) \ + $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-resolved,) \ systemd-shutdown \ systemd-shutdownd \ systemd-sleep \ @@ -210,6 +218,9 @@ $(STATEDIR)/systemd.targetinstall: @$(call install_lib, systemd, 0, 0, 0644, libsystemd) @$(call install_lib, systemd, 0, 0, 0644, libnss_myhostname) +ifdef PTXCONF_SYSTEMD_NETWORK + @$(call install_lib, systemd, 0, 0, 0644, libnss_resolve) +endif # # daemon + tools @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemctl) @@ -218,17 +229,19 @@ ifdef PTXCONF_SYSTEMD_LOGIND @$(call install_copy, systemd, 0, 0, 0755, -, /bin/loginctl) @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-inhibit) endif +ifdef PTXCONF_SYSTEMD_NETWORK + @$(call install_copy, systemd, 0, 0, 0755, -, /bin/networkctl) +endif + @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-escape) @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-machine-id-setup) - @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-tmpfiles) @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-notify) + @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-tmpfiles) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/busctl) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl) ifdef PTXCONF_SYSTEMD_LOCALES @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/localectl) endif -ifdef PTXCONF_SYSTEMD_TIMEDATE - @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/timedatectl) -endif + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cat) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgls) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgtop) @@ -237,7 +250,9 @@ endif @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-run) @$(call install_link, systemd, ../../lib/systemd/systemd-bus-proxyd, \ /usr/bin/systemd-stdio-bridge) - @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze) +ifdef PTXCONF_SYSTEMD_TIMEDATE + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/timedatectl) +endif @$(call install_tree, systemd, 0, 0, -, /lib/systemd/system-generators/) @$(foreach helper, $(SYSTEMD_HELPER), \ @@ -277,7 +292,6 @@ endif @$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/) @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf) - @$(call install_tree, systemd, 0, 0, -, /usr/share/polkit-1/actions/) @$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/services/) @$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/) ifdef PTXCONF_SYSTEMD_LOCALES @@ -289,9 +303,6 @@ ifdef PTXCONF_SYSTEMD_NETWORK @$(call install_tree, systemd, 0, 0, -, /lib/systemd/network) @$(call install_alternative_tree, systemd, 0, 0, /lib/systemd/network) endif -ifdef PTXCONF_SYSTEMD_TIMEDATE - @$(call install_tree, systemd, 0, 0, -, /usr/lib/systemd/ntp-units.d/) -endif # # units @$(call install_tree, systemd, 0, 0, -, /lib/systemd/system/) @@ -300,6 +311,9 @@ endif @$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd) +# # systemd expects this directory to exist. + @$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd/coredump) + @$(call install_alternative, systemd, 0, 0, 0644, /etc/profile.d/systemd.sh) @$(call install_finish, systemd) -- cgit v1.2.3