diff options
| -rw-r--r-- | .SRCINFO | 21 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | systemd-hwdb.hook (renamed from udev-hwdb.hook) | 4 | ||||
| -rw-r--r-- | systemd-update.hook | 11 | ||||
| -rw-r--r-- | systemd.install | 10 |
5 files changed, 39 insertions, 20 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-selinux pkgver = 232 - pkgrel = 7 + pkgrel = 8 url = https://www.github.com/systemd/systemd arch = i686 arch = x86_64 @@ -38,9 +38,10 @@ pkgbase = systemd-selinux source = loader.conf source = splash-arch.bmp::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/splash-arch.bmp?h=packages/systemd&id=e43ddb71a5b1ab56e898347a63e54c5d5d07728a source = systemd-user.pam + source = systemd-hwdb.hook source = systemd-sysusers.hook source = systemd-tmpfiles.hook - source = udev-hwdb.hook + source = systemd-update.hook source = 0001-disable-RestrictAddressFamilies-on-i686.patch source = 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch source = 0001-nspawn-don-t-hide-bind-tmp-mounts.patch @@ -53,9 +54,10 @@ pkgbase = systemd-selinux sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75 sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19 + sha512sums = 2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda sha512sums = 9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22 sha512sums = 0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067 - sha512sums = 888ab01bc6e09beb08d7126472c34c9e1aa35ea34e62a09e900ae34c93b1de2fcc988586efd8d0dc962393974f45c77b206d59a86cf53e370f061bf9a1b1a862 + sha512sums = 10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618 sha512sums = 89f9b2d3918c679ce4f76c2b10dc7fcb7e04f1925a5f92542f06891de2a123a91df7eb67fd4ce71506a8132f5440b3560b7bb667e1c1813944b115c1dfe35e3f sha512sums = b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219 sha512sums = 68478403433aafc91a03fda5d83813d2ed1dfc6ab7416b2927a803314ecf826edcb6c659587e74df65de3ccb1edf958522f56ff9ac461a1f696b6dede1d4dd35 @@ -91,16 +93,12 @@ pkgname = systemd-selinux provides = nss-myhostname provides = systemd-tools=232 provides = udev=232 - provides = systemd=232-7 + provides = systemd=232-8 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev conflicts = systemd conflicts = selinux-systemd - replaces = nss-myhostname - replaces = systemd-tools - replaces = udev - replaces = selinux-systemd backup = etc/pam.d/systemd-user backup = etc/systemd/coredump.conf backup = etc/systemd/journald.conf @@ -124,17 +122,16 @@ pkgname = libsystemd-selinux depends = libselinux provides = libsystemd.so provides = libudev.so - provides = libsystemd=232-7 + provides = libsystemd=232-8 conflicts = libsystemd pkgname = systemd-sysvcompat-selinux pkgdesc = sysvinit compat for systemd with SELinux support license = GPL2 depends = systemd-selinux - provides = systemd-sysvcompat=232-7 - provides = selinux-systemd-sysvcompat=232-7 + provides = systemd-sysvcompat=232-8 + provides = selinux-systemd-sysvcompat=232-8 conflicts = sysvinit conflicts = systemd-sysvcompat conflicts = selinux-systemd-sysvcompat - replaces = systemd-sysvcompat @@ -7,7 +7,7 @@ pkgbase=systemd-selinux pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux') pkgver=232 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url="https://www.github.com/systemd/systemd" groups=('selinux') @@ -27,9 +27,10 @@ source=("git+https://github.com/systemd/systemd.git#tag=v$pkgver" 'loader.conf' 'splash-arch.bmp::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/splash-arch.bmp?h=packages/systemd&id=e43ddb71a5b1ab56e898347a63e54c5d5d07728a' 'systemd-user.pam' + 'systemd-hwdb.hook' 'systemd-sysusers.hook' 'systemd-tmpfiles.hook' - 'udev-hwdb.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') @@ -41,9 +42,10 @@ sha512sums=('SKIP' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' + '2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda' '9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22' '0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067' - '888ab01bc6e09beb08d7126472c34c9e1aa35ea34e62a09e900ae34c93b1de2fcc988586efd8d0dc962393974f45c77b206d59a86cf53e370f061bf9a1b1a862' + '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618' '89f9b2d3918c679ce4f76c2b10dc7fcb7e04f1925a5f92542f06891de2a123a91df7eb67fd4ce71506a8132f5440b3560b7bb667e1c1813944b115c1dfe35e3f' 'b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219' '68478403433aafc91a03fda5d83813d2ed1dfc6ab7416b2927a803314ecf826edcb6c659587e74df65de3ccb1edf958522f56ff9ac461a1f696b6dede1d4dd35') @@ -149,7 +151,6 @@ package_systemd-selinux() { 'util-linux-selinux' 'xz' 'audit') provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "${pkgname/-selinux}=${pkgver}-${pkgrel}") - replaces=('nss-myhostname' 'systemd-tools' 'udev' 'selinux-systemd') conflicts=('nss-myhostname' 'systemd-tools' 'udev' "${pkgname/-selinux}" 'selinux-systemd') optdepends=('cryptsetup: required for encrypted block devices' @@ -216,9 +217,10 @@ package_systemd-selinux() { install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp + install -Dm644 "$srcdir/systemd-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook" install -Dm644 "$srcdir/systemd-sysusers.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook" install -Dm644 "$srcdir/systemd-tmpfiles.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook" - install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook" + install -Dm644 "$srcdir/systemd-update.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-update.hook" # overwrite the systemd-user PAM configuration with our own install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user" @@ -242,7 +244,6 @@ package_systemd-sysvcompat-selinux() { depends=('systemd-selinux') provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-systemd-sysvcompat=${pkgver}-${pkgrel}") - replaces=("${pkgname/-selinux}") install -dm755 "$pkgdir"/usr/share/man/man8 cp -d --no-preserve=ownership,timestamp \ diff --git a/udev-hwdb.hook b/systemd-hwdb.hook index 7bc055b4e777..d7c9877240e2 100644 --- a/udev-hwdb.hook +++ b/systemd-hwdb.hook @@ -6,6 +6,6 @@ Operation = Remove Target = usr/lib/udev/hwdb.d/* [Action] -Description = Updating udev Hardware Database... +Description = Updating udev hardware database... When = PostTransaction -Exec = /usr/bin/udevadm hwdb --update +Exec = /usr/bin/systemd-hwdb --usr update diff --git a/systemd-update.hook b/systemd-update.hook new file mode 100644 index 000000000000..3697fbd701bd --- /dev/null +++ b/systemd-update.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/ + +[Action] +Description = Arming ConditionNeedsUpdate... +When = PostTransaction +Exec = /usr/bin/touch -c /usr diff --git a/systemd.install b/systemd.install index b59de2008a1c..f799c882d53a 100644 --- a/systemd.install +++ b/systemd.install @@ -36,6 +36,15 @@ _230_1_changes() { echo ':: systemd-bootchart is no longer included with systemd' } +_232_8_changes() { + # paper over possible effects of CVE-2016-10156 + local stamps=(/var/lib/systemd/timers/*.timer) + + if [[ -f ${stamps[0]} ]]; then + chmod 0644 "${stamps[@]}" + fi +} + post_install() { systemd-machine-id-setup @@ -68,6 +77,7 @@ post_upgrade() { 219-2 219-4 230-1 + 232-8 ) for v in "${upgrades[@]}"; do |