Duplicated changes between core's ssytemd 222-1 and 223-1

2 files changed, 23 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2dd52784f6c..6b87e760fa21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = systemd-kill-fix
-	pkgver = 222
+	pkgver = 223
 	pkgrel = 1
 	url = http://www.freedesktop.org/wiki/Software/systemd
 	arch = i686
@@ -21,7 +21,6 @@ pkgbase = systemd-kill-fix
 	makedepends = libxslt
 	makedepends = util-linux
 	makedepends = linux-api-headers
-	makedepends = python
 	makedepends = python-lxml
 	makedepends = quota-tools
 	makedepends = shadow
@@ -29,7 +28,7 @@ pkgbase = systemd-kill-fix
 	makedepends = git
 	options = strip
 	options = debug
-	source = git://github.com/systemd/systemd.git#tag=v222
+	source = git://github.com/systemd/systemd.git#tag=v223
 	source = initcpio-hook-udev
 	source = initcpio-install-systemd
 	source = initcpio-install-udev
@@ -63,16 +62,15 @@ pkgname = systemd-kill-fix
 	depends = libseccomp
 	depends = util-linux
 	depends = xz
-	optdepends = python: systemd library bindings
 	optdepends = cryptsetup: required for encrypted block devices
 	optdepends = libmicrohttpd: remote journald capabilities
 	optdepends = quota-tools: kernel-level quota management
 	optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
 	optdepends = polkit: allow administration as unprivileged user
 	provides = nss-myhostname
-	provides = systemd-tools=222
-	provides = udev=222
-	provides = systemd=222
+	provides = systemd-tools=223
+	provides = udev=223
+	provides = systemd=223
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -108,13 +106,13 @@ pkgname = libsystemd-kill-fix
 	depends = libgcrypt
 	depends = lz4
 	depends = xz
-	provides = libsystemd.so=222
-	provides = libsystemd-daemon.so=222
-	provides = libsystemd-id128.so=222
-	provides = libsystemd-journal.so=222
-	provides = libsystemd-login.so=222
-	provides = libudev.so=222
-	provides = libsystemd=222
+	provides = libsystemd.so=223
+	provides = libsystemd-daemon.so=223
+	provides = libsystemd-id128.so=223
+	provides = libsystemd-journal.so=223
+	provides = libsystemd-login.so=223
+	provides = libudev.so=223
+	provides = libsystemd=223
 	conflicts = libsystemd
 
 pkgname = systemd-sysvcompat-kill-fix
@@ -122,7 +120,7 @@ pkgname = systemd-sysvcompat-kill-fix
 	groups = base
 	license = GPL2
 	depends = systemd
-	provides = systemd-sysvcompat=222
+	provides = systemd-sysvcompat=223
 	conflicts = sysvinit,
 	conflicts = systemd-sysvcompat
 
diff --git a/PKGBUILD b/PKGBUILD
index 66b6d4562f00..71237447fc32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,21 +6,21 @@
 # Modifications to revert commit 743970d
 # ======================================
 # Maintainer: James Harvey <jamespharvey20@gmail.com>
-#    * This PKGBUILD as closely as possible matches core's systemd 222-1
+#    * This PKGBUILD as closely as possible matches core's systemd 223-1
 #    * splash-arch.bmp is omitted, because it is over AUR4's 250k file size limit
 #    * All namcap warnings and errors are identical
 
 pkgbase=systemd-kill-fix
 pkgname=('systemd-kill-fix' 'libsystemd-kill-fix' 'systemd-sysvcompat-kill-fix')
 _pkgname=systemd
-pkgver=222
+pkgver=223
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
              'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
-             'python' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git')
+             'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git')
 options=('strip' 'debug')
 source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         'initcpio-hook-udev'
@@ -38,6 +38,10 @@ md5sums=('SKIP'
 prepare() {
   cd "$_pkgname"
 
+  # networkd: fix size of networkd binary
+  # https://github.com/systemd/systemd/commit/6870b4156377
+  git cherry-pick -n 6870b4156377
+
   # 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
@@ -80,8 +84,7 @@ package_systemd-kill-fix() {
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver")
   replaces=('nss-myhostname' 'systemd-tools' 'udev')
   conflicts=('nss-myhostname' 'systemd-tools' 'udev' 'systemd')
-  optdepends=('python: systemd library bindings'
-              'cryptsetup: required for encrypted block devices'
+  optdepends=('cryptsetup: required for encrypted block devices'
               'libmicrohttpd: remote journald capabilities'
               'quota-tools: kernel-level quota management'
               'systemd-sysvcompat: symlink package to provide sysvinit binaries'
@@ -167,7 +170,7 @@ package_libsystemd-kill-fix() {
   pkgdesc="systemd client libraries (with kill fix)"
   depends=('glibc' 'libgcrypt' 'lz4' 'xz')
   license=('GPL2')
-  provides=('libsystemd.so=222' 'libsystemd-daemon.so=222' 'libsystemd-id128.so=222' 'libsystemd-journal.so=222' 'libsystemd-login.so=222' 'libudev.so=222' 'libsystemd=222')
+  provides=('libsystemd.so=223' 'libsystemd-daemon.so=223' 'libsystemd-id128.so=223' 'libsystemd-journal.so=223' 'libsystemd-login.so=223' 'libudev.so=223' 'libsystemd=223')
   conflicts=('libsystemd')
 
   mv "$srcdir/_libsystemd"/* "$pkgdir"
@@ -177,7 +180,7 @@ package_systemd-sysvcompat-kill-fix() {
   pkgdesc="sysvinit compat for systemd (with kill fix)"
   license=('GPL2')
   groups=('base')
-  provides=('systemd-sysvcompat=222')
+  provides=('systemd-sysvcompat=223')
   conflicts=('sysvinit', 'systemd-sysvcompat')
   depends=('systemd')