Skip to contentSkip to conversation

package/systemd: bump version to 242

PATCH New James Hilliard 1 participant 1 message Jun 18, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 package/systemd: bump version to 242

Removed patches that have been committed upstream.

Backport patches required to build systemd on older kernels.

Added symlinks required to enable some services.

After extensive discussion with upstream it does not seem there is any acceptable option to have symlink installation handled on their side.

The recommended solution from upstream is to have systemctl handle service installation, however this has a number of downsides such as requiring us to build a host-systemd just to install a few symlinks.

Since we already customize service installation it is simpler for us to create the symlinks ourselves, this will also simplify service customization on our side as we will not need to disable any systemd default services in cases where we need to make customizations.

In addition using systemctl would introduce a minimum host headers dependency in which we don't have the infrastructure to handle properly.

The downside to this approach is that we need to track service creation changes from upstream ourselves, however this is relatively straightforward and since upstream service file locations are relatively stable regressions should be limited. This will mostly be a concern in regards to adding support for new systemd features.

Details:
https://github.com/systemd/systemd/issues/12767
https://github.com/systemd/systemd/pull/12164
https://github.com/systemd/systemd/pull/12769
https://github.com/systemd/systemd/pull/12775

---
 ...age-paths-longer-than-BUS_PATH_SIZE_.patch |    53 -
 ...everal-missing_-.h-and-import-releva.patch | 14874 ++++++++++++++++
 ...ry-strings-to-hold-dbus-paths-on-the.patch |   194 -
 ...vice.h-from-shared-linux-to-basic-li.patch |   190 +
 ...t-linux-in.h-and-in6.h-from-kernel-5.patch |   655 +
 ...drop-misplaced-Wl-undefined-argument.patch |    51 -
 ...x-also-import-l2tp.h-from-kernel-5.0.patch |   242 +
 package/systemd/systemd.hash                  |     2 +-
 package/systemd/systemd.mk                    |    73 +-
 9 files changed, 16031 insertions(+), 303 deletions(-)
 delete mode 100644 package/systemd/0002-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
 create mode 100644 package/systemd/0002-tree-wide-drop-several-missing_-.h-and-import-releva.patch
 delete mode 100644 package/systemd/0003-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
 create mode 100644 package/systemd/0003-linux-move-netdevice.h-from-shared-linux-to-basic-li.patch
 create mode 100644 package/systemd/0004-linux-also-import-linux-in.h-and-in6.h-from-kernel-5.patch
 delete mode 100644 package/systemd/0004-meson-drop-misplaced-Wl-undefined-argument.patch
 create mode 100644 package/systemd/0005-linux-also-import-l2tp.h-from-kernel-5.0.patch
package/systemd/0002-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch deleted +0 -53
deleted file mode 100644
index 2de3b71b5c..0000000000
@@ -1,53 +0,0 @@
-From febef5e18558c114f4fb7c94f6c8ed3520c50cdf Mon Sep 17 00:00:00 2001
-From: Riccardo Schirone <[email protected]>
-Date: Mon, 4 Feb 2019 14:29:09 +0100
-Subject: [PATCH] Refuse dbus message paths longer than BUS_PATH_SIZE_MAX
- limit.
-
-Even though the dbus specification does not enforce any length limit on the
-path of a dbus message, having to analyze too long strings in PID1 may be
-time-consuming and it may have security impacts.
-
-In any case, the limit is set so high that real-life applications should not
-have a problem with it.
-
-(cherry picked from commit 61397a60d98e368a5720b37e83f3169e3eb511c4)
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: commit 61397a60d98
-
- src/libsystemd/sd-bus/bus-internal.c | 2 +-
- src/libsystemd/sd-bus/bus-internal.h | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
-index 40acae213381..598b7f110c73 100644
---- a/src/libsystemd/sd-bus/bus-internal.c
-+++ b/src/libsystemd/sd-bus/bus-internal.c
-@@ -43,7 +43,7 @@ bool object_path_is_valid(const char *p) {
-         if (slash)
-                 return false;
- 
--        return true;
-+        return (q - p) <= BUS_PATH_SIZE_MAX;
- }
- 
- char* object_path_startswith(const char *a, const char *b) {
-diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
-index f208b294d8f1..a8d61bf72a4e 100644
---- a/src/libsystemd/sd-bus/bus-internal.h
-+++ b/src/libsystemd/sd-bus/bus-internal.h
-@@ -332,6 +332,10 @@ struct sd_bus {
- 
- #define BUS_MESSAGE_SIZE_MAX (128*1024*1024)
- #define BUS_AUTH_SIZE_MAX (64*1024)
-+/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one
-+ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however,
-+ * to not clash unnecessarily with real-life applications. */
-+#define BUS_PATH_SIZE_MAX (64*1024)
- 
- #define BUS_CONTAINER_DEPTH 128
- 
--- 
-2.20.1
-
package/systemd/0002-tree-wide-drop-several-missing_-.h-and-import-releva.patch new file +14874 -0

2,947 lines not on this page · raw message

package/systemd/0003-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch deleted +0 -194

194 lines not on this page · raw message

package/systemd/0003-linux-move-netdevice.h-from-shared-linux-to-basic-li.patch new file +190 -0

190 lines not on this page · raw message

package/systemd/0004-linux-also-import-linux-in.h-and-in6.h-from-kernel-5.patch new file +655 -0

655 lines not on this page · raw message

package/systemd/0004-meson-drop-misplaced-Wl-undefined-argument.patch deleted +0 -51

51 lines not on this page · raw message

package/systemd/0005-linux-also-import-l2tp.h-from-kernel-5.0.patch new file +242 -0

242 lines not on this page · raw message

package/systemd/systemd.hash +1 -1
index c769d48959..b3c5e4c64f 100644

Lines of this file are not shown. View the raw message.

package/systemd/systemd.mk +69 -4

73 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.20.1

Part of the diff is not shown here. View the raw message.