From cb952dc2a59cbc4979223890d02b88f2e28aa430 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 27 Nov 2015 17:40:32 +0000 Subject: [PATCH] core/systemd to 228-3 --- core/systemd/PKGBUILD | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index ced19045c5..7f5ccb7bb3 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -7,11 +7,11 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') -pkgver=227 -pkgrel=1 +pkgver=228 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" -makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' +makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' 'python-lxml' 'quota-tools' 'shadow' 'git') @@ -34,6 +34,16 @@ md5sums=('SKIP' prepare() { cd "$pkgbase" + # sd-ndisc: drop RA packets from non-link-local addresses + # https://github.com/systemd/systemd/commit/3ccd31635353 + # https://github.com/systemd/systemd/issues/1866 + git cherry-pick -n 3ccd31635353 + + # networkd: link - do not drop config for loopback device + # https://github.com/systemd/systemd/commit/e5d44b34cca3 + # https://github.com/systemd/systemd/issues/2023 + git cherry-pick -n e5d44b34cca3 + ./autogen.sh } @@ -65,7 +75,7 @@ package_systemd() { pkgdesc="system and service manager" license=('GPL2' 'LGPL2.1') depends=('acl' 'bash' 'dbus' 'glib2' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' - 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libseccomp' + 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' 'util-linux' 'xz') provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") replaces=('nss-myhostname' 'systemd-tools' 'udev')