diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 82 |
1 files changed, 43 insertions, 39 deletions
@@ -6,8 +6,8 @@ pkgbase=systemd-selinux pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux') -pkgver=232 -pkgrel=8 +pkgver=233 +pkgrel=7 arch=('i686' 'x86_64') url="https://www.github.com/systemd/systemd" groups=('selinux') @@ -30,14 +30,11 @@ source=("git+https://github.com/systemd/systemd.git#tag=v$pkgver" 'systemd-hwdb.hook' 'systemd-sysusers.hook' 'systemd-tmpfiles.hook' - 'systemd-update.hook' - '0001-disable-RestrictAddressFamilies-on-i686.patch' - '0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch' - '0001-nspawn-don-t-hide-bind-tmp-mounts.patch') + 'systemd-update.hook') sha512sums=('SKIP' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '52af734947a768758d5eb3f18e31a1cfec6699eca6fa10e40b90c7f11991509186c0a696e3490af3eaba80064ea4cb93e041579abf05addf072d294300aa4b28' - 'fec639de0d99967ed3e67289eff5ff78fff0c5829d350e73bed536a8391f1daa1d118d72dbdc1f480ffd33fc22b72f4817d0973bd09ec7f182fd26ad87b24355' + '691acebb243b9cd7fb63272662f34bdb9aead710c69aee9361ab2322f9f108600ad5b0214fc00b7cb2d9c95db8abd748030625d60d6567efd98663c56ba28c65' + 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' @@ -45,23 +42,22 @@ sha512sums=('SKIP' '2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda' '9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22' '0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067' - '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618' - '89f9b2d3918c679ce4f76c2b10dc7fcb7e04f1925a5f92542f06891de2a123a91df7eb67fd4ce71506a8132f5440b3560b7bb667e1c1813944b115c1dfe35e3f' - 'b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219' - '68478403433aafc91a03fda5d83813d2ed1dfc6ab7416b2927a803314ecf826edcb6c659587e74df65de3ccb1edf958522f56ff9ac461a1f696b6dede1d4dd35') + '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618') validpgpkeys=( '63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering ) _backports=( - '843d5baf6aad6c53fc00ea8d95d83209a4f92de1' # core: don't use the unified hierarchy for the systemd cgroup yet (#4628) - '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) - 'c9f7b4d356a453a01aa77a6bb74ca7ef49732c08' # build-sys: add check for gperf lookup function signature (#5055) + # build-sys: make RPM macros installation path configurable + 'ff2e33db54719bfe8feea833571652318c6d197c' + # resolved: do not start LLMNR or mDNS stack when no network enables them + '2c7ef56459bf6fe7761595585aa4eed5cd183f27^..2c7ef56459bf6fe7761595585aa4eed5cd183f27^2' + # networkd: RFC compliant autonomous prefix handling (#5636) + '6554550f35a7976f9110aff94743d3576d5f02dd' + # shared: fix keyring handling in ask-password-api + '2c390a919055af01b3ab6cce6dd0f97fb4784460' + # resolved: bugfix of null pointer p->question dereferencing (#6020) (CVE-2017-9217) + 'a924f43f30f9c4acaf70618dd2a055f8b0f166be' ) _validate_tag() { @@ -96,21 +92,21 @@ prepare() { _validate_tag || return - if (( ${#_backports[*]} > 0 )); then - 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 - patch -Np1 <../0001-disable-RestrictAddressFamilies-on-i686.patch + local _commit + for _commit in "${_backports[@]}"; do + git cherry-pick -n "$_commit" + done - # https://github.com/systemd/systemd/issues/4595 - # https://github.com/systemd/systemd/issues/3826 - patch -Np1 <../0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch + # nss-resolve: drop the internal fallback to libnss_dns + git show 5486a31d287f26bcd7c0a4eb2abfa4c074b985f1 -- \ + Makefile.am src/nss-resolve/nss-resolve.c | git apply --index + + # Resolved packet size (#6214) (FS#54619, CVE-2017-9445) + git show '751ca3f1de316ca79b60001334dbdf54077e1d01' \ + 'db848813bae4d28c524b3b6a7dad135e426659ce' \ + '88795538726a5bbfd9efc13d441cb05e1d7fc139' \ + '64a21fdaca7c93f1c30b21f6fdbd2261798b161a' \ + -- . ':!src/resolve/meson.build' | git apply --index ./autogen.sh } @@ -137,6 +133,9 @@ build() { --with-default-dnssec=no --with-dbuspolicydir=/usr/share/dbus-1/system.d --without-kill-user-processes + --with-rpmmacrosdir=no + # TODO(dreisner): consider changing this to unified + --with-default-hierarchy=hybrid ) ./configure "${configure_options[@]}" @@ -178,9 +177,6 @@ package_systemd-selinux() { # post_install. rm -r "$pkgdir/etc/systemd/system/"*.wants - # get rid of RPM macros - rm -r "$pkgdir/usr/lib/rpm" - # add back tmpfiles.d/legacy.conf install -m644 "${pkgbase/-selinux}/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" @@ -201,18 +197,26 @@ package_systemd-selinux() { chown root:systemd-journal "$pkgdir/var/log/journal" chmod 2755 "$pkgdir/var/log/journal" + # match directory owner/group and mode from extra/polkit + chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d + chmod 0750 "$pkgdir"/usr/share/polkit-1/rules.d + # we'll create this on installation rmdir "$pkgdir/var/log/journal/remote" # ship default policy to leave services disabled echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - ### manpages shipped with systemd-sysvcompat + # manpages shipped with systemd-sysvcompat rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - ### runtime libraries shipped with libsystemd + # runtime libraries shipped with libsystemd rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* + # allow core/filesystem to pristine nsswitch.conf + rm "$pkgdir/usr/share/factory/etc/nsswitch.conf" + sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf" + # add example bootctl configuration install -Dm644 "$srcdir/arch.conf" "$pkgdir"/usr/share/systemd/bootctl/arch.conf install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf |