diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 18 |
2 files changed, 18 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-kill-fix pkgver = 221 - pkgrel = 1 + pkgrel = 2 url = http://www.freedesktop.org/wiki/Software/systemd arch = i686 arch = x86_64 @@ -117,7 +117,7 @@ pkgname = libsystemd-kill-fix provides = libsystemd-login.so=221 provides = libudev.so=221 provides = libsystemd=221 - conflicts = libsystemd=221 + conflicts = libsystemd pkgname = systemd-sysvcompat-kill-fix pkgdesc = sysvinit compat for systemd (with kill fix) @@ -126,5 +126,5 @@ pkgname = systemd-sysvcompat-kill-fix depends = systemd provides = systemd-sysvcompat=221 conflicts = sysvinit, - conflicts = systemd-sysvcompat=221 + conflicts = systemd-sysvcompat @@ -5,7 +5,7 @@ pkgbase=systemd-kill-fix pkgname=('systemd-kill-fix' 'libsystemd-kill-fix' 'systemd-sysvcompat-kill-fix') pkgver=221 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' @@ -37,6 +37,18 @@ prepare() { # https://github.com/systemd/systemd/commit/11b9fb15be96 git cherry-pick -n 11b9fb15be96 + # core: fix reversed dependency check in unit_check_unneeded + # https://github.com/systemd/systemd/commit/084918ba41ac + git cherry-pick -n 084918ba41ac + + # rules: remove all power management from udev + # https://github.com/systemd/systemd/commit/e2452eef02a8 + git cherry-pick -n e2452eef02a8 + + # logind: fix delayed execution regression + # https://github.com/systemd/systemd/commit/418b22b88f79 + git cherry-pick -n 418b22b88f79 + # revert commit that under certain circumstances sends processes a # kill -9 during system shutdown. most common data loss from this is # preventing bash from writing .bash_history @@ -167,7 +179,7 @@ package_libsystemd-kill-fix() { depends=('glib2' 'glibc' 'libgcrypt' 'lz4' 'xz') license=('GPL2') provides=('libsystemd.so=221' 'libsystemd-daemon.so=221' 'libsystemd-id128.so=221' 'libsystemd-journal.so=221' 'libsystemd-login.so=221' 'libudev.so=221' 'libsystemd=221') - conflicts=('libsystemd=221') + conflicts=('libsystemd') mv "$srcdir/_libsystemd"/* "$pkgdir" } @@ -177,7 +189,7 @@ package_systemd-sysvcompat-kill-fix() { license=('GPL2') groups=('base') provides=('systemd-sysvcompat=221') - conflicts=('sysvinit', 'systemd-sysvcompat=221') + conflicts=('sysvinit', 'systemd-sysvcompat') depends=('systemd') mv "$srcdir/_sysvcompat"/* "$pkgdir" |