Date: Monday, October 30, 2017 @ 10:27:41 Author: eworm Revision: 264733
upgpkg: lib32-systemd 235.38-1 new upstream stable commits Modified: lib32-systemd/trunk/PKGBUILD Deleted: lib32-systemd/trunk/0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch lib32-systemd/trunk/0001-disable-RestrictAddressFamilies-on-i686.patch -----------------------------------------------------------------+ 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch | 62 ---------- 0001-disable-RestrictAddressFamilies-on-i686.patch | 30 ---- PKGBUILD | 4 3 files changed, 2 insertions(+), 94 deletions(-) Deleted: 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch =================================================================== --- 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch 2017-10-30 10:22:15 UTC (rev 264732) +++ 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch 2017-10-30 10:27:41 UTC (rev 264733) @@ -1,62 +0,0 @@ -From 481712d9ee88395042f0640f272c1f87142bc0a8 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <[email protected]> -Date: Wed, 9 Nov 2016 11:14:03 -0500 -Subject: [PATCH] Revert "nspawn: try to bind mount resolved's resolv.conf - snippet into the container" - -This reverts commit 3539724c26a1b2b00c4eb3c004b635a4b8647de6. ---- - src/nspawn/nspawn.c | 27 ++++++++------------------- - 1 file changed, 8 insertions(+), 19 deletions(-) - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index c8b18bc..93df7c6 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -1309,35 +1309,24 @@ static int setup_resolv_conf(const char *dest) { - /* Fix resolv.conf, if possible */ - where = prefix_roota(dest, "/etc/resolv.conf"); - -- if (access("/usr/lib/systemd/resolv.conf", F_OK) >= 0) { -- /* resolved is enabled on the host. In this, case bind mount its static resolv.conf file into the -- * container, so that the container can use the host's resolver. Given that network namespacing is -- * disabled it's only natural of the container also uses the host's resolver. It also has the big -- * advantage that the container will be able to follow the host's DNS server configuration changes -- * transparently. */ -- -- r = mount_verbose(LOG_WARNING, "/usr/lib/systemd/resolv.conf", where, NULL, MS_BIND, NULL); -- if (r >= 0) -- return mount_verbose(LOG_ERR, NULL, where, NULL, -- MS_BIND|MS_REMOUNT|MS_RDONLY|MS_NOSUID|MS_NODEV, NULL); -- } -- -- /* If that didn't work, let's copy the file */ - r = copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW, 0644, 0); - if (r < 0) { -- /* If the file already exists as symlink, let's suppress the warning, under the assumption that -- * resolved or something similar runs inside and the symlink points there. -+ /* If the file already exists as symlink, let's -+ * suppress the warning, under the assumption that -+ * resolved or something similar runs inside and the -+ * symlink points there. - * -- * If the disk image is read-only, there's also no point in complaining. -+ * If the disk image is read-only, there's also no -+ * point in complaining. - */ - log_full_errno(IN_SET(r, -ELOOP, -EROFS) ? LOG_DEBUG : LOG_WARNING, r, -- "Failed to copy /etc/resolv.conf to %s, ignoring: %m", where); -+ "Failed to copy /etc/resolv.conf to %s: %m", where); - return 0; - } - - r = userns_lchown(where, 0, 0); - if (r < 0) -- log_warning_errno(r, "Failed to chown /etc/resolv.conf, ignoring: %m"); -+ log_warning_errno(r, "Failed to chown /etc/resolv.conf: %m"); - - return 0; - } --- -2.10.2 - Deleted: 0001-disable-RestrictAddressFamilies-on-i686.patch =================================================================== --- 0001-disable-RestrictAddressFamilies-on-i686.patch 2017-10-30 10:22:15 UTC (rev 264732) +++ 0001-disable-RestrictAddressFamilies-on-i686.patch 2017-10-30 10:27:41 UTC (rev 264733) @@ -1,30 +0,0 @@ -From ff59e06f9423af0532aaeedf931474823f764875 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <[email protected]> -Date: Wed, 9 Nov 2016 08:00:26 -0500 -Subject: [PATCH] disable RestrictAddressFamilies on i686 - -Shit's broke, yo. - -https://github.com/systemd/systemd/issues/4575 ---- - src/core/execute.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/core/execute.c b/src/core/execute.c -index f666f7c..7d09154 100644 ---- a/src/core/execute.c -+++ b/src/core/execute.c -@@ -1254,6 +1254,10 @@ static int apply_address_families(const Unit* u, const ExecContext *c) { - Iterator i; - int r; - -+#if defined(__i386__) -+ return 0; -+#endif -+ - assert(c); - - if (skip_seccomp_unavailable(u, "RestrictAddressFamilies=")) --- -2.10.2 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-30 10:22:15 UTC (rev 264732) +++ PKGBUILD 2017-10-30 10:27:41 UTC (rev 264733) @@ -6,10 +6,10 @@ pkgname=lib32-systemd _pkgbasename=systemd # latest commit on stable branch -_commit='c1719d8bc924ed59448616bd748671c5c7a66d93' +_commit='743b771c559c6101544f7358a42c8c519fe4b0db' # Bump this to latest major release for signed tag verification, # the commit count is handled by pkgver() function. -pkgver=235.0 +pkgver=235.38 pkgrel=1 pkgdesc="system and service manager (32-bit)" arch=('x86_64')
