summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
Diffstat (limited to 'pcr')
-rw-r--r--pcr/consolekit/75-consolekit.rules8
-rw-r--r--pcr/consolekit/75-org.freedesktop.consolekit.rules11
-rw-r--r--pcr/consolekit/PKGBUILD16
-rw-r--r--pcr/consolekit/consolekit.pamd11
4 files changed, 17 insertions, 29 deletions
diff --git a/pcr/consolekit/75-consolekit.rules b/pcr/consolekit/75-consolekit.rules
deleted file mode 100644
index adddfb1bd..000000000
--- a/pcr/consolekit/75-consolekit.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-polkit.addRule(function(action, subject) {
- if (action.id == "org.freedesktop.consolekit.system.stop" ||
- action.id == "org.freedesktop.consolekit.system.restart" ||
- action.id == "org.freedesktop.consolekit.system.hibernate" ||
- action.id == "org.freedesktop.consolekit.system.suspend") {
- return polkit.Result.YES;
- }
-});
diff --git a/pcr/consolekit/75-org.freedesktop.consolekit.rules b/pcr/consolekit/75-org.freedesktop.consolekit.rules
new file mode 100644
index 000000000..e73e10755
--- /dev/null
+++ b/pcr/consolekit/75-org.freedesktop.consolekit.rules
@@ -0,0 +1,11 @@
+polkit.addRule(function(action, subject) {
+ if (action.id == "org.freedesktop.consolekit.system.stop" ||
+ action.id == "org.freedesktop.consolekit.system.restart" ||
+ action.id == "org.freedesktop.consolekit.system.hibernate" ||
+ action.id == "org.freedesktop.consolekit.system.suspend" ||
+ action.id == "org.freedesktop.consolekit.system.restart-multiple-users" ||
+ action.id == "org.freedesktop.consolekit.system.suspend-multiple-users" ||
+ action.id == "org.freedesktop.consolekit.system.stop-multiple-users") {
+ return polkit.Result.YES;
+ }
+});
diff --git a/pcr/consolekit/PKGBUILD b/pcr/consolekit/PKGBUILD
index ca5cd32a2..6f4d781f2 100644
--- a/pcr/consolekit/PKGBUILD
+++ b/pcr/consolekit/PKGBUILD
@@ -5,25 +5,24 @@ _pkgname=ConsoleKit2
pkgname=consolekit
pkgver=1.1.0
-pkgrel=1
+pkgrel=3
pkgdesc="A framework for defining and tracking users, login sessions, and seats"
arch=('i686' 'x86_64' 'armv7h')
url="https://github.com/ConsoleKit2/ConsoleKit2"
license=('GPL')
depends=('dbus' 'glib2' 'libx11' 'polkit' 'udev' 'zlib')
-optdepends=('consolekit-openrc: consolekit openrc initscript'
+optdepends=('pm-utils: Suspend and hibernate power management'
+ 'consolekit-openrc: consolekit openrc initscript'
'cgmanager-openrc: cgmanager openrc initscript')
makedepends=('xmlto' 'docbook-xsl' 'cgmanager')
options=('!libtool')
source=("$url/releases/download/$pkgver/$_pkgname-$pkgver.tar.bz2"
'consolekit.tmpfiles.conf'
- '75-consolekit.rules'
- 'consolekit.pamd'
+ '75-org.freedesktop.consolekit.rules'
'pam-foreground-compat.ck')
sha256sums=('a40d92358aca9f627a224dca674090e310423b00ed63fc06482997611661b69b'
'778552dc12b3c235bde200e476d4262da0c135f3f6f8b3e975a87881d1f154d1'
- 'c5159d9fe8fdd52ad0d6a84af7ba00bac09edaae965896ab0d099a4df1c5ea6b'
- 'f7b88e87f447e2d37c12886f57d932c385f19a8fef238e0f1de7a1746d8be69e'
+ '9f356df83bcebe10c3c8e9d232c3e59aff49b83b980b61f9b97a5b4e0fa3ba3d'
'ad9b8d7c92e73c5cff7a883724992008b6a0382b2466fd5f69720f112c1eb0f9')
prepare(){
@@ -62,10 +61,7 @@ package() {
rm -rf "${pkgdir}"/run
install -dm 750 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d
- install -m 644 ${srcdir}/75-consolekit.rules $pkgdir/usr/share/polkit-1/rules.d/75-consolekit.rules
-
- install -dm755 $pkgdir/etc/pam.d/
- install -Dm755 ${srcdir}/consolekit.pamd $pkgdir/etc/pam.d/consolekit
+ install -m 644 ${srcdir}/75-org.freedesktop.consolekit.rules $pkgdir/usr/share/polkit-1/rules.d/
install $srcdir/pam-foreground-compat.ck $pkgdir/usr/lib/ConsoleKit/run-session.d
}
diff --git a/pcr/consolekit/consolekit.pamd b/pcr/consolekit/consolekit.pamd
deleted file mode 100644
index 7d8f614c4..000000000
--- a/pcr/consolekit/consolekit.pamd
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-
-auth include system-login
-
-account include system-login
-
-session include system-login
-
-password include system-login
-
-session optional pam_ck_connector.so nox11