summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcr/consolekit/01-org.freedesktop.ModemManager1.rules6
-rw-r--r--pcr/consolekit/01-org.freedesktop.NetworkManager.settings.modify.system.rules6
-rw-r--r--pcr/consolekit/25-consolekit.rules (renamed from pcr/consolekit/75-consolekit.rules)0
-rw-r--r--pcr/consolekit/PKGBUILD55
-rw-r--r--pcr/consolekit/consolekit.logrotate5
-rw-r--r--pcr/consolekit/consolekit.pamd11
6 files changed, 36 insertions, 47 deletions
diff --git a/pcr/consolekit/01-org.freedesktop.ModemManager1.rules b/pcr/consolekit/01-org.freedesktop.ModemManager1.rules
deleted file mode 100644
index 38af2c8de..000000000
--- a/pcr/consolekit/01-org.freedesktop.ModemManager1.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-polkit.addRule(function(action, subject) {
- if (/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id) &&
- subject.isInGroup("network") && subject.active) {
- return "yes";
- }
-});
diff --git a/pcr/consolekit/01-org.freedesktop.NetworkManager.settings.modify.system.rules b/pcr/consolekit/01-org.freedesktop.NetworkManager.settings.modify.system.rules
deleted file mode 100644
index ef002c904..000000000
--- a/pcr/consolekit/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-polkit.addRule(function(action, subject) {
- if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" &&
- subject.isInGroup("network") && subject.active) {
- return "yes";
- }
-});
diff --git a/pcr/consolekit/75-consolekit.rules b/pcr/consolekit/25-consolekit.rules
index adddfb1bd..adddfb1bd 100644
--- a/pcr/consolekit/75-consolekit.rules
+++ b/pcr/consolekit/25-consolekit.rules
diff --git a/pcr/consolekit/PKGBUILD b/pcr/consolekit/PKGBUILD
index 42a4a0707..1cd602a03 100644
--- a/pcr/consolekit/PKGBUILD
+++ b/pcr/consolekit/PKGBUILD
@@ -1,39 +1,41 @@
-# Maintainer : freaj <freaj@riseup.net>
-# Maintainer (Manjaro): artoo <artoo@manjaro.org>
+# Maintainer (Arch): artoo <artoo@manjaro.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
_pkgname=ConsoleKit2
pkgname=consolekit
-pkgver=0.9.2
-pkgrel=4
+pkgver=0.9.4
+pkgrel=1
pkgdesc="A framework for defining and tracking users, login sessions, and seats"
arch=('i686' 'x86_64')
url="https://github.com/ConsoleKit2/ConsoleKit2"
license=('GPL')
-provides=('logind')
-depends=('dbus' 'dbus-glib' 'libx11' 'polkit' 'udev' 'zlib')
+#provides=('logind')
+depends=('dbus' 'glib2' 'libx11' 'polkit-consolekit' 'udev' 'zlib')
optdepends=('consolekit-openrc: consolekit openrc initscript')
makedepends=('xmlto' 'docbook-xsl')
-options=(libtool)
+options=('libtool')
source=("$url/releases/download/$pkgver/$_pkgname-$pkgver.tar.bz2"
'consolekit.tmpfiles.conf'
- '75-consolekit.rules'
- 'consolekit.logrotate'
- '01-org.freedesktop.ModemManager1.rules'
- '01-org.freedesktop.NetworkManager.settings.modify.system.rules')
-sha256sums=('102aa07e0960e56740e235bba06a546c8e0e88f47546ef252ecda917935af41f'
+ '25-consolekit.rules'
+ 'consolekit.pamd')
+sha256sums=('b3e9554472f1a431576c317536d93ba1ef292916ea8447667deee0b555980e2e'
'778552dc12b3c235bde200e476d4262da0c135f3f6f8b3e975a87881d1f154d1'
'c5159d9fe8fdd52ad0d6a84af7ba00bac09edaae965896ab0d099a4df1c5ea6b'
- '79735ddd37b8ce6216c78542c2a4e32692dce757c86ecd5771ea8a895a1e8e4d'
- 'b8c47eb6de2ffbcd533514ecbc660842e072d8ba2bbe601608038ef6bc18dd17'
- '3d0b6f30de1c91a95429af4fed99e41c8e8db55b45b2f3a17974c5be36c16475')
+ 'f7b88e87f447e2d37c12886f57d932c385f19a8fef238e0f1de7a1746d8be69e')
+
+prepare(){
+ cd $srcdir/$_pkgname-$pkgver
+}
build(){
- cd "$srcdir/$_pkgname-$pkgver"
+ cd $srcdir/$_pkgname-$pkgver
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--sbindir=/usr/bin \
+ --with-rundir=/run \
--libexecdir=/usr/lib/ConsoleKit \
--localstatedir=/var \
--enable-polkit \
@@ -41,7 +43,6 @@ build(){
--enable-udev-acl \
--enable-docbook-docs \
--with-dbus-services=/usr/share/dbus-1/services \
- --with-logrotate-dir=/etc/logrotate.d \
--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
--with-pam-module-dir=/usr/lib/security \
--without-systemdsystemunitdir
@@ -50,22 +51,16 @@ build(){
}
package() {
- cd "$srcdir/$_pkgname-$pkgver"
+ cd $srcdir/$_pkgname-$pkgver
make DESTDIR="$pkgdir" install
- #install -D -m644 data/consolekit.logrotate "$pkgdir"/etc/logrotate.d/consolekit
- install -D -m644 "$srcdir"/consolekit.logrotate "$pkgdir"/etc/logrotate.d/consolekit
- install -D -m644 data/90-consolekit "$pkgdir"/etc/X11/xinit/xinitrc.d/90-consolekit.sh
- chmod +x "$pkgdir"/etc/X11/xinit/xinitrc.d/90-consolekit.sh
-
- install -D -m644 "$srcdir"/consolekit.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/consolekit.conf
+ install -Dm644 "$srcdir"/consolekit.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/consolekit.conf
- rm -rf "${pkgdir}"/var/run
+ rm -rf "${pkgdir}"/run
- install -d -m700 $pkgdir/etc/polkit-1/rules.d/
- install -D -m644 ${srcdir}/75-consolekit.rules $pkgdir/etc/polkit-1/rules.d/25-consolekit.rules
- install -D -m644 ${srcdir}/01-org.freedesktop.ModemManager1.rules $pkgdir/etc/polkit-1/rules.d/
- install -D -m644 ${srcdir}/01-org.freedesktop.NetworkManager.settings.modify.system.rules $pkgdir/etc/polkit-1/rules.d/
+ install -dm 700 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d
+ install -m 644 ${srcdir}/25-consolekit.rules $pkgdir/usr/share/polkit-1/rules.d/75-consolekit.rules
- chown 102 $pkgdir/etc/polkit-1/rules.d
+ install -dm755 $pkgdir/etc/pam.d/
+ install -Dm755 ${srcdir}/consolekit.pamd $pkgdir/etc/pam.d/consolekit
}
diff --git a/pcr/consolekit/consolekit.logrotate b/pcr/consolekit/consolekit.logrotate
deleted file mode 100644
index 7c5346ef8..000000000
--- a/pcr/consolekit/consolekit.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/ConsoleKit/history {
- missingok
- notifempty
- delaycompress
-}
diff --git a/pcr/consolekit/consolekit.pamd b/pcr/consolekit/consolekit.pamd
new file mode 100644
index 000000000..7d8f614c4
--- /dev/null
+++ b/pcr/consolekit/consolekit.pamd
@@ -0,0 +1,11 @@
+#%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