From ea2ba04053fdd6b1db0bee375c759f5462eba395 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 18 Feb 2015 19:41:51 +0200 Subject: [PATCH] systemd: update to systemd-219 --- packages/sysutils/systemd/package.mk | 41 ++---------- .../patches/systemd-00_fix-pkgconf.patch | 63 ------------------- ...systemd-01_journald-decrease-limits.patch} | 8 +-- ...-system-to-storage-.config-system.d.patch} | 16 ++--- .../systemd-03_move-hwdb.bin-to-run.patch | 39 ++++++++++++ .../systemd-04_move-hwdb.bin-to-run.patch | 24 ------- .../systemd-04_nah.-no-ln-relative.patch | 38 ++++------- ..._autoreconf-remove-gcrypt-dependency.patch | 6 +- ..._file_preset_all-doing-stupid-things.patch | 6 +- ...emd-07_remove-nonexistant-dependency.patch | 14 +++-- ..._systemctl-disable-dangerous-options.patch | 8 +-- 11 files changed, 87 insertions(+), 176 deletions(-) delete mode 100644 packages/sysutils/systemd/patches/systemd-00_fix-pkgconf.patch rename packages/sysutils/systemd/patches/{systemd-02_journald-decrease-limits.patch => systemd-01_journald-decrease-limits.patch} (85%) rename packages/sysutils/systemd/patches/{systemd-03_move-etc-systemd-system-to-storage-.config-system.d.patch => systemd-02_move-etc-systemd-system-to-storage-.config-system.d.patch} (83%) create mode 100644 packages/sysutils/systemd/patches/systemd-03_move-hwdb.bin-to-run.patch delete mode 100644 packages/sysutils/systemd/patches/systemd-04_move-hwdb.bin-to-run.patch diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 56ab7c6494..e3bd2c90ee 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="218" +PKG_VERSION="219" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -39,6 +39,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --disable-python-devel \ + --disable-python-devel \ --disable-dbus \ --disable-utmp \ --disable-compat-libs \ @@ -52,6 +53,8 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-selinux \ --disable-apparmor \ --disable-xz \ + --disable-zlib \ + --disable-bzip2 \ --disable-lz4 \ --disable-pam \ --disable-acl \ @@ -77,6 +80,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-rfkill \ --enable-logind \ --disable-machined \ + --disable-importd \ --disable-hostnamed \ --disable-timedated \ --disable-timesyncd \ @@ -90,14 +94,13 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-kdbus \ --disable-myhostname \ --disable-gudev \ + --enable-hwdb \ --disable-manpages \ --disable-hibernate \ --disable-ldconfig \ --enable-split-usr \ --disable-tests \ - --disable-hashmap-debug \ --without-python \ - --disable-python-devel \ --with-sysvinit-path= \ --with-sysvrcnd-path= \ --with-tty-gid=5 \ @@ -117,7 +120,6 @@ post_makeinstall_target() { rm -rf $INSTALL/usr/lib/rpm rm -rf $INSTALL/usr/lib/systemd/user rm -rf $INSTALL/usr/lib/tmpfiles.d/etc.conf - rm -rf $INSTALL/usr/lib/tmpfiles.d/systemd-remote.conf rm -rf $INSTALL/usr/share/factory rm -rf $INSTALL/usr/share/zsh @@ -135,17 +137,6 @@ post_makeinstall_target() { # remove debug-shell.service, we install our own rm -rf $INSTALL/usr/lib/systemd/system/debug-shell.service - # remove systemd-ask-password - rm -rf $INSTALL/usr/bin/systemd-ask-password - rm -rf $INSTALL/usr/bin/systemd-tty-ask-password-agent - rm -rf $INSTALL/usr/lib/systemd/systemd-reply-password - rm -rf $INSTALL/usr/lib/systemd/system/systemd-ask-password-console.path - rm -rf $INSTALL/usr/lib/systemd/system/systemd-ask-password-console.service - rm -rf $INSTALL/usr/lib/systemd/system/systemd-ask-password-wall.path - rm -rf $INSTALL/usr/lib/systemd/system/systemd-ask-password-wall.service - rm -rf $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-ask-password-console.path - rm -rf $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-ask-password-wall.path - # remove getty units, we dont want a console rm -rf $INSTALL/usr/lib/systemd/system/autovt@.service rm -rf $INSTALL/usr/lib/systemd/system/console-getty.service @@ -165,23 +156,6 @@ post_makeinstall_target() { rm -rf $INSTALL/usr/lib/systemd/system/systemd-udev-hwdb-update.service rm -rf $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-udev-hwdb-update.service - # remove rootfs fsck - rm -rf $INSTALL/usr/lib/systemd/system/systemd-fsck-root.service - rm -rf $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-fsck-root.service - - # remove fsck - rm -rf $INSTALL/usr/lib/systemd/systemd-fsck - rm -rf $INSTALL/usr/lib/systemd/system/systemd-fsck@.service - - # remove remount fs - rm -rf $INSTALL/usr/lib/systemd/systemd-remount-fs - rm -rf $INSTALL/usr/lib/systemd/system/systemd-remount-fs.service - rm -rf $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-remount-fs.service - - # remove initrd services - rm -rf $INSTALL/usr/lib/systemd/system/initrd-*.service - rm -rf $INSTALL/usr/lib/systemd/system/initrd-*.target - # remove nspawn rm -rf $INSTALL/usr/bin/systemd-nspawn rm -rf $INSTALL/usr/lib/systemd/system/systemd-nspawn@.service @@ -196,9 +170,6 @@ post_makeinstall_target() { # remove networkd rm -rf $INSTALL/usr/lib/systemd/network - # remove systemd-journal-remote.conf - rm -rf $INSTALL/usr/lib/tmpfiles.d/systemd-remote.conf - # tune journald.conf sed -e "s,^.*Compress=.*$,Compress=no,g" -i $INSTALL/etc/systemd/journald.conf sed -e "s,^.*SplitMode=.*$,SplitMode=none,g" -i $INSTALL/etc/systemd/journald.conf diff --git a/packages/sysutils/systemd/patches/systemd-00_fix-pkgconf.patch b/packages/sysutils/systemd/patches/systemd-00_fix-pkgconf.patch deleted file mode 100644 index 055899e247..0000000000 --- a/packages/sysutils/systemd/patches/systemd-00_fix-pkgconf.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8eade3f4d12255d1802433447b5fee53b44ff4f4 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sat, 16 Aug 2014 14:06:18 +0300 -Subject: [PATCH] fix pkgconf - ---- - src/gudev/gudev-1.0.pc.in | 6 +++--- - src/libsystemd/libsystemd.pc.in | 6 +++--- - src/libudev/libudev.pc.in | 6 +++--- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/gudev/gudev-1.0.pc.in b/src/gudev/gudev-1.0.pc.in -index 058262d..84d6b8b 100644 ---- a/src/gudev/gudev-1.0.pc.in -+++ b/src/gudev/gudev-1.0.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include - - Name: gudev-1.0 - Description: GObject bindings for libudev -diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in -index e8f7950..127e9ea 100644 ---- a/src/libsystemd/libsystemd.pc.in -+++ b/src/libsystemd/libsystemd.pc.in -@@ -6,9 +6,9 @@ - # (at your option) any later version. - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include - - Name: systemd - Description: systemd Library -diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in -index a0f3f52..5582559 100644 ---- a/src/libudev/libudev.pc.in -+++ b/src/libudev/libudev.pc.in -@@ -6,9 +6,9 @@ - # (at your option) any later version. - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include - - Name: libudev - Description: Library to access udev device information --- -1.7.2.5 - diff --git a/packages/sysutils/systemd/patches/systemd-02_journald-decrease-limits.patch b/packages/sysutils/systemd/patches/systemd-01_journald-decrease-limits.patch similarity index 85% rename from packages/sysutils/systemd/patches/systemd-02_journald-decrease-limits.patch rename to packages/sysutils/systemd/patches/systemd-01_journald-decrease-limits.patch index 060c17c98d..7102c2f092 100644 --- a/packages/sysutils/systemd/patches/systemd-02_journald-decrease-limits.patch +++ b/packages/sysutils/systemd/patches/systemd-01_journald-decrease-limits.patch @@ -1,7 +1,7 @@ -From fcccd4547215855cc2d931546172f936a570ae01 Mon Sep 17 00:00:00 2001 +From 04a046cf97b89410e9630b7dcf48e302c7f3276a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 30 Nov 2013 13:16:37 +0200 -Subject: [PATCH 2/8] journald: decrease limits +Subject: [PATCH 1/8] journald: decrease limits happy rpi users... --- @@ -9,10 +9,10 @@ happy rpi users... 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index c5d2d19..8ffcb04 100644 +index 2845e05..e69918f 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c -@@ -41,11 +41,11 @@ +@@ -42,11 +42,11 @@ #define COMPRESSION_SIZE_THRESHOLD (512ULL) /* This is the minimum journal file size */ diff --git a/packages/sysutils/systemd/patches/systemd-03_move-etc-systemd-system-to-storage-.config-system.d.patch b/packages/sysutils/systemd/patches/systemd-02_move-etc-systemd-system-to-storage-.config-system.d.patch similarity index 83% rename from packages/sysutils/systemd/patches/systemd-03_move-etc-systemd-system-to-storage-.config-system.d.patch rename to packages/sysutils/systemd/patches/systemd-02_move-etc-systemd-system-to-storage-.config-system.d.patch index 51061a8bf7..e8cf918cad 100644 --- a/packages/sysutils/systemd/patches/systemd-03_move-etc-systemd-system-to-storage-.config-system.d.patch +++ b/packages/sysutils/systemd/patches/systemd-02_move-etc-systemd-system-to-storage-.config-system.d.patch @@ -1,7 +1,7 @@ -From 0fe627a4c4a10f5ed7aee8372cee7956aa1ccb80 Mon Sep 17 00:00:00 2001 +From 56daac6a053159bbc5dc22d85c6ecd66b7369aae Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 19 Dec 2013 11:21:13 +0200 -Subject: [PATCH 3/8] move /etc/systemd/system to /storage/.config/system.d +Subject: [PATCH 2/8] move /etc/systemd/system to /storage/.config/system.d --- Makefile.am | 4 ++-- @@ -9,10 +9,10 @@ Subject: [PATCH 3/8] move /etc/systemd/system to /storage/.config/system.d 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am -index ac7924e..8288850 100644 +index bf04d31..36c269e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -164,7 +164,7 @@ udevlibexec_PROGRAMS = +@@ -166,7 +166,7 @@ udevlibexec_PROGRAMS = AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \ @@ -21,7 +21,7 @@ index ac7924e..8288850 100644 -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \ -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ -@@ -5838,7 +5838,7 @@ substitutions = \ +@@ -6210,7 +6210,7 @@ substitutions = \ '|SYSTEMCTL=$(rootbindir)/systemctl|' \ '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ '|pkgsysconfdir=$(pkgsysconfdir)|' \ @@ -31,10 +31,10 @@ index ac7924e..8288850 100644 '|pkgdatadir=$(pkgdatadir)|' \ '|systemunitdir=$(systemunitdir)|' \ diff --git a/Makefile.in b/Makefile.in -index 3b35030..f0ad455 100644 +index 49f9f2b..1e68a20 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -5435,7 +5435,7 @@ manual_tests = test-ns test-loopback test-hostname test-daemon \ +@@ -5786,7 +5786,7 @@ PY_LOG_COMPILER = $(PYTHON) AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \ @@ -43,7 +43,7 @@ index 3b35030..f0ad455 100644 -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \ -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ -@@ -8954,7 +8954,7 @@ substitutions = \ +@@ -9524,7 +9524,7 @@ substitutions = \ '|SYSTEMCTL=$(rootbindir)/systemctl|' \ '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ '|pkgsysconfdir=$(pkgsysconfdir)|' \ diff --git a/packages/sysutils/systemd/patches/systemd-03_move-hwdb.bin-to-run.patch b/packages/sysutils/systemd/patches/systemd-03_move-hwdb.bin-to-run.patch new file mode 100644 index 0000000000..8f76070778 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-03_move-hwdb.bin-to-run.patch @@ -0,0 +1,39 @@ +From b3f99f116ece09c991f1fe49070edf8b001a5486 Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Wed, 18 Feb 2015 18:21:36 +0200 +Subject: [PATCH 3/8] move hwdb.bin to /run + +--- + src/libsystemd/sd-hwdb/sd-hwdb.c | 2 +- + src/udev/udevadm-hwdb.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c +index 61c7b44..6e1de7d 100644 +--- a/src/libsystemd/sd-hwdb/sd-hwdb.c ++++ b/src/libsystemd/sd-hwdb/sd-hwdb.c +@@ -272,7 +272,7 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { + + static const char hwdb_bin_paths[] = + "/etc/systemd/hwdb/hwdb.bin\0" +- "/etc/udev/hwdb.bin\0" ++ "/run/hwdb.bin\0" + "/usr/lib/systemd/hwdb/hwdb.bin\0" + #ifdef HAVE_SPLIT_USR + "/lib/systemd/hwdb/hwdb.bin\0" +diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c +index d65e40c..8889df7 100644 +--- a/src/udev/udevadm-hwdb.c ++++ b/src/udev/udevadm-hwdb.c +@@ -562,7 +562,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { + }; + const char *test = NULL; + const char *root = ""; +- const char *hwdb_bin_dir = "/etc/udev"; ++ const char *hwdb_bin_dir = "/run"; + bool update = false; + struct trie *trie = NULL; + int err, c; +-- +1.7.10.4 + diff --git a/packages/sysutils/systemd/patches/systemd-04_move-hwdb.bin-to-run.patch b/packages/sysutils/systemd/patches/systemd-04_move-hwdb.bin-to-run.patch deleted file mode 100644 index ac3105229c..0000000000 --- a/packages/sysutils/systemd/patches/systemd-04_move-hwdb.bin-to-run.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur systemd-217/src/libudev/libudev-hwdb.c systemd-217.patch/src/libudev/libudev-hwdb.c ---- systemd-217/src/libudev/libudev-hwdb.c 2014-10-28 14:31:25.105131602 +0100 -+++ systemd-217.patch/src/libudev/libudev-hwdb.c 2014-10-31 22:42:05.250433377 +0100 -@@ -257,7 +257,7 @@ - } - - static const char hwdb_bin_paths[] = -- "/etc/udev/hwdb.bin\0" -+ "/run/hwdb.bin\0" - UDEVLIBEXECDIR "/hwdb.bin\0"; - - -diff -Naur systemd-217/src/udev/udevadm-hwdb.c systemd-217.patch/src/udev/udevadm-hwdb.c ---- systemd-217/src/udev/udevadm-hwdb.c 2014-10-28 14:31:25.105131602 +0100 -+++ systemd-217.patch/src/udev/udevadm-hwdb.c 2014-10-31 22:42:38.656510374 +0100 -@@ -557,7 +557,7 @@ - }; - const char *test = NULL; - const char *root = ""; -- const char *hwdb_bin_dir = "/etc/udev"; -+ const char *hwdb_bin_dir = "/run"; - bool update = false; - struct trie *trie = NULL; - int err, c; diff --git a/packages/sysutils/systemd/patches/systemd-04_nah.-no-ln-relative.patch b/packages/sysutils/systemd/patches/systemd-04_nah.-no-ln-relative.patch index 175315348e..61a1941c63 100644 --- a/packages/sysutils/systemd/patches/systemd-04_nah.-no-ln-relative.patch +++ b/packages/sysutils/systemd/patches/systemd-04_nah.-no-ln-relative.patch @@ -1,24 +1,19 @@ -From 419e20f0b7d2edaadf39a9724960ca22c473b4e8 Mon Sep 17 00:00:00 2001 +From cf364a6bd2efb460f92e1f073be00fc22c73f03e Mon Sep 17 00:00:00 2001 From: Stefan Saraev -Date: Fri, 4 Jul 2014 13:52:55 +0300 +Date: Wed, 18 Feb 2015 18:22:32 +0200 Subject: [PATCH 4/8] nah. no ln --relative -It is unclear that systemd now requires very recent coreutils -in order to compile. - -I will not upgrade my debian wheezy machines to jessie, -nor I will switch to fedora for no good reason. We are not going -to tell our users to do so just to be able to build OpenELEC. +pure **** --- - Makefile.am | 12 ++++++------ + Makefile.am | 10 +++++----- configure.ac | 2 -- - 2 files changed, 6 insertions(+), 8 deletions(-) + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 8288850..bb9ba9c 100644 +index 36c269e..a2c2870 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -229,8 +229,8 @@ define move-to-rootlibdir +@@ -233,8 +233,8 @@ define move-to-rootlibdir if test "$(libdir)" != "$(rootlibdir)"; then \ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ @@ -29,7 +24,7 @@ index 8288850..bb9ba9c 100644 mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ fi endef -@@ -293,9 +293,9 @@ install-aliases-hook: +@@ -297,9 +297,9 @@ install-aliases-hook: set -- $(SYSTEM_UNIT_ALIASES) && \ dir=$(systemunitdir) && $(install-aliases) set -- $(USER_UNIT_ALIASES) && \ @@ -41,7 +36,7 @@ index 8288850..bb9ba9c 100644 define install-aliases while [ -n "$$1" ]; do \ -@@ -2427,7 +2427,7 @@ systemd_dbus1_generator_LDADD = \ +@@ -2536,7 +2536,7 @@ systemd_dbus1_generator_LDADD = \ dbus1-generator-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator @@ -50,22 +45,13 @@ index 8288850..bb9ba9c 100644 dbus1-generator-uninstall-hook: rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator -@@ -2584,7 +2584,7 @@ systemd_bus_proxyd_LDADD = \ - bus-proxyd-install-hook: - $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) - $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge -- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge -+ $(AM_V_LN)$(LN_S) -f $(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge - - bus-proxyd-uninstall-hook: - rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge diff --git a/configure.ac b/configure.ac -index 9218ed3..fc557f7 100644 +index 97a29d6..c9d3305 100644 --- a/configure.ac +++ b/configure.ac -@@ -98,8 +98,6 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin]) +@@ -100,8 +100,6 @@ AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin]) - AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin]) + AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) -AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) - diff --git a/packages/sysutils/systemd/patches/systemd-05_autoreconf-remove-gcrypt-dependency.patch b/packages/sysutils/systemd/patches/systemd-05_autoreconf-remove-gcrypt-dependency.patch index 982c87b24b..e023ff69f2 100644 --- a/packages/sysutils/systemd/patches/systemd-05_autoreconf-remove-gcrypt-dependency.patch +++ b/packages/sysutils/systemd/patches/systemd-05_autoreconf-remove-gcrypt-dependency.patch @@ -1,4 +1,4 @@ -From 346874b53f85c06876e793629d8f71ac940da05a Mon Sep 17 00:00:00 2001 +From dd5204794a1f2ca1924a64d527b39a254a469200 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 28 Jul 2014 21:22:10 +0300 Subject: [PATCH 5/8] autoreconf: remove gcrypt dependency @@ -8,10 +8,10 @@ Subject: [PATCH 5/8] autoreconf: remove gcrypt dependency 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index fc557f7..45c68fa 100644 +index c9d3305..0682845 100644 --- a/configure.ac +++ b/configure.ac -@@ -687,13 +687,7 @@ AC_ARG_ENABLE([gcrypt], +@@ -716,13 +716,7 @@ AC_ARG_ENABLE([gcrypt], [have_gcrypt=auto]) if test "x${have_gcrypt}" != xno ; then diff --git a/packages/sysutils/systemd/patches/systemd-06_stop-unit_file_preset_all-doing-stupid-things.patch b/packages/sysutils/systemd/patches/systemd-06_stop-unit_file_preset_all-doing-stupid-things.patch index e4d1a9fe68..595b923894 100644 --- a/packages/sysutils/systemd/patches/systemd-06_stop-unit_file_preset_all-doing-stupid-things.patch +++ b/packages/sysutils/systemd/patches/systemd-06_stop-unit_file_preset_all-doing-stupid-things.patch @@ -1,4 +1,4 @@ -From b400665ba497837e9743fe83f500a95ccb94d224 Mon Sep 17 00:00:00 2001 +From 233596980655a02b77caf56fab05708e8e155bd6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 28 Oct 2014 22:32:18 +0200 Subject: [PATCH 6/8] stop unit_file_preset_all doing stupid things @@ -11,10 +11,10 @@ embedded distro like openelec anyway. 1 file changed, 5 insertions(+) diff --git a/src/shared/install.c b/src/shared/install.c -index efbe61e..47213f4 100644 +index 65f1c24..945001d 100644 --- a/src/shared/install.c +++ b/src/shared/install.c -@@ -2049,6 +2049,11 @@ int unit_file_preset_all( +@@ -2033,6 +2033,11 @@ int unit_file_preset_all( UnitFileChange **changes, unsigned *n_changes) { diff --git a/packages/sysutils/systemd/patches/systemd-07_remove-nonexistant-dependency.patch b/packages/sysutils/systemd/patches/systemd-07_remove-nonexistant-dependency.patch index 86f71a7eb9..abcb412113 100644 --- a/packages/sysutils/systemd/patches/systemd-07_remove-nonexistant-dependency.patch +++ b/packages/sysutils/systemd/patches/systemd-07_remove-nonexistant-dependency.patch @@ -1,6 +1,6 @@ -From d49c0c7bd4a901f0f5b93abffb75a5fd4a1aac26 Mon Sep 17 00:00:00 2001 +From 382709612ae03d6f81049ac72ac2dabd7613763d Mon Sep 17 00:00:00 2001 From: Stefan Saraev -Date: Thu, 11 Dec 2014 21:00:47 +0200 +Date: Wed, 18 Feb 2015 18:23:47 +0200 Subject: [PATCH 7/8] remove nonexistant dependency --- @@ -8,14 +8,16 @@ Subject: [PATCH 7/8] remove nonexistant dependency 1 file changed, 1 deletion(-) diff --git a/units/graphical.target b/units/graphical.target -index a2c4532..6e581c6 100644 +index 87be97e..b01b46d 100644 --- a/units/graphical.target +++ b/units/graphical.target -@@ -11,5 +11,4 @@ Documentation=man:systemd.special(7) +@@ -9,7 +9,6 @@ + Description=Graphical Interface + Documentation=man:systemd.special(7) Requires=multi-user.target - After=multi-user.target - Conflicts=rescue.target -Wants=display-manager.service + Conflicts=rescue.service rescue.target + After=multi-user.target rescue.service rescue.target display-manager.service AllowIsolate=yes -- 1.7.10.4 diff --git a/packages/sysutils/systemd/patches/systemd-08_systemctl-disable-dangerous-options.patch b/packages/sysutils/systemd/patches/systemd-08_systemctl-disable-dangerous-options.patch index 5c7746a57e..f784d8ace4 100644 --- a/packages/sysutils/systemd/patches/systemd-08_systemctl-disable-dangerous-options.patch +++ b/packages/sysutils/systemd/patches/systemd-08_systemctl-disable-dangerous-options.patch @@ -1,4 +1,4 @@ -From cc63846c3f3151b0acd37a45bbdd47a4d814689f Mon Sep 17 00:00:00 2001 +From 719c4c427f7dae08658cff066468712c35744343 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 11 Dec 2014 21:36:36 +0200 Subject: [PATCH 8/8] systemctl: disable dangerous options @@ -8,10 +8,10 @@ Subject: [PATCH 8/8] systemctl: disable dangerous options 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index b1441ad..b81beb3 100644 +index 21cb898..9db08ad 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c -@@ -6217,6 +6217,11 @@ end: +@@ -6019,6 +6019,11 @@ end: return r; } @@ -23,7 +23,7 @@ index b1441ad..b81beb3 100644 static void systemctl_help(void) { pager_open_if_enabled(); -@@ -7310,21 +7315,21 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { +@@ -7112,21 +7117,21 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { { "enable", MORE, 2, enable_unit, NOBUS }, { "disable", MORE, 2, enable_unit, NOBUS }, { "is-enabled", MORE, 2, unit_is_enabled, NOBUS },