diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 2f92e9ed9..8baaa6beb 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat') _tag='a47534aa62edfddb2df86e2d0c208979f24dc8c2' # git rev-parse v${pkgver} pkgver=245.6 -pkgrel=7 +pkgrel=8 arch=('x86_64') url='https://www.github.com/systemd/systemd' makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -52,7 +52,7 @@ sha512sums=('SKIP' 'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4' 'df7ec8f840a54b404d1f3ab2708ae2a618820cb411b826128cf10b20ccdab057306446295c6b1c98a05ca0adb1b30d390dfb0156b52ea772978e1f1bf5135e09' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - 'd0218d51c557a8456e8f41a56fa057b525bbcfcfa580cbd58efb14f356854172a8e1f31779e023350645a5e28cd4b9d94b0d7a8a3d2ee22db181c65d8f661a2e' + '80ac350fb4dc58c52d4c1ce77a1f91b8cd64d4c99a1c1e24194acac56f9e4a69b2304b13113e93d38459041fa073fe97840776d99ed7e4ce99aa76a3adb39583' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' @@ -85,14 +85,18 @@ _backports=( # man: document binfmt's new --unregister switch 'cd9aa8f0f91b113acb079e79750c146c0529c2d7' - # sd-journal: don't check namespaces if we have no namespace to go by - '2b6df46d21abe8a8b7481e420588a9a129699cf9' + # Revert "job: Don't mark as redundant if deps are relevant" + 'cc479760b4736082d26ec332f2423a9ab23d59c5' - # network: tc: support Hierarchy Token Bucket (HTB) - # (we need this for safe_atou32_full()...) - 'b934ac3d6e7dcad114776ef30ee9098693e7ab7e' + # these are in stable branch already + + # sd-journal: don't check namespaces if we have no namespace to go by + 'd55f53e95646174f3b5921e920e9210c5af43856' + + # parse-util: backport safe_atou32_full() + '64126925181809e7c0b8916471186c0bfa19d6ce' # basic/user-util: always use base 10 for user/group numbers - '156a5fd297b61bce31630d7a52c15614bf784843' + '9498903de6c1f7b0c3e5f1654d0ee451a304c59d' ) _reverts=( diff --git a/core/systemd/initcpio-install-systemd b/core/systemd/initcpio-install-systemd index 8bc072b5d..03311bbaf 100644 --- a/core/systemd/initcpio-install-systemd +++ b/core/systemd/initcpio-install-systemd @@ -169,7 +169,7 @@ build() { 'group: files' \ 'shadow: files' - echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd" + echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd" echo 'root:*:::::::' >"$BUILDROOT/etc/shadow" getent group root audio disk input kmem kvm lp optical render storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"