[arch-commits] Commit in lightdm/repos/community-i686 (19 files)

Maxime Gauduin alucryd at nymeria.archlinux.org
Mon Nov 4 22:44:59 UTC 2013


    Date: Monday, November 4, 2013 @ 23:44:59
  Author: alucryd
Revision: 100474

archrelease: copy trunk to community-i686

Added:
  lightdm/repos/community-i686/PKGBUILD
    (from rev 100473, lightdm/trunk/PKGBUILD)
  lightdm/repos/community-i686/Xsession
    (from rev 100473, lightdm/trunk/Xsession)
  lightdm/repos/community-i686/lightdm-autologin.pam
    (from rev 100473, lightdm/trunk/lightdm-autologin.pam)
  lightdm/repos/community-i686/lightdm-default-config.patch
    (from rev 100473, lightdm/trunk/lightdm-default-config.patch)
  lightdm/repos/community-i686/lightdm-xdg-session-class.patch
    (from rev 100473, lightdm/trunk/lightdm-xdg-session-class.patch)
  lightdm/repos/community-i686/lightdm.install
    (from rev 100473, lightdm/trunk/lightdm.install)
  lightdm/repos/community-i686/lightdm.pam
    (from rev 100473, lightdm/trunk/lightdm.pam)
  lightdm/repos/community-i686/lightdm.rules
    (from rev 100473, lightdm/trunk/lightdm.rules)
  lightdm/repos/community-i686/lightdm.service
    (from rev 100473, lightdm/trunk/lightdm.service)
  lightdm/repos/community-i686/lightdm.tmpfiles
    (from rev 100473, lightdm/trunk/lightdm.tmpfiles)
Deleted:
  lightdm/repos/community-i686/PKGBUILD
  lightdm/repos/community-i686/Xsession
  lightdm/repos/community-i686/lightdm-autologin.pam
  lightdm/repos/community-i686/lightdm-default-config.patch
  lightdm/repos/community-i686/lightdm.install
  lightdm/repos/community-i686/lightdm.pam
  lightdm/repos/community-i686/lightdm.rules
  lightdm/repos/community-i686/lightdm.service
  lightdm/repos/community-i686/lightdm.tmpfiles

---------------------------------+
 PKGBUILD                        |  243 +++++++++++++++++++-------------------
 Xsession                        |  146 +++++++++++-----------
 lightdm-autologin.pam           |   26 ++--
 lightdm-default-config.patch    |  116 +++++++++---------
 lightdm-xdg-session-class.patch |  130 ++++++++++++++++++++
 lightdm.install                 |   46 +++----
 lightdm.pam                     |   14 +-
 lightdm.rules                   |   30 ++--
 lightdm.service                 |   28 ++--
 lightdm.tmpfiles                |    2 
 10 files changed, 457 insertions(+), 324 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-04 22:44:31 UTC (rev 100473)
+++ PKGBUILD	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1,120 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-# Contributor: Morfeo <morfeo89 at hotmail.it>
-
-pkgbase=lightdm
-pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.8.1
-pkgrel=1
-epoch=1
-pkgdesc="A lightweight display manager"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/lightdm"
-license=('GPL3' 'LGPL3')
-makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base')
-source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
-        'lightdm.service'
-        'lightdm.tmpfiles'
-        'lightdm.pam'
-        'lightdm-autologin.pam'
-        'lightdm.rules'
-        'lightdm-default-config.patch'
-        'Xsession')
-sha256sums=('e749ea72ac2517f592a8dfcd8bbdf7aba6729cb75c569c03347751d87f99305a'
-            '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
-            'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
-            'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
-            '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
-            'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
-            '0b2f740616110887d5c8662e40f1a8350fc0dfa6c7e99f6e3a5636c6b0ca714f'
-            '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
-
-prepare() {
-  cd ${pkgbase}-${pkgver}
-
-  patch -Np1 -i ../lightdm-default-config.patch
-}
-
-build() {
-  cd ${pkgbase}-${pkgver}
-
-  export MOC4='moc-qt4'
-  export MOC5='moc-qt5'
-  ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests}
-   make
-}
-
-package_lightdm() {
-depends=('libxklavier' 'polkit' 'systemd')
-optdepends=('xorg-server-xephyr: LightDM test mode'
-            'accountsservice: limit visible accounts')
-backup=('etc/apparmor.d/lightdm-guest-session'
-        'etc/lightdm/keys.conf'
-        'etc/lightdm/lightdm.conf'
-        'etc/lightdm/users.conf'
-        'etc/lightdm/Xsession'
-        'etc/pam.d/lightdm'
-        'etc/pam.d/lightdm-autologin'
-        'etc/pam.d/lightdm-greeter')
-install="${pkgbase}.install"
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
-  install -m 755 ../Xsession "${pkgdir}"/etc/lightdm/Xsession
-  rm -rf "${pkgdir}"/etc/init
-  rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-2
-
-  install -dm 770 "${pkgdir}"/var/lib/lightdm
-  install -dm 711 "${pkgdir}"/var/log/lightdm
-  chmod +t "${pkgdir}"/var/lib/lightdm
-  echo 'GDK_CORE_DEVICE_EVENTS=true' > "${pkgdir}"/var/lib/lightdm/.pam_environment
-  chmod 644 "${pkgdir}"/var/lib/lightdm/.pam_environment
-  chown 620:620 -R "${pkgdir}"/var/{lib,log}/lightdm
-
-# PAM
-  install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
-  install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin
-
-# PolicyKit
-  install -dm 700 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d
-  install -m 644 ../lightdm.rules "${pkgdir}"/usr/share/polkit-1/rules.d/lightdm.rules
-
-# Systemd
-  install -dm 755 "${pkgdir}"/usr/lib/{systemd/system,tmpfiles.d}
-  install -m 644 ../lightdm.service "${pkgdir}"/usr/lib/systemd/system/lightdm.service
-  install -m 644 ../lightdm.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lightdm.conf
-}
-
-package_liblightdm-qt4() {
-pkgdesc=('LightDM Qt client library')
-depends=('lightdm' 'qt4')
-options+=('!emptydirs')
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" -C liblightdm-gobject install
-  make DESTDIR="${pkgdir}" -C liblightdm-qt install
-  make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
-  find "${pkgdir}" -type d -name *qt5* -exec rm -rf {} +
-  find "${pkgdir}" -type f  -name *qt5* -exec rm {} +
-  find "${pkgdir}" -type l  -name *qt5* -exec rm {} +
-}
-
-package_liblightdm-qt5() {
-pkgdesc=('LightDM Qt client library')
-depends=('lightdm' 'qt5-base')
-options+=('!emptydirs')
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" -C liblightdm-gobject install
-  make DESTDIR="${pkgdir}" -C liblightdm-qt install
-  make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
-  find "${pkgdir}" -type d -name *qt[!5]* -exec rm -rf {} +
-  find "${pkgdir}" -type f  -name *qt[!5]* -exec rm {} +
-  find "${pkgdir}" -type l  -name *qt[!5]* -exec rm {} +
-}
-
-# vim: ts=2 sw=2 et:

Copied: lightdm/repos/community-i686/PKGBUILD (from rev 100473, lightdm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Contributor: Morfeo <morfeo89 at hotmail.it>
+
+pkgbase=lightdm
+pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
+pkgver=1.8.1
+pkgrel=2
+epoch=1
+pkgdesc="A lightweight display manager"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/lightdm"
+license=('GPL3' 'LGPL3')
+makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base')
+source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
+        'lightdm.service'
+        'lightdm.tmpfiles'
+        'lightdm.pam'
+        'lightdm-autologin.pam'
+        'lightdm.rules'
+        'lightdm-default-config.patch'
+        'lightdm-xdg-session-class.patch'
+        'Xsession')
+sha256sums=('e749ea72ac2517f592a8dfcd8bbdf7aba6729cb75c569c03347751d87f99305a'
+            '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
+            'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
+            'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
+            '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
+            'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
+            '0b2f740616110887d5c8662e40f1a8350fc0dfa6c7e99f6e3a5636c6b0ca714f'
+            '1d991d60c8212c9c763c62ffea8401d69b0be39a4d006cccb8e06676d56e5a55'
+            '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+
+  patch -Np0 -i ../lightdm-xdg-session-class.patch
+  patch -Np1 -i ../lightdm-default-config.patch
+}
+
+build() {
+  cd ${pkgbase}-${pkgver}
+
+  export MOC4='moc-qt4'
+  export MOC5='moc-qt5'
+  ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests}
+   make
+}
+
+package_lightdm() {
+depends=('libxklavier' 'polkit' 'systemd')
+optdepends=('xorg-server-xephyr: LightDM test mode'
+            'accountsservice: limit visible accounts')
+backup=('etc/apparmor.d/lightdm-guest-session'
+        'etc/lightdm/keys.conf'
+        'etc/lightdm/lightdm.conf'
+        'etc/lightdm/users.conf'
+        'etc/lightdm/Xsession'
+        'etc/pam.d/lightdm'
+        'etc/pam.d/lightdm-autologin'
+        'etc/pam.d/lightdm-greeter')
+install="${pkgbase}.install"
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
+  install -m 755 ../Xsession "${pkgdir}"/etc/lightdm/Xsession
+  rm -rf "${pkgdir}"/etc/init
+  rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-*
+
+  install -dm 770 "${pkgdir}"/var/lib/lightdm
+  install -dm 711 "${pkgdir}"/var/log/lightdm
+  chmod +t "${pkgdir}"/var/lib/lightdm
+  echo 'GDK_CORE_DEVICE_EVENTS=true' > "${pkgdir}"/var/lib/lightdm/.pam_environment
+  chmod 644 "${pkgdir}"/var/lib/lightdm/.pam_environment
+  chown 620:620 -R "${pkgdir}"/var/{lib,log}/lightdm
+
+# PAM
+  install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
+  install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin
+
+# PolicyKit
+  install -dm 700 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d
+  install -m 644 ../lightdm.rules "${pkgdir}"/usr/share/polkit-1/rules.d/lightdm.rules
+
+# Systemd
+  install -dm 755 "${pkgdir}"/usr/lib/{systemd/system,tmpfiles.d}
+  install -m 644 ../lightdm.service "${pkgdir}"/usr/lib/systemd/system/lightdm.service
+  install -m 644 ../lightdm.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lightdm.conf
+}
+
+package_liblightdm-qt4() {
+pkgdesc=('LightDM Qt client library')
+depends=('lightdm' 'qt4')
+options+=('!emptydirs')
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" -C liblightdm-gobject install
+  make DESTDIR="${pkgdir}" -C liblightdm-qt install
+  make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
+  find "${pkgdir}" -type d -name *qt5* -exec rm -rf {} +
+  find "${pkgdir}" -type f  -name *qt5* -exec rm {} +
+  find "${pkgdir}" -type l  -name *qt5* -exec rm {} +
+}
+
+package_liblightdm-qt5() {
+pkgdesc=('LightDM Qt client library')
+depends=('lightdm' 'qt5-base')
+options+=('!emptydirs')
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" -C liblightdm-gobject install
+  make DESTDIR="${pkgdir}" -C liblightdm-qt install
+  make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
+  find "${pkgdir}" -type d -name *qt[!5]* -exec rm -rf {} +
+  find "${pkgdir}" -type f  -name *qt[!5]* -exec rm {} +
+  find "${pkgdir}" -type l  -name *qt[!5]* -exec rm {} +
+}
+
+# vim: ts=2 sw=2 et:

Deleted: Xsession
===================================================================
--- Xsession	2013-11-04 22:44:31 UTC (rev 100473)
+++ Xsession	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# LightDM wrapper to run around X sessions.
-
-echo "Running X session wrapper"
-
-# Load profile
-for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
-    if [ -f "$file" ]; then
-        echo "Loading profile from $file";
-        . "$file"
-    fi
-done
-
-# Load resources
-for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
-    if [ -f "$file" ]; then
-        echo "Loading resource: $file"
-        xrdb -nocpp -merge "$file"
-    fi
-done
-
-# Load keymaps
-for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
-    if [ -f "$file" ]; then
-        echo "Loading keymap: $file"
-        setxkbmap `cat "$file"`
-        XKB_IN_USE=yes
-    fi
-done
-
-# Load xmodmap if not using XKB
-if [ -z "$XKB_IN_USE" ]; then
-    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
-        if [ -f "$file" ]; then
-           echo "Loading modmap: $file"
-           xmodmap "$file"
-        fi
-    done
-fi
-
-unset XKB_IN_USE
-
-# Run all system xinitrc shell scripts.
-xinitdir="/etc/X11/xinit/xinitrc.d"
-if [ -d "$xinitdir" ]; then
-    for script in $xinitdir/*; do
-        echo "Loading xinit script $script"
-        if [ -x "$script" -a ! -d "$script" ]; then
-            . "$script"
-        fi
-    done
-fi
-
-# Load xsession scripts
-xsessionddir="/etc/X11/xsession.d"
-if [ -d "$xsessionddir" ]; then
-    for i in `ls $xsessionddir`; do
-        script="$xsessionddir/$i"
-        echo "Loading X session script $script"
-        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
-            . "$script"
-        fi
-    done
-fi
-if [ -x "$HOME/.xsession" -a -f "$HOME/.xsession" ]; then
-    echo "Loading user X session script"
-        . "$HOME/.xsession"
-fi
-
-echo "X session wrapper complete, running session $@"
-
-exec $@

Copied: lightdm/repos/community-i686/Xsession (from rev 100473, lightdm/trunk/Xsession)
===================================================================
--- Xsession	                        (rev 0)
+++ Xsession	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+    if [ -f "$file" ]; then
+        echo "Loading profile from $file";
+        . "$file"
+    fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+    if [ -f "$file" ]; then
+        echo "Loading resource: $file"
+        xrdb -nocpp -merge "$file"
+    fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+    if [ -f "$file" ]; then
+        echo "Loading keymap: $file"
+        setxkbmap `cat "$file"`
+        XKB_IN_USE=yes
+    fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+        if [ -f "$file" ]; then
+           echo "Loading modmap: $file"
+           xmodmap "$file"
+        fi
+    done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+    for script in $xinitdir/*; do
+        echo "Loading xinit script $script"
+        if [ -x "$script" -a ! -d "$script" ]; then
+            . "$script"
+        fi
+    done
+fi
+
+# Load xsession scripts
+xsessionddir="/etc/X11/xsession.d"
+if [ -d "$xsessionddir" ]; then
+    for i in `ls $xsessionddir`; do
+        script="$xsessionddir/$i"
+        echo "Loading X session script $script"
+        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+            . "$script"
+        fi
+    done
+fi
+if [ -x "$HOME/.xsession" -a -f "$HOME/.xsession" ]; then
+    echo "Loading user X session script"
+        . "$HOME/.xsession"
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@

Deleted: lightdm-autologin.pam
===================================================================
--- lightdm-autologin.pam	2013-11-04 22:44:31 UTC (rev 100473)
+++ lightdm-autologin.pam	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1,13 +0,0 @@
-#%PAM-1.0
-auth        required    pam_env.so
-auth        required    pam_tally.so file=/var/log/faillog onerr=succeed
-auth        required    pam_shells.so
-auth        required    pam_nologin.so
-auth        [success=1 default=ignore]  pam_succeed_if.so user ingroup autologin
-auth        required    pam_unix.so
-auth        required    pam_permit.so
--auth       optional    pam_gnome_keyring.so
-account     include     system-local-login
-password    include     system-local-login
-session     include     system-local-login
--session    optional    pam_gnome_keyring.so auto_start

Copied: lightdm/repos/community-i686/lightdm-autologin.pam (from rev 100473, lightdm/trunk/lightdm-autologin.pam)
===================================================================
--- lightdm-autologin.pam	                        (rev 0)
+++ lightdm-autologin.pam	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,13 @@
+#%PAM-1.0
+auth        required    pam_env.so
+auth        required    pam_tally.so file=/var/log/faillog onerr=succeed
+auth        required    pam_shells.so
+auth        required    pam_nologin.so
+auth        [success=1 default=ignore]  pam_succeed_if.so user ingroup autologin
+auth        required    pam_unix.so
+auth        required    pam_permit.so
+-auth       optional    pam_gnome_keyring.so
+account     include     system-local-login
+password    include     system-local-login
+session     include     system-local-login
+-session    optional    pam_gnome_keyring.so auto_start

Deleted: lightdm-default-config.patch
===================================================================
--- lightdm-default-config.patch	2013-11-04 22:44:31 UTC (rev 100473)
+++ lightdm-default-config.patch	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1,58 +0,0 @@
---- a/data/lightdm.conf	2013-09-02 17:17:41.167211771 +0200
-+++ b/data/lightdm.conf	2013-09-02 17:20:41.278613565 +0200
-@@ -18,14 +18,14 @@
- #
- [LightDM]
- #start-default-seat=true
--#greeter-user=lightdm
-+greeter-user=lightdm
- #minimum-display-number=0
--#minimum-vt=7
-+minimum-vt=1
- #lock-memory=true
- #user-authority-in-system-dir=false
- #guest-account-script=guest-account
--#log-directory=/var/log/lightdm
--#run-directory=/var/run/lightdm
-+log-directory=/var/log/lightdm
-+run-directory=/run/lightdm
- #cache-directory=/var/cache/lightdm
- #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
- #remote-sessions-directory=/usr/share/lightdm/remote-sessions
-@@ -81,7 +81,7 @@
- #xdmcp-key=
- #unity-compositor-command=unity-system-compositor
- #unity-compositor-timeout=60
--#greeter-session=example-gtk-gnome
-+greeter-session=lightdm-gtk-greeter
- #greeter-hide-users=false
- #greeter-allow-guest=true
- #greeter-show-manual-login=false
-@@ -89,7 +89,7 @@
- #user-session=default
- #allow-guest=true
- #guest-session=UNIMPLEMENTED
--#session-wrapper=lightdm-session
-+session-wrapper=/etc/lightdm/Xsession
- #greeter-wrapper=
- #display-setup-script=
- #greeter-setup-script=
-@@ -100,6 +100,7 @@
- #autologin-user-timeout=0
- #autologin-in-background=false
- #autologin-session=UNIMPLEMENTED
-+pam-service=lightdm-autologin
- #exit-on-failure=false
- 
- #
---- a/data/users.conf	2013-09-02 17:17:41.167211771 +0200
-+++ b/data/users.conf	2013-09-02 17:21:27.955545717 +0200
-@@ -9,6 +9,6 @@
- # hidden-shells = Shells that indicate a user cannot login
- #
- [UserAccounts]
--minimum-uid=500
-+minimum-uid=1000
- hidden-users=nobody nobody4 noaccess
--hidden-shells=/bin/false /usr/sbin/nologin
-+hidden-shells=/bin/false /sbin/nologin

Copied: lightdm/repos/community-i686/lightdm-default-config.patch (from rev 100473, lightdm/trunk/lightdm-default-config.patch)
===================================================================
--- lightdm-default-config.patch	                        (rev 0)
+++ lightdm-default-config.patch	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,58 @@
+--- a/data/lightdm.conf	2013-09-02 17:17:41.167211771 +0200
++++ b/data/lightdm.conf	2013-09-02 17:20:41.278613565 +0200
+@@ -18,14 +18,14 @@
+ #
+ [LightDM]
+ #start-default-seat=true
+-#greeter-user=lightdm
++greeter-user=lightdm
+ #minimum-display-number=0
+-#minimum-vt=7
++minimum-vt=1
+ #lock-memory=true
+ #user-authority-in-system-dir=false
+ #guest-account-script=guest-account
+-#log-directory=/var/log/lightdm
+-#run-directory=/var/run/lightdm
++log-directory=/var/log/lightdm
++run-directory=/run/lightdm
+ #cache-directory=/var/cache/lightdm
+ #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
+ #remote-sessions-directory=/usr/share/lightdm/remote-sessions
+@@ -81,7 +81,7 @@
+ #xdmcp-key=
+ #unity-compositor-command=unity-system-compositor
+ #unity-compositor-timeout=60
+-#greeter-session=example-gtk-gnome
++greeter-session=lightdm-gtk-greeter
+ #greeter-hide-users=false
+ #greeter-allow-guest=true
+ #greeter-show-manual-login=false
+@@ -89,7 +89,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/lightdm/Xsession
+ #greeter-wrapper=
+ #display-setup-script=
+ #greeter-setup-script=
+@@ -100,6 +100,7 @@
+ #autologin-user-timeout=0
+ #autologin-in-background=false
+ #autologin-session=UNIMPLEMENTED
++pam-service=lightdm-autologin
+ #exit-on-failure=false
+ 
+ #
+--- a/data/users.conf	2013-09-02 17:17:41.167211771 +0200
++++ b/data/users.conf	2013-09-02 17:21:27.955545717 +0200
+@@ -9,6 +9,6 @@
+ # hidden-shells = Shells that indicate a user cannot login
+ #
+ [UserAccounts]
+-minimum-uid=500
++minimum-uid=1000
+ hidden-users=nobody nobody4 noaccess
+-hidden-shells=/bin/false /usr/sbin/nologin
++hidden-shells=/bin/false /sbin/nologin

Copied: lightdm/repos/community-i686/lightdm-xdg-session-class.patch (from rev 100473, lightdm/trunk/lightdm-xdg-session-class.patch)
===================================================================
--- lightdm-xdg-session-class.patch	                        (rev 0)
+++ lightdm-xdg-session-class.patch	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,130 @@
+=== modified file 'src/seat.c'
+--- src/seat.c	2013-10-03 21:38:07 +0000
++++ src/seat.c	2013-10-21 22:55:16 +0000
+@@ -1075,6 +1075,7 @@
+     g_signal_connect (greeter_session, "stopped", G_CALLBACK (session_stopped_cb), seat);
+   
+     set_session_env (SESSION (greeter_session));
++    session_set_env (SESSION (greeter_session), "XDG_SESSION_CLASS", "greeter");
+ 
+     session_set_pam_service (SESSION (greeter_session), GREETER_SERVICE);
+     if (getuid () == 0)
+
+=== modified file 'src/session-child.c'
+--- src/session-child.c	2013-07-26 02:27:41 +0000
++++ src/session-child.c	2013-10-21 22:55:16 +0000
+@@ -213,7 +213,6 @@
+     gchar *authentication_result_string;
+     gchar *service;
+     gchar *username;
+-    gchar *class;
+     gchar *tty;
+     gchar *remote_host_name;
+     gchar *xdisplay;
+@@ -284,7 +283,7 @@
+     username = read_string ();
+     read_data (&do_authenticate, sizeof (do_authenticate));
+     read_data (&is_interactive, sizeof (is_interactive));
+-    class = read_string ();
++    read_string (); /* Used to be class, now we just use the environment variable */
+     tty = read_string ();
+     remote_host_name = read_string ();
+     xdisplay = read_string ();
+@@ -480,7 +479,7 @@
+         g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))"));
+         g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)"));
+         g_variant_builder_add (&ck_parameters, "(sv)", "unix-user", g_variant_new_int32 (user_get_uid (user)));
+-        if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) == 0)
++        if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") == 0)
+             g_variant_builder_add (&ck_parameters, "(sv)", "session-type", g_variant_new_string ("LoginWindow"));
+         if (xdisplay)
+         {
+@@ -601,7 +600,7 @@
+     if (child_pid > 0)
+     {
+         /* Log to utmp */
+-        if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0)
++        if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
+         {
+             struct utmpx ut;
+             struct timeval tv;
+@@ -632,7 +631,7 @@
+         child_pid = 0;
+ 
+         /* Log to utmp */
+-        if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0)
++        if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
+         {
+             struct utmpx ut;
+             struct timeval tv;
+
+=== modified file 'src/session.c'
+--- src/session.c	2013-09-19 14:53:48 +0000
++++ src/session.c	2013-10-21 22:43:11 +0000
+@@ -84,9 +84,6 @@
+     /* File to log to */
+     gchar *log_filename;
+ 
+-    /* Seat class */
+-    gchar *class;
+-
+     /* tty this session is running on */
+     gchar *tty;
+ 
+@@ -200,14 +197,6 @@
+ }
+ 
+ void
+-session_set_class (Session *session, const gchar *class)
+-{
+-    g_return_if_fail (session != NULL);
+-    g_free (session->priv->class);
+-    session->priv->class = g_strdup (class);
+-}
+-
+-void
+ session_set_display_server (Session *session, DisplayServer *display_server)
+ {
+     g_return_if_fail (session != NULL);
+@@ -615,7 +604,7 @@
+     write_string (session, session->priv->username);
+     write_data (session, &session->priv->do_authenticate, sizeof (session->priv->do_authenticate));
+     write_data (session, &session->priv->is_interactive, sizeof (session->priv->is_interactive));
+-    write_string (session, session->priv->class);
++    write_string (session, NULL); /* Used to be class, now we just use the environment variable */
+     write_string (session, session->priv->tty);
+     write_string (session, session->priv->remote_host_name);
+     write_string (session, session->priv->xdisplay);
+@@ -874,7 +863,6 @@
+     g_free (self->priv->messages);
+     g_free (self->priv->authentication_result_string);
+     g_free (self->priv->log_filename);
+-    g_free (self->priv->class);
+     g_free (self->priv->tty);
+     g_free (self->priv->xdisplay);
+     if (self->priv->x_authority)
+
+=== modified file 'src/session.h'
+--- src/session.h	2013-08-14 20:14:16 +0000
++++ src/session.h	2013-10-21 22:55:16 +0000
+@@ -57,10 +57,6 @@
+     SESSION_TYPE_REMOTE
+ } SessionType;
+ 
+-#define XDG_SESSION_CLASS_USER        "user"
+-#define XDG_SESSION_CLASS_GREETER     "greeter"
+-#define XDG_SESSION_CLASS_LOCK_SCREEN "lock-screen"
+-
+ GType session_get_type (void);
+ 
+ Session *session_new (void);
+@@ -83,8 +79,6 @@
+ 
+ void session_set_log_file (Session *session, const gchar *filename);
+ 
+-void session_set_class (Session *session, const gchar *class);
+-
+ void session_set_display_server (Session *session, DisplayServer *display_server);
+ 
+ DisplayServer *session_get_display_server (Session *session);
+

Deleted: lightdm.install
===================================================================
--- lightdm.install	2013-11-04 22:44:31 UTC (rev 100473)
+++ lightdm.install	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1,23 +0,0 @@
-post_install() {
-    getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
-    getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
-    passwd -l lightdm > /dev/null
-    systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
-}
-
-post_upgrade() {
-    post_install
-    if [[ $(vercmp $2 1:1.6.1-1) == -1 ]]; then
-      cat << EOF
-The file /etc/lightdm/xsession has been renamed to /etc/lightdm/Xsession.
-Please update your lightdm.conf with the new path.
-EOF
-    fi
-}
-
-post_remove() {
-    getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
-    getent group lightdm > /dev/null 2>&1 && groupdel lightdm
-}
-
-# vim: ts=2 sw=2 et:

Copied: lightdm/repos/community-i686/lightdm.install (from rev 100473, lightdm/trunk/lightdm.install)
===================================================================
--- lightdm.install	                        (rev 0)
+++ lightdm.install	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,23 @@
+post_install() {
+    getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
+    getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
+    passwd -l lightdm > /dev/null
+    systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
+}
+
+post_upgrade() {
+    post_install
+    if [[ $(vercmp $2 1:1.6.1-1) == -1 ]]; then
+      cat << EOF
+The file /etc/lightdm/xsession has been renamed to /etc/lightdm/Xsession.
+Please update your lightdm.conf with the new path.
+EOF
+    fi
+}
+
+post_remove() {
+    getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
+    getent group lightdm > /dev/null 2>&1 && groupdel lightdm
+}
+
+# vim: ts=2 sw=2 et:

Deleted: lightdm.pam
===================================================================
--- lightdm.pam	2013-11-04 22:44:31 UTC (rev 100473)
+++ lightdm.pam	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth        include     system-login
--auth       optional    pam_gnome_keyring.so
-account     include     system-login
-password    include     system-login
-session     include     system-login
--session    optional    pam_gnome_keyring.so auto_start

Copied: lightdm/repos/community-i686/lightdm.pam (from rev 100473, lightdm/trunk/lightdm.pam)
===================================================================
--- lightdm.pam	                        (rev 0)
+++ lightdm.pam	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth        include     system-login
+-auth       optional    pam_gnome_keyring.so
+account     include     system-login
+password    include     system-login
+session     include     system-login
+-session    optional    pam_gnome_keyring.so auto_start

Deleted: lightdm.rules
===================================================================
--- lightdm.rules	2013-11-04 22:44:31 UTC (rev 100473)
+++ lightdm.rules	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1,15 +0,0 @@
-polkit.addRule(function(action, subject) {
-    if (subject.user == "lightdm") {
-        polkit.log("action=" + action);
-        polkit.log("subject=" + subject);
-        if (action.id.indexOf("org.freedesktop.login1.") == 0) {
-            return polkit.Result.YES;
-        }
-        if (action.id.indexOf("org.freedesktop.consolekit.system.") == 0) {
-            return polkit.Result.YES;
-        }
-        if (action.id.indexOf("org.freedesktop.upower.") == 0) {
-            return polkit.Result.YES;
-        }
-    }
-});

Copied: lightdm/repos/community-i686/lightdm.rules (from rev 100473, lightdm/trunk/lightdm.rules)
===================================================================
--- lightdm.rules	                        (rev 0)
+++ lightdm.rules	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,15 @@
+polkit.addRule(function(action, subject) {
+    if (subject.user == "lightdm") {
+        polkit.log("action=" + action);
+        polkit.log("subject=" + subject);
+        if (action.id.indexOf("org.freedesktop.login1.") == 0) {
+            return polkit.Result.YES;
+        }
+        if (action.id.indexOf("org.freedesktop.consolekit.system.") == 0) {
+            return polkit.Result.YES;
+        }
+        if (action.id.indexOf("org.freedesktop.upower.") == 0) {
+            return polkit.Result.YES;
+        }
+    }
+});

Deleted: lightdm.service
===================================================================
--- lightdm.service	2013-11-04 22:44:31 UTC (rev 100473)
+++ lightdm.service	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Light Display Manager
-Documentation=man:lightdm(1)
-Conflicts=getty at tty1.service
-After=systemd-user-sessions.service getty at tty1.service plymouth-quit.service
-
-[Service]
-ExecStart=/usr/bin/lightdm
-Restart=always
-IgnoreSIGPIPE=no
-BusName=org.freedesktop.DisplayManager
-
-[Install]
-Alias=display-manager.service

Copied: lightdm/repos/community-i686/lightdm.service (from rev 100473, lightdm/trunk/lightdm.service)
===================================================================
--- lightdm.service	                        (rev 0)
+++ lightdm.service	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Light Display Manager
+Documentation=man:lightdm(1)
+Conflicts=getty at tty1.service
+After=systemd-user-sessions.service getty at tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/bin/lightdm
+Restart=always
+IgnoreSIGPIPE=no
+BusName=org.freedesktop.DisplayManager
+
+[Install]
+Alias=display-manager.service

Deleted: lightdm.tmpfiles
===================================================================
--- lightdm.tmpfiles	2013-11-04 22:44:31 UTC (rev 100473)
+++ lightdm.tmpfiles	2013-11-04 22:44:59 UTC (rev 100474)
@@ -1 +0,0 @@
-d /run/lightdm 0711 lightdm lightdm

Copied: lightdm/repos/community-i686/lightdm.tmpfiles (from rev 100473, lightdm/trunk/lightdm.tmpfiles)
===================================================================
--- lightdm.tmpfiles	                        (rev 0)
+++ lightdm.tmpfiles	2013-11-04 22:44:59 UTC (rev 100474)
@@ -0,0 +1 @@
+d /run/lightdm 0711 lightdm lightdm




More information about the arch-commits mailing list