Duplicated changes between core's systemd 221-2 and 222-1

3 files changed, 23 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba89c9146b07..f2dd52784f6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-kill-fix
-	pkgver = 221
-	pkgrel = 2
+	pkgver = 222
+	pkgrel = 1
 	url = http://www.freedesktop.org/wiki/Software/systemd
 	arch = i686
 	arch = x86_64
@@ -29,7 +29,7 @@ pkgbase = systemd-kill-fix
 	makedepends = git
 	options = strip
 	options = debug
-	source = git://github.com/systemd/systemd.git#tag=v221
+	source = git://github.com/systemd/systemd.git#tag=v222
 	source = initcpio-hook-udev
 	source = initcpio-install-systemd
 	source = initcpio-install-udev
@@ -38,7 +38,7 @@ pkgbase = systemd-kill-fix
 	md5sums = SKIP
 	md5sums = 90ea67a7bb237502094914622a39e281
 	md5sums = 976c5511b6493715e381f43f16cdb151
-	md5sums = bde43090d4ac0ef048e3eaee8202a407
+	md5sums = 1b3aa3a0551b08af9305d33f85b5c2fc
 	md5sums = 20ead378f5d6df4b2a3e670301510a7d
 	md5sums = ddaef54f68f6c86c6c07835fc668f62a
 
@@ -50,7 +50,6 @@ pkgname = systemd-kill-fix
 	depends = acl
 	depends = bash
 	depends = dbus
-	depends = glib2
 	depends = iptables
 	depends = kbd
 	depends = kmod
@@ -71,9 +70,9 @@ pkgname = systemd-kill-fix
 	optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
 	optdepends = polkit: allow administration as unprivileged user
 	provides = nss-myhostname
-	provides = systemd-tools=221
-	provides = udev=221
-	provides = systemd=221
+	provides = systemd-tools=222
+	provides = udev=222
+	provides = systemd=222
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -105,18 +104,17 @@ pkgname = systemd-kill-fix
 pkgname = libsystemd-kill-fix
 	pkgdesc = systemd client libraries (with kill fix)
 	license = GPL2
-	depends = glib2
 	depends = glibc
 	depends = libgcrypt
 	depends = lz4
 	depends = xz
-	provides = libsystemd.so=221
-	provides = libsystemd-daemon.so=221
-	provides = libsystemd-id128.so=221
-	provides = libsystemd-journal.so=221
-	provides = libsystemd-login.so=221
-	provides = libudev.so=221
-	provides = libsystemd=221
+	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
 	conflicts = libsystemd
 
 pkgname = systemd-sysvcompat-kill-fix
@@ -124,7 +122,7 @@ pkgname = systemd-sysvcompat-kill-fix
 	groups = base
 	license = GPL2
 	depends = systemd
-	provides = systemd-sysvcompat=221
+	provides = systemd-sysvcompat=222
 	conflicts = sysvinit,
 	conflicts = systemd-sysvcompat
 
diff --git a/PKGBUILD b/PKGBUILD
index 0e66ab59328f..66b6d4562f00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,15 +6,15 @@
 # Modifications to revert commit 743970d
 # ======================================
 # Maintainer: James Harvey <jamespharvey20@gmail.com>
-#    * This PKGBUILD as closely as possible matches core's systemd 221-2
+#    * This PKGBUILD as closely as possible matches core's systemd 222-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=221
-pkgrel=2
+pkgver=222
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam'
@@ -31,33 +31,13 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
 md5sums=('SKIP'
          '90ea67a7bb237502094914622a39e281'
          '976c5511b6493715e381f43f16cdb151'
-         'bde43090d4ac0ef048e3eaee8202a407'
+         '1b3aa3a0551b08af9305d33f85b5c2fc'
          '20ead378f5d6df4b2a3e670301510a7d'
          'ddaef54f68f6c86c6c07835fc668f62a')
 
 prepare() {
   cd "$_pkgname"
 
-  # pam_systemd: Properly check kdbus availability
-  # https://github.com/systemd/systemd/commit/c5d452bb228e
-  git cherry-pick -n c5d452bb228e
-
-  # udevd: suppress warning if we don't find cgroup
-  # 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
@@ -94,7 +74,7 @@ build() {
 package_systemd-kill-fix() {
   pkgdesc="system and service manager (with kill fix)"
   license=('GPL2' 'LGPL2.1')
-  depends=('acl' 'bash' 'dbus' 'glib2' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
+  depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
            'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libseccomp' 'util-linux'
            'xz')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver")
@@ -185,9 +165,9 @@ package_systemd-kill-fix() {
 
 package_libsystemd-kill-fix() {
   pkgdesc="systemd client libraries (with kill fix)"
-  depends=('glib2' 'glibc' 'libgcrypt' 'lz4' 'xz')
+  depends=('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')
+  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')
   conflicts=('libsystemd')
 
   mv "$srcdir/_libsystemd"/* "$pkgdir"
@@ -197,7 +177,7 @@ package_systemd-sysvcompat-kill-fix() {
   pkgdesc="sysvinit compat for systemd (with kill fix)"
   license=('GPL2')
   groups=('base')
-  provides=('systemd-sysvcompat=221')
+  provides=('systemd-sysvcompat=222')
   conflicts=('sysvinit', 'systemd-sysvcompat')
   depends=('systemd')
 
diff --git a/initcpio-install-udev b/initcpio-install-udev
index 419c19e58338..7f0301a48856 100644
--- a/initcpio-install-udev
+++ b/initcpio-install-udev
@@ -3,7 +3,6 @@
 build() {
     local rules tool
 
-    add_file "/etc/udev/udev.conf"
     add_binary /usr/lib/systemd/systemd-udevd
     add_binary /usr/bin/udevadm
     add_binary /usr/bin/systemd-tmpfiles