systemd-selinux 222-1 update

3 files changed, 14 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35297c8cf982..86cd569893d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
-	pkgver = 221
-	pkgrel = 2
+	pkgver = 222
+	pkgrel = 1
 	url = http://www.freedesktop.org/wiki/Software/systemd
 	arch = i686
 	arch = x86_64
@@ -31,7 +31,7 @@ pkgbase = systemd-selinux
 	makedepends = libselinux
 	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
@@ -41,7 +41,7 @@ pkgbase = systemd-selinux
 	md5sums = SKIP
 	md5sums = 90ea67a7bb237502094914622a39e281
 	md5sums = 976c5511b6493715e381f43f16cdb151
-	md5sums = bde43090d4ac0ef048e3eaee8202a407
+	md5sums = 1b3aa3a0551b08af9305d33f85b5c2fc
 	md5sums = 20ead378f5d6df4b2a3e670301510a7d
 	md5sums = ddaef54f68f6c86c6c07835fc668f62a
 	md5sums = 1e2f9a8b0fa32022bf0a8f39123e5f4e
@@ -77,9 +77,9 @@ pkgname = systemd-selinux
 	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-2
+	provides = systemd-tools=222
+	provides = udev=222
+	provides = systemd=222-1
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -113,7 +113,6 @@ pkgname = systemd-selinux
 pkgname = libsystemd-selinux
 	pkgdesc = systemd client libraries with SELinux support
 	license = GPL2
-	depends = glib2
 	depends = glibc
 	depends = libgcrypt
 	depends = lz4
@@ -124,15 +123,15 @@ pkgname = libsystemd-selinux
 	provides = libsystemd-journal.so
 	provides = libsystemd-login.so
 	provides = libudev.so
-	provides = libsystemd=221-2
+	provides = libsystemd=222-1
 	conflicts = libsystemd
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=221-2
-	provides = selinux-systemd-sysvcompat=221-2
+	provides = systemd-sysvcompat=222-1
+	provides = selinux-systemd-sysvcompat=222-1
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 4c7f1ec797e6..86495966b5b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux')
-pkgver=221
-pkgrel=2
+pkgver=222
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 groups=('selinux')
@@ -29,7 +29,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
 md5sums=('SKIP'
          '90ea67a7bb237502094914622a39e281'
          '976c5511b6493715e381f43f16cdb151'
-         'bde43090d4ac0ef048e3eaee8202a407'
+         '1b3aa3a0551b08af9305d33f85b5c2fc'
          '20ead378f5d6df4b2a3e670301510a7d'
          'ddaef54f68f6c86c6c07835fc668f62a'
          '1e2f9a8b0fa32022bf0a8f39123e5f4e')
@@ -37,26 +37,6 @@ md5sums=('SKIP'
 prepare() {
   cd "${pkgname/-selinux}"
 
-  # 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
-
   ./autogen.sh
 }
 
@@ -184,7 +164,7 @@ package_systemd-selinux() {
 
 package_libsystemd-selinux() {
   pkgdesc="systemd client libraries with SELinux support"
-  depends=('glib2' 'glibc' 'libgcrypt' 'lz4' 'xz')
+  depends=('glibc' 'libgcrypt' 'lz4' 'xz')
   license=('GPL2')
   provides=('libsystemd.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
             'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so'
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