Merge branch 'ck-shutdown' into 'master'

user/consolekit2: request power off when shutting down



See merge request !240

user/consolekit2/APKBUILD

@@ -3,7 +3,7 @@
 pkgbase=ConsoleKit2
 pkgname=consolekit2
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Framework for defining and tracking users, login sessions, and seats"
 provides="consolekit=$pkgver"
 replaces="consolekit"
@@ -18,7 +18,8 @@ checkdepends="libxml2-utils"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc"
 source="https://github.com/ConsoleKit2/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.tar.bz2
 	consolekit2.initd
-	pam-foreground-compat.ck"
+	pam-foreground-compat.ck
+	poweroff.patch"
 # Capital "ConsoleKit"
 builddir="$srcdir"/$pkgbase-$pkgver
 
@@ -54,4 +55,5 @@ package() {
 
 sha512sums="31befe89f7fa604138bfb0722fc6cf12f0934bac004f98fc331004eb5a7f466ed7bd0dc9adc9869da739974208f9a3bc125068ff8a60d4b2badb58ef70a3eb10  ConsoleKit2-1.2.1.tar.bz2
 8c16c452707475bdd4a50d3ade367d52ad92a6560be48b4e21e5b5eadef6e56c39d3d03d3a64f9b45a59eca50179cf5aa9c11978904d5d101db7498fb9bc0339  consolekit2.initd
-3b114fbbe74cfba0bfd4dad0eb1b85d08b4979a998980c1cbcd7f44b8a16b0ceca224680d4f4a1644cd24698f8817e5e8bdfcdc4ead87a122d0e323142f47910  pam-foreground-compat.ck"
+3b114fbbe74cfba0bfd4dad0eb1b85d08b4979a998980c1cbcd7f44b8a16b0ceca224680d4f4a1644cd24698f8817e5e8bdfcdc4ead87a122d0e323142f47910  pam-foreground-compat.ck
+033595766671f545ba6c9f3fcb529547d20359cdd8eb901bb7a6c3b319b495038e8072e3b01f2fd264f592b0c7825a79282d8bc590f057a5f62e9fdfedde9c68  poweroff.patch"

user/consolekit2/poweroff.patch

+Most users expect "shutdown" to also power off the machine when
+requested from a graphical environment. "Actions after halting are
+unspecified" when using -h (LSB 3.0) - sysvinit additionally tries to
+power off when using -h, whereas s6-linux-init only halts.
+Use the **non-standard** -P option (implemented by sysvinit and
+s6-linux-init since 1.0.2.0) to request power off after halting.
+
+--- ConsoleKit2-1.2.1/tools/linux/ck-system-stop	2017-06-02 01:31:44.000000000 +0000
++++ ConsoleKit2-1.2.1/tools/linux/ck-system-stop	2019-06-09 17:40:31.110006347 +0000
+@@ -2,10 +2,10 @@
+ 
+ #Try for common tools
+ if [ -x "/sbin/shutdown" ] ; then
+-	/sbin/shutdown -h now
++	/sbin/shutdown -hP now
+ 	exit $?
+ elif [ -x "/usr/sbin/shutdown" ] ; then
+-	/usr/sbin/shutdown -h now
++	/usr/sbin/shutdown -hP now
+ 	exit $?
+ else
+ 	exit 1