Date: Wednesday, December 7, 2016 @ 19:40:12 Author: dreisner Revision: 282930
upgpkg: systemd 232-5 more backports... - avoid hiding bind mounts in nspawn (FS#52009) - fix build system to cope with recent lz4 (FS#52065) - make sure to initially populate the space info cache (FS#52012) - fix nspawn error code for --help and --version (FS#52029) - provide our own /etc/pam.d/systemd-user (FS#52039) Added: systemd/trunk/0001-nspawn-don-t-hide-bind-tmp-mounts.patch systemd/trunk/systemd-user.pam Modified: systemd/trunk/PKGBUILD ----------------------------------------------+ 0001-nspawn-don-t-hide-bind-tmp-mounts.patch | 26 +++++++++++++++++++++++++ PKGBUILD | 19 +++++++++++++++--- systemd-user.pam | 5 ++++ 3 files changed, 47 insertions(+), 3 deletions(-) Added: 0001-nspawn-don-t-hide-bind-tmp-mounts.patch =================================================================== --- 0001-nspawn-don-t-hide-bind-tmp-mounts.patch (rev 0) +++ 0001-nspawn-don-t-hide-bind-tmp-mounts.patch 2016-12-07 19:40:12 UTC (rev 282930) @@ -0,0 +1,26 @@ +From 7ec42a45410cb27140292d85ebb0e4b6dcea5555 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <[email protected]> +Date: Wed, 7 Dec 2016 13:45:48 -0500 +Subject: [PATCH] nspawn: don't hide --bind=/tmp/* mounts + +This is a v232-applicable version of upstream c9fd987279a462e. +--- + src/nspawn/nspawn-mount.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c +index 115de64..2dabe2a 100644 +--- a/src/nspawn/nspawn-mount.c ++++ b/src/nspawn/nspawn-mount.c +@@ -382,7 +382,7 @@ int mount_all(const char *dest, + { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, false, false }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, false, false }, +- { "tmpfs", "/tmp", "tmpfs", "mode=1777", MS_STRICTATIME, true, true, false }, ++ { "tmpfs", "/tmp", "tmpfs", "mode=1777", MS_STRICTATIME, true, false, false }, + #ifdef HAVE_SELINUX + { "/sys/fs/selinux", "/sys/fs/selinux", NULL, NULL, MS_BIND, false, false, false }, /* Bind mount first */ + { NULL, "/sys/fs/selinux", NULL, NULL, MS_BIND|MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_REMOUNT, false, false, false }, /* Then, make it r/o */ +-- +2.10.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-12-07 18:38:11 UTC (rev 282929) +++ PKGBUILD 2016-12-07 19:40:12 UTC (rev 282930) @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') pkgver=232 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url="https://www.github.com/systemd/systemd"; makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -19,9 +19,11 @@ 'arch.conf' 'loader.conf' 'splash-arch.bmp' + 'systemd-user.pam' 'udev-hwdb.hook' '0001-disable-RestrictAddressFamilies-on-i686.patch' - '0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch') + '0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch' + '0001-nspawn-don-t-hide-bind-tmp-mounts.patch') sha512sums=('SKIP' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' '52af734947a768758d5eb3f18e31a1cfec6699eca6fa10e40b90c7f11991509186c0a696e3490af3eaba80064ea4cb93e041579abf05addf072d294300aa4b28' @@ -29,9 +31,11 @@ '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' + '2688e8be6943aa34b4a4e2481e23d07ab7dae53cc9426260010cf6a1e2361eff4b9a8b3652a1fca65680e1f23221026c6460e04feb1cee919b24e2bbf69be5ed' '888ab01bc6e09beb08d7126472c34c9e1aa35ea34e62a09e900ae34c93b1de2fcc988586efd8d0dc962393974f45c77b206d59a86cf53e370f061bf9a1b1a862' '89f9b2d3918c679ce4f76c2b10dc7fcb7e04f1925a5f92542f06891de2a123a91df7eb67fd4ce71506a8132f5440b3560b7bb667e1c1813944b115c1dfe35e3f' - 'b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219') + 'b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219' + '68478403433aafc91a03fda5d83813d2ed1dfc6ab7416b2927a803314ecf826edcb6c659587e74df65de3ccb1edf958522f56ff9ac461a1f696b6dede1d4dd35') validpgpkeys=( '63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering ) @@ -41,6 +45,9 @@ 'abd67ce74858491565cde157c7b08fda43d3279c' # basic/virt: fix userns check on CONFIG_USER_NS=n kernel (#4651) '4318abe8d26e969ebdb97744a63ab900233a0185' # build-sys: do not install ctrl-alt-del.target symlink twice 'd112eae7da77899be245ab52aa1747d4675549f1' # device: Avoid calling unit_free(NULL) in device setup logic (#4748) + 'cfed63f60dd7412c199652825ed172c319b02b3c' # nspawn: fix exit code for --help and --version (#4609) + '3099caf2b5bb9498b1d0227c40926435ca81f26f' # journal: make sure to initially populate the space info cache (#4807) + '3d4cf7de48a74726694abbaa09f9804b845ff3ba' # build-sys: check for lz4 in the old and new numbering scheme (#4717) ) _validate_tag() { @@ -79,6 +86,9 @@ git cherry-pick -n "${_backports[@]}" fi + # https://github.com/systemd/systemd/issues/4789 + patch -Np1 <../0001-nspawn-don-t-hide-bind-tmp-mounts.patch + # these patches aren't upstream, but they make v232 more useable. # https://github.com/systemd/systemd/issues/4575 @@ -196,6 +206,9 @@ install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook" + + # overwrite the systemd-user PAM configuration with our own + install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user" } package_libsystemd() { Added: systemd-user.pam =================================================================== --- systemd-user.pam (rev 0) +++ systemd-user.pam 2016-12-07 19:40:12 UTC (rev 282930) @@ -0,0 +1,5 @@ +# Used by systemd --user instances. + +account include system-auth +session required pam_loginuid.so +session include system-auth
