diff options
| -rw-r--r-- | .SRCINFO | 35 | ||||
| -rw-r--r-- | 25-consolekit.rules | 8 | ||||
| -rw-r--r-- | PKGBUILD | 98 | ||||
| -rw-r--r-- | consolekit.logrotate | 5 | ||||
| -rw-r--r-- | consolekit.pamd | 11 | ||||
| -rw-r--r-- | pam-foreground-compat.ck | 16 |
6 files changed, 96 insertions, 77 deletions
@@ -1,32 +1,37 @@ pkgbase = consolekit-git pkgdesc = A framework for defining and tracking users, login sessions, and seats - pkgver = 395.af75e10 + pkgver = r711.f420678 pkgrel = 1 - epoch = 1 - url = http://www.freedesktop.org/wiki/Software/ConsoleKit + url = https://github.com/ConsoleKit2/ConsoleKit2 arch = i686 arch = x86_64 license = GPL makedepends = git - makedepends = pkgconfig + makedepends = python makedepends = xmlto makedepends = docbook-xsl - depends = polkit - depends = zlib + depends = dbus + depends = glib2 depends = libx11 - depends = dbus-glib + depends = polkit-consolekit + depends = udev + depends = zlib + optdepends = consolekit-openrc: consolekit openrc initscript + optdepends = pm-utils: suspend/hibernate support provides = consolekit + provides = consolekit2 conflicts = consolekit replaces = consolekit - options = !libtool - source = git+git://anongit.freedesktop.org/ConsoleKit - source = pam-foreground-compat.ck - source = consolekit.logrotate + options = libtool + source = git://github.com/ConsoleKit2/ConsoleKit2 + source = 25-consolekit.rules + source = consolekit.pamd source = consolekit.tmpfiles.conf - md5sums = SKIP - md5sums = a8a4de71d9b0549b8143e5f6c2a36fc7 - md5sums = 6fefa451d9fe2fc6d6269629d3529793 - md5sums = 8c5a8059db515d40fae1379daf084094 + validpgpkeys = 6DD4217456569BA711566AC7F06E8FDE7B45DAAC + sha256sums = SKIP + sha256sums = c5159d9fe8fdd52ad0d6a84af7ba00bac09edaae965896ab0d099a4df1c5ea6b + sha256sums = f7b88e87f447e2d37c12886f57d932c385f19a8fef238e0f1de7a1746d8be69e + sha256sums = 778552dc12b3c235bde200e476d4262da0c135f3f6f8b3e975a87881d1f154d1 pkgname = consolekit-git diff --git a/25-consolekit.rules b/25-consolekit.rules new file mode 100644 index 000000000000..adddfb1bd791 --- /dev/null +++ b/25-consolekit.rules @@ -0,0 +1,8 @@ +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; + } +}); @@ -1,59 +1,75 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Previous maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: onestep_ua <onestep@ukr.net> - +_pkgname=ConsoleKit2 pkgname=consolekit-git -pkgver=395.af75e10 +pkgver=r711.f420678 pkgrel=1 -epoch=1 pkgdesc="A framework for defining and tracking users, login sessions, and seats" arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/ConsoleKit" +url="https://github.com/ConsoleKit2/ConsoleKit2" license=('GPL') -depends=('polkit' 'zlib' 'libx11' 'dbus-glib') -makedepends=('git' 'pkgconfig' 'xmlto' 'docbook-xsl') +provides=('consolekit' 'consolekit2') replaces=('consolekit') -provides=('consolekit') conflicts=('consolekit') -options=(!libtool) -source=(git+git://anongit.freedesktop.org/ConsoleKit \ - pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf) -md5sums=('SKIP' - 'a8a4de71d9b0549b8143e5f6c2a36fc7' - '6fefa451d9fe2fc6d6269629d3529793' - '8c5a8059db515d40fae1379daf084094') +depends=('dbus' 'glib2' 'libx11' 'polkit-consolekit' 'udev' 'zlib') +optdepends=('consolekit-openrc: consolekit openrc initscript' + 'pm-utils: suspend/hibernate support') +makedepends=('git' 'python' 'xmlto' 'docbook-xsl') +options=('libtool') +source=("git://github.com/ConsoleKit2/ConsoleKit2" + '25-consolekit.rules' + 'consolekit.pamd' + 'consolekit.tmpfiles.conf') +sha256sums=('SKIP' + 'c5159d9fe8fdd52ad0d6a84af7ba00bac09edaae965896ab0d099a4df1c5ea6b' + 'f7b88e87f447e2d37c12886f57d932c385f19a8fef238e0f1de7a1746d8be69e' + '778552dc12b3c235bde200e476d4262da0c135f3f6f8b3e975a87881d1f154d1') +validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal pkgver() { - cd "$srcdir/ConsoleKit" - echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) + cd $_pkgname + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +prepare(){ + cd $srcdir/$_pkgname + NOCONFIGURE=1 ./autogen.sh } -build() { - cd "$srcdir/ConsoleKit" - - ./autogen.sh --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/ConsoleKit \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --enable-pam-module \ - --with-pam-module-dir=/usr/lib/security \ - --enable-docbook-docs \ - --enable-udev-acl - make +build(){ + cd $srcdir/$_pkgname + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --with-rundir=/run \ + --libexecdir=/usr/lib/consolekit \ + --localstatedir=/var \ + --enable-polkit \ + --enable-pam-module \ + --enable-udev-acl \ + --enable-docbook-docs \ + --with-dbus-services=/usr/share/dbus-1/services \ + --with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \ + --with-pam-module-dir=/usr/lib/security \ + --without-systemdsystemunitdir \ + --disable-cgroups + + make } package() { - cd "$srcdir/ConsoleKit" - make DESTDIR="$pkgdir" install - install -m755 "$srcdir/pam-foreground-compat.ck" "$pkgdir/usr/lib/ConsoleKit/run-session.d/" + cd $srcdir/$_pkgname + make DESTDIR="$pkgdir" install - # install the logrotate config - install -D -m644 "$srcdir/consolekit.logrotate" "$pkgdir/etc/logrotate.d/consolekit" + rm -rf "${pkgdir}"/run + + install -dm 750 "${pkgdir}"/usr/share/polkit-1/rules.d + install -m 644 ${srcdir}/25-consolekit.rules $pkgdir/usr/share/polkit-1/rules.d/75-consolekit.rules - install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf" + install -dm755 $pkgdir/etc/pam.d/ + install -Dm644 ${srcdir}/consolekit.pamd $pkgdir/etc/pam.d/consolekit - rm -rf "$pkgdir/var/run" + install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf" } + +# vim: ts=4 sw=4 sts=4 et diff --git a/consolekit.logrotate b/consolekit.logrotate deleted file mode 100644 index 7c5346ef8399..000000000000 --- a/consolekit.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/ConsoleKit/history { - missingok - notifempty - delaycompress -} diff --git a/consolekit.pamd b/consolekit.pamd new file mode 100644 index 000000000000..7d8f614c4a42 --- /dev/null +++ b/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 diff --git a/pam-foreground-compat.ck b/pam-foreground-compat.ck deleted file mode 100644 index 7f6b122d5fca..000000000000 --- a/pam-foreground-compat.ck +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -TAGDIR=/var/run/console - -[ -n "$CK_SESSION_USER_UID" ] || exit 1 - -TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`" - -if [ "$1" = "session_added" ]; then - mkdir -p "$TAGDIR" - echo "$CK_SESSION_ID" >> "$TAGFILE" -fi - -if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then - sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE" - [ -s "$TAGFILE" ] || rm -f "$TAGFILE" -fi |