[arch-commits] Commit in consolekit/repos (3 files)

[Jan de Groot]

    Date: Sunday, November 30, 2008 @ 11:49:07
  Author: jgc
Revision: 20123

Merged revisions 19095 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/consolekit/trunk

........
  r19095 | jgc | 2008-11-14 21:47:10 +0000 (Fri, 14 Nov 2008) | 2 lines
  
  upgpkg: consolekit 0.3.0-3
      Add pam_console/pam_foreground compatibility
........

Added:
  consolekit/repos/extra-x86_64/pam-foreground-compat.ck
    (from rev 19095, consolekit/trunk/pam-foreground-compat.ck)
Modified:
  consolekit/repos/extra-x86_64/	(properties)
  consolekit/repos/extra-x86_64/PKGBUILD

--------------------------+
 PKGBUILD                 |   10 ++++++----
 pam-foreground-compat.ck |   16 ++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)


Property changes on: consolekit/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /consolekit/trunk:1-14871
   + /consolekit/trunk:1-20122

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-30 16:48:05 UTC (rev 20122)
+++ extra-x86_64/PKGBUILD	2008-11-30 16:49:07 UTC (rev 20123)
@@ -4,16 +4,17 @@
 
 pkgname=consolekit
 pkgver=0.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 license=('GPL')
-depends=('dbus-glib>=0.76' 'glib2>=2.17.7' 'policykit>=0.9' 'zlib')
+depends=('dbus-glib>=0.76' 'glib2>=2.18.2' 'policykit>=0.9' 'zlib')
 makedepends=('pkgconfig')
 options=(!libtool)
-source=(http://people.freedesktop.org/~mccann/dist/ConsoleKit-${pkgver}.tar.bz2)
-md5sums=('43b02a52212330b54cfb34c4044d9ce0')
+source=(http://people.freedesktop.org/~mccann/dist/ConsoleKit-${pkgver}.tar.bz2
+	pam-foreground-compat.ck)
+md5sums=('43b02a52212330b54cfb34c4044d9ce0' 'a8a4de71d9b0549b8143e5f6c2a36fc7')
 
 build() {
   cd "${srcdir}/ConsoleKit-${pkgver}"
@@ -24,4 +25,5 @@
       --enable-pam-module || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -m755 "${srcdir}/pam-foreground-compat.ck" "${pkgdir}/usr/lib/ConsoleKit/run-session.d/" || return 1
 }

Copied: consolekit/repos/extra-x86_64/pam-foreground-compat.ck (from rev 19095, consolekit/trunk/pam-foreground-compat.ck)
===================================================================
--- extra-x86_64/pam-foreground-compat.ck	                        (rev 0)
+++ extra-x86_64/pam-foreground-compat.ck	2008-11-30 16:49:07 UTC (rev 20123)
@@ -0,0 +1,16 @@
+#!/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