summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--25-consolekit.rules8
-rw-r--r--PKGBUILD7
-rw-r--r--consolekit.install12
-rw-r--r--consolekit.pamd11
5 files changed, 16 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3d1a596cf59b..91701dfdd85f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
pkgbase = consolekit-git
pkgdesc = A framework for defining and tracking users, login sessions, and seats
- pkgver = r711.f420678
+ pkgver = r720.54552ec
pkgrel = 1
url = https://github.com/ConsoleKit2/ConsoleKit2
+ install = consolekit.install
arch = i686
arch = x86_64
license = GPL
@@ -24,13 +25,9 @@ pkgbase = consolekit-git
replaces = consolekit
options = libtool
source = git://github.com/ConsoleKit2/ConsoleKit2
- source = 25-consolekit.rules
- source = consolekit.pamd
source = consolekit.tmpfiles.conf
validpgpkeys = 6DD4217456569BA711566AC7F06E8FDE7B45DAAC
sha256sums = SKIP
- sha256sums = c5159d9fe8fdd52ad0d6a84af7ba00bac09edaae965896ab0d099a4df1c5ea6b
- sha256sums = f7b88e87f447e2d37c12886f57d932c385f19a8fef238e0f1de7a1746d8be69e
sha256sums = 778552dc12b3c235bde200e476d4262da0c135f3f6f8b3e975a87881d1f154d1
pkgname = consolekit-git
diff --git a/25-consolekit.rules b/25-consolekit.rules
deleted file mode 100644
index adddfb1bd791..000000000000
--- a/25-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/PKGBUILD b/PKGBUILD
index 0a93b4404fee..18709b860bc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
_pkgname=ConsoleKit2
pkgname=consolekit-git
-pkgver=r711.f420678
+pkgver=r720.54552ec
pkgrel=1
pkgdesc="A framework for defining and tracking users, login sessions, and seats"
arch=('i686' 'x86_64')
@@ -14,13 +14,10 @@ optdepends=('consolekit-openrc: consolekit openrc initscript'
'pm-utils: suspend/hibernate support')
makedepends=('git' 'python' 'xmlto' 'docbook-xsl')
options=('libtool')
+install=consolekit.install
source=("git://github.com/ConsoleKit2/ConsoleKit2"
- '25-consolekit.rules'
- 'consolekit.pamd'
'consolekit.tmpfiles.conf')
sha256sums=('SKIP'
- 'c5159d9fe8fdd52ad0d6a84af7ba00bac09edaae965896ab0d099a4df1c5ea6b'
- 'f7b88e87f447e2d37c12886f57d932c385f19a8fef238e0f1de7a1746d8be69e'
'778552dc12b3c235bde200e476d4262da0c135f3f6f8b3e975a87881d1f154d1')
validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal
diff --git a/consolekit.install b/consolekit.install
new file mode 100644
index 000000000000..5a416b825761
--- /dev/null
+++ b/consolekit.install
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+post_install() {
+ echo " You may add"
+ echo " -session optional pam_ck_connector.so nox11"
+ echo " to /etc/pam.d/system-login"
+ echo " to register tty sessions with ConsoleKit daemon."
+}
+
+post_upgrade() {
+ post_install
+}
diff --git a/consolekit.pamd b/consolekit.pamd
deleted file mode 100644
index 7d8f614c4a42..000000000000
--- a/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