Date: Saturday, August 20, 2016 @ 09:39:00 Author: alucryd Revision: 274070
archrelease: copy trunk to extra-i686, extra-x86_64 Added: lightdm/repos/extra-i686/PKGBUILD (from rev 274069, lightdm/trunk/PKGBUILD) lightdm/repos/extra-i686/Xsession (from rev 274069, lightdm/trunk/Xsession) lightdm/repos/extra-i686/lightdm-autologin.pam (from rev 274069, lightdm/trunk/lightdm-autologin.pam) lightdm/repos/extra-i686/lightdm-default-config.patch (from rev 274069, lightdm/trunk/lightdm-default-config.patch) lightdm/repos/extra-i686/lightdm.install (from rev 274069, lightdm/trunk/lightdm.install) lightdm/repos/extra-i686/lightdm.pam (from rev 274069, lightdm/trunk/lightdm.pam) lightdm/repos/extra-i686/lightdm.rules (from rev 274069, lightdm/trunk/lightdm.rules) lightdm/repos/extra-i686/lightdm.service (from rev 274069, lightdm/trunk/lightdm.service) lightdm/repos/extra-i686/lightdm.tmpfiles (from rev 274069, lightdm/trunk/lightdm.tmpfiles) lightdm/repos/extra-x86_64/PKGBUILD (from rev 274069, lightdm/trunk/PKGBUILD) lightdm/repos/extra-x86_64/Xsession (from rev 274069, lightdm/trunk/Xsession) lightdm/repos/extra-x86_64/lightdm-autologin.pam (from rev 274069, lightdm/trunk/lightdm-autologin.pam) lightdm/repos/extra-x86_64/lightdm-default-config.patch (from rev 274069, lightdm/trunk/lightdm-default-config.patch) lightdm/repos/extra-x86_64/lightdm.install (from rev 274069, lightdm/trunk/lightdm.install) lightdm/repos/extra-x86_64/lightdm.pam (from rev 274069, lightdm/trunk/lightdm.pam) lightdm/repos/extra-x86_64/lightdm.rules (from rev 274069, lightdm/trunk/lightdm.rules) lightdm/repos/extra-x86_64/lightdm.service (from rev 274069, lightdm/trunk/lightdm.service) lightdm/repos/extra-x86_64/lightdm.tmpfiles (from rev 274069, lightdm/trunk/lightdm.tmpfiles) Deleted: lightdm/repos/extra-i686/PKGBUILD lightdm/repos/extra-i686/Xsession lightdm/repos/extra-i686/lightdm-autologin.pam lightdm/repos/extra-i686/lightdm-default-config.patch lightdm/repos/extra-i686/lightdm.install lightdm/repos/extra-i686/lightdm.pam lightdm/repos/extra-i686/lightdm.rules lightdm/repos/extra-i686/lightdm.service lightdm/repos/extra-i686/lightdm.tmpfiles lightdm/repos/extra-x86_64/PKGBUILD lightdm/repos/extra-x86_64/Xsession lightdm/repos/extra-x86_64/lightdm-autologin.pam lightdm/repos/extra-x86_64/lightdm-default-config.patch lightdm/repos/extra-x86_64/lightdm.install lightdm/repos/extra-x86_64/lightdm.pam lightdm/repos/extra-x86_64/lightdm.rules lightdm/repos/extra-x86_64/lightdm.service lightdm/repos/extra-x86_64/lightdm.tmpfiles -------------------------------------------+ /PKGBUILD | 272 ++++++++++++++++++++++++++++ /Xsession | 128 +++++++++++++ /lightdm-autologin.pam | 26 ++ /lightdm-default-config.patch | 80 ++++++++ /lightdm.install | 24 ++ /lightdm.pam | 14 + /lightdm.rules | 30 +++ /lightdm.service | 28 ++ /lightdm.tmpfiles | 2 extra-i686/PKGBUILD | 136 -------------- extra-i686/Xsession | 64 ------ extra-i686/lightdm-autologin.pam | 13 - extra-i686/lightdm-default-config.patch | 40 ---- extra-i686/lightdm.install | 12 - extra-i686/lightdm.pam | 7 extra-i686/lightdm.rules | 15 - extra-i686/lightdm.service | 14 - extra-i686/lightdm.tmpfiles | 1 extra-x86_64/PKGBUILD | 136 -------------- extra-x86_64/Xsession | 64 ------ extra-x86_64/lightdm-autologin.pam | 13 - extra-x86_64/lightdm-default-config.patch | 40 ---- extra-x86_64/lightdm.install | 12 - extra-x86_64/lightdm.pam | 7 extra-x86_64/lightdm.rules | 15 - extra-x86_64/lightdm.service | 14 - extra-x86_64/lightdm.tmpfiles | 1 27 files changed, 604 insertions(+), 604 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/PKGBUILD 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,136 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Morfeo <morfe...@hotmail.it> - -pkgbase=lightdm -pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.18.2 -pkgrel=2 -epoch=1 -pkgdesc='A lightweight display manager' -arch=('i686' 'x86_64') -url='https://launchpad.net/lightdm' -license=('GPL3' 'LGPL3') -makedepends=('gcc-libs' 'glib2' 'glibc' 'gobject-introspection' 'gtk-doc' - 'intltool' 'itstool' 'libgcrypt' 'libx11' 'libxcb' 'libxdmcp' - 'libxklavier' 'pam' 'polkit' 'qt4' 'qt5-base' 'vala') -source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/lightdm-${pkgver}.tar.xz" - 'lightdm.service' - 'lightdm.tmpfiles' - 'lightdm.pam' - 'lightdm-autologin.pam' - 'lightdm.rules' - 'lightdm-default-config.patch' - 'Xsession') -sha256sums=('fd97dfc8af9c6e14c9919d1c13a4a8a68a046621ad5f404ca4e3c84895ab0e5c' - '0db37a14521be729411a767f157fbd07adb738b14006277def53a1efe4dacfb8' - 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' - 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' - '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' - 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' - 'cf8783a9c56b8460d557f14f4687346194eb72e6060e23d6c8d7a7e856b2d2a4' - 'd30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5') - -prepare() { - cd lightdm-${pkgver} - - patch -Np1 -i ../lightdm-default-config.patch -} - -build() { - cd lightdm-${pkgver} - - export MOC4='moc-qt4' - export MOC5='moc-qt5' - - ./configure \ - --prefix='/usr' \ - --libexecdir='/usr/lib/lightdm' \ - --localstatedir='/var' \ - --sbindir='/usr/bin' \ - --sysconfdir='/etc' \ - --with-greeter-user='lightdm' \ - --with-greeter-session='lightdm-gtk-greeter' \ - --disable-static \ - --disable-tests - make -} - -package_lightdm() { - depends=('glib2' 'glibc' 'libgcrypt' 'libx11' 'libxcb' 'libxdmcp' - 'libxklavier' 'pam' 'polkit') - optdepends=('accountsservice: Enhanced user accounts handling' - 'lightdm-gtk-greeter: GTK greeter' - 'lightdm-kde-greeter: Qt greeter' - 'xorg-server-xephyr: LightDM test mode') - 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='lightdm.install' - - cd lightdm-${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 755 "${pkgdir}"/var/cache/lightdm - install -dm 770 "${pkgdir}"/var/lib/lightdm{,-data} - install -dm 711 "${pkgdir}"/var/log/lightdm - chmod +t "${pkgdir}"/var/{cache/lightdm,lib/lightdm{,-data}} - chown 620:620 -R "${pkgdir}"/var/lib/lightdm{,-data} - chgrp 620 "${pkgdir}"/var/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 750 -g 102 "${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=('gcc-libs' 'glibc' 'lightdm' 'qt4') - depends=('lightdm' 'qt4') - options=('!emptydirs') - - cd lightdm-${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=('gcc-libs' 'glibc' 'lightdm' 'qt5-base') - options=('!emptydirs') - - cd lightdm-${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/extra-i686/PKGBUILD (from rev 274069, lightdm/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,136 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Morfeo <morfe...@hotmail.it> + +pkgbase=lightdm +pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') +pkgver=1.18.3 +pkgrel=1 +epoch=1 +pkgdesc='A lightweight display manager' +arch=('i686' 'x86_64') +url='https://launchpad.net/lightdm' +license=('GPL3' 'LGPL3') +makedepends=('gcc-libs' 'glib2' 'glibc' 'gobject-introspection' 'gtk-doc' + 'intltool' 'itstool' 'libgcrypt' 'libx11' 'libxcb' 'libxdmcp' + 'libxklavier' 'pam' 'polkit' 'qt4' 'qt5-base' 'vala') +source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/lightdm-${pkgver}.tar.xz" + 'lightdm.service' + 'lightdm.tmpfiles' + 'lightdm.pam' + 'lightdm-autologin.pam' + 'lightdm.rules' + 'lightdm-default-config.patch' + 'Xsession') +sha256sums=('d99215aeca38db2da84eede2ac3b9e875a746b3bc81bb3a30e0b8d89b87e1494' + '0db37a14521be729411a767f157fbd07adb738b14006277def53a1efe4dacfb8' + 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' + 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' + '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' + 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' + 'cf8783a9c56b8460d557f14f4687346194eb72e6060e23d6c8d7a7e856b2d2a4' + 'd30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5') + +prepare() { + cd lightdm-${pkgver} + + patch -Np1 -i ../lightdm-default-config.patch +} + +build() { + cd lightdm-${pkgver} + + export MOC4='moc-qt4' + export MOC5='moc-qt5' + + ./configure \ + --prefix='/usr' \ + --libexecdir='/usr/lib/lightdm' \ + --localstatedir='/var' \ + --sbindir='/usr/bin' \ + --sysconfdir='/etc' \ + --with-greeter-user='lightdm' \ + --with-greeter-session='lightdm-gtk-greeter' \ + --disable-static \ + --disable-tests + make +} + +package_lightdm() { + depends=('glib2' 'glibc' 'libgcrypt' 'libx11' 'libxcb' 'libxdmcp' + 'libxklavier' 'pam' 'polkit') + optdepends=('accountsservice: Enhanced user accounts handling' + 'lightdm-gtk-greeter: GTK greeter' + 'lightdm-kde-greeter: Qt greeter' + 'xorg-server-xephyr: LightDM test mode') + 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='lightdm.install' + + cd lightdm-${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 755 "${pkgdir}"/var/cache/lightdm + install -dm 770 "${pkgdir}"/var/lib/lightdm{,-data} + install -dm 711 "${pkgdir}"/var/log/lightdm + chmod +t "${pkgdir}"/var/{cache/lightdm,lib/lightdm{,-data}} + chown 620:620 -R "${pkgdir}"/var/lib/lightdm{,-data} + chgrp 620 "${pkgdir}"/var/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 750 -g 102 "${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=('gcc-libs' 'glibc' 'lightdm' 'qt4') + depends=('lightdm' 'qt4') + options=('!emptydirs') + + cd lightdm-${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=('gcc-libs' 'glibc' 'lightdm' 'qt5-base') + options=('!emptydirs') + + cd lightdm-${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: extra-i686/Xsession =================================================================== --- extra-i686/Xsession 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/Xsession 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,64 +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 -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 - -# Run user xsession shell script -script="$HOME/.xsession" -if [ -x "$script" -a ! -d "$script" ]; then - echo "Loading xsession script $script" - . "$script" -fi - -echo "X session wrapper complete, running session $@" - -exec $@ Copied: lightdm/repos/extra-i686/Xsession (from rev 274069, lightdm/trunk/Xsession) =================================================================== --- extra-i686/Xsession (rev 0) +++ extra-i686/Xsession 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,64 @@ +#!/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 -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 + +# Run user xsession shell script +script="$HOME/.xsession" +if [ -x "$script" -a ! -d "$script" ]; then + echo "Loading xsession script $script" + . "$script" +fi + +echo "X session wrapper complete, running session $@" + +exec $@ Deleted: extra-i686/lightdm-autologin.pam =================================================================== --- extra-i686/lightdm-autologin.pam 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/lightdm-autologin.pam 2016-08-20 09:39:00 UTC (rev 274070) @@ -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/extra-i686/lightdm-autologin.pam (from rev 274069, lightdm/trunk/lightdm-autologin.pam) =================================================================== --- extra-i686/lightdm-autologin.pam (rev 0) +++ extra-i686/lightdm-autologin.pam 2016-08-20 09:39:00 UTC (rev 274070) @@ -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: extra-i686/lightdm-default-config.patch =================================================================== --- extra-i686/lightdm-default-config.patch 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/lightdm-default-config.patch 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,40 +0,0 @@ -diff -rupN lightdm-1.16.7.orig/data/lightdm.conf lightdm-1.16.7/data/lightdm.conf ---- lightdm-1.16.7.orig/data/lightdm.conf 2016-02-07 10:44:47.229197400 +0100 -+++ lightdm-1.16.7/data/lightdm.conf 2016-02-07 10:47:36.011855600 +0100 -@@ -21,13 +21,13 @@ - #start-default-seat=true - #greeter-user=lightdm - #minimum-display-number=0 --#minimum-vt=7 -+#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799 - #lock-memory=true - #user-authority-in-system-dir=false - #guest-account-script=guest-account - #logind-check-graphical=false - #log-directory=/var/log/lightdm --#run-directory=/var/run/lightdm -+run-directory=/run/lightdm - #cache-directory=/var/cache/lightdm - #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions - #remote-sessions-directory=/usr/share/lightdm/remote-sessions -@@ -110,7 +110,7 @@ - #allow-user-switching=true - #allow-guest=true - #guest-session= --#session-wrapper=lightdm-session -+session-wrapper=/etc/lightdm/Xsession - #greeter-wrapper= - #guest-wrapper= - #display-setup-script= -diff -rupN lightdm-1.16.7.orig/data/users.conf lightdm-1.16.7/data/users.conf ---- lightdm-1.16.7.orig/data/users.conf 2016-02-07 10:44:47.224423000 +0100 -+++ lightdm-1.16.7/data/users.conf 2016-02-07 10:44:53.660216200 +0100 -@@ -9,6 +9,6 @@ - # hidden-shells = Shells that indicate a user cannot login - # - [UserList] --minimum-uid=500 -+minimum-uid=1000 - hidden-users=nobody nobody4 noaccess --hidden-shells=/bin/false /usr/sbin/nologin -+hidden-shells=/bin/false /usr/bin/nologin Copied: lightdm/repos/extra-i686/lightdm-default-config.patch (from rev 274069, lightdm/trunk/lightdm-default-config.patch) =================================================================== --- extra-i686/lightdm-default-config.patch (rev 0) +++ extra-i686/lightdm-default-config.patch 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,40 @@ +diff -rupN lightdm-1.16.7.orig/data/lightdm.conf lightdm-1.16.7/data/lightdm.conf +--- lightdm-1.16.7.orig/data/lightdm.conf 2016-02-07 10:44:47.229197400 +0100 ++++ lightdm-1.16.7/data/lightdm.conf 2016-02-07 10:47:36.011855600 +0100 +@@ -21,13 +21,13 @@ + #start-default-seat=true + #greeter-user=lightdm + #minimum-display-number=0 +-#minimum-vt=7 ++#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799 + #lock-memory=true + #user-authority-in-system-dir=false + #guest-account-script=guest-account + #logind-check-graphical=false + #log-directory=/var/log/lightdm +-#run-directory=/var/run/lightdm ++run-directory=/run/lightdm + #cache-directory=/var/cache/lightdm + #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions + #remote-sessions-directory=/usr/share/lightdm/remote-sessions +@@ -110,7 +110,7 @@ + #allow-user-switching=true + #allow-guest=true + #guest-session= +-#session-wrapper=lightdm-session ++session-wrapper=/etc/lightdm/Xsession + #greeter-wrapper= + #guest-wrapper= + #display-setup-script= +diff -rupN lightdm-1.16.7.orig/data/users.conf lightdm-1.16.7/data/users.conf +--- lightdm-1.16.7.orig/data/users.conf 2016-02-07 10:44:47.224423000 +0100 ++++ lightdm-1.16.7/data/users.conf 2016-02-07 10:44:53.660216200 +0100 +@@ -9,6 +9,6 @@ + # hidden-shells = Shells that indicate a user cannot login + # + [UserList] +-minimum-uid=500 ++minimum-uid=1000 + hidden-users=nobody nobody4 noaccess +-hidden-shells=/bin/false /usr/sbin/nologin ++hidden-shells=/bin/false /usr/bin/nologin Deleted: extra-i686/lightdm.install =================================================================== --- extra-i686/lightdm.install 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/lightdm.install 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,12 +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 /usr/bin/nologin lightdm - passwd -l lightdm > /dev/null - systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf -} - -post_upgrade() { - post_install -} - -# vim: ts=2 sw=2 et: Copied: lightdm/repos/extra-i686/lightdm.install (from rev 274069, lightdm/trunk/lightdm.install) =================================================================== --- extra-i686/lightdm.install (rev 0) +++ extra-i686/lightdm.install 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,12 @@ +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 /usr/bin/nologin lightdm + passwd -l lightdm > /dev/null + systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf +} + +post_upgrade() { + post_install +} + +# vim: ts=2 sw=2 et: Deleted: extra-i686/lightdm.pam =================================================================== --- extra-i686/lightdm.pam 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/lightdm.pam 2016-08-20 09:39:00 UTC (rev 274070) @@ -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/extra-i686/lightdm.pam (from rev 274069, lightdm/trunk/lightdm.pam) =================================================================== --- extra-i686/lightdm.pam (rev 0) +++ extra-i686/lightdm.pam 2016-08-20 09:39:00 UTC (rev 274070) @@ -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: extra-i686/lightdm.rules =================================================================== --- extra-i686/lightdm.rules 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/lightdm.rules 2016-08-20 09:39:00 UTC (rev 274070) @@ -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/extra-i686/lightdm.rules (from rev 274069, lightdm/trunk/lightdm.rules) =================================================================== --- extra-i686/lightdm.rules (rev 0) +++ extra-i686/lightdm.rules 2016-08-20 09:39:00 UTC (rev 274070) @@ -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: extra-i686/lightdm.service =================================================================== --- extra-i686/lightdm.service 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/lightdm.service 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,14 +0,0 @@ -[Unit] -Description=Light Display Manager -Documentation=man:lightdm(1) -Conflicts=getty@tty1.service -After=getty@tty1.service systemd-user-sessions.service plymouth-quit.service acpid.service - -[Service] -ExecStart=/usr/bin/lightdm -Restart=always -IgnoreSIGPIPE=no -BusName=org.freedesktop.DisplayManager - -[Install] -Alias=display-manager.service Copied: lightdm/repos/extra-i686/lightdm.service (from rev 274069, lightdm/trunk/lightdm.service) =================================================================== --- extra-i686/lightdm.service (rev 0) +++ extra-i686/lightdm.service 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,14 @@ +[Unit] +Description=Light Display Manager +Documentation=man:lightdm(1) +Conflicts=getty@tty1.service +After=getty@tty1.service systemd-user-sessions.service plymouth-quit.service acpid.service + +[Service] +ExecStart=/usr/bin/lightdm +Restart=always +IgnoreSIGPIPE=no +BusName=org.freedesktop.DisplayManager + +[Install] +Alias=display-manager.service Deleted: extra-i686/lightdm.tmpfiles =================================================================== --- extra-i686/lightdm.tmpfiles 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-i686/lightdm.tmpfiles 2016-08-20 09:39:00 UTC (rev 274070) @@ -1 +0,0 @@ -d /run/lightdm 0711 lightdm lightdm Copied: lightdm/repos/extra-i686/lightdm.tmpfiles (from rev 274069, lightdm/trunk/lightdm.tmpfiles) =================================================================== --- extra-i686/lightdm.tmpfiles (rev 0) +++ extra-i686/lightdm.tmpfiles 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1 @@ +d /run/lightdm 0711 lightdm lightdm Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/PKGBUILD 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,136 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Morfeo <morfe...@hotmail.it> - -pkgbase=lightdm -pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.18.2 -pkgrel=2 -epoch=1 -pkgdesc='A lightweight display manager' -arch=('i686' 'x86_64') -url='https://launchpad.net/lightdm' -license=('GPL3' 'LGPL3') -makedepends=('gcc-libs' 'glib2' 'glibc' 'gobject-introspection' 'gtk-doc' - 'intltool' 'itstool' 'libgcrypt' 'libx11' 'libxcb' 'libxdmcp' - 'libxklavier' 'pam' 'polkit' 'qt4' 'qt5-base' 'vala') -source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/lightdm-${pkgver}.tar.xz" - 'lightdm.service' - 'lightdm.tmpfiles' - 'lightdm.pam' - 'lightdm-autologin.pam' - 'lightdm.rules' - 'lightdm-default-config.patch' - 'Xsession') -sha256sums=('fd97dfc8af9c6e14c9919d1c13a4a8a68a046621ad5f404ca4e3c84895ab0e5c' - '0db37a14521be729411a767f157fbd07adb738b14006277def53a1efe4dacfb8' - 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' - 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' - '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' - 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' - 'cf8783a9c56b8460d557f14f4687346194eb72e6060e23d6c8d7a7e856b2d2a4' - 'd30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5') - -prepare() { - cd lightdm-${pkgver} - - patch -Np1 -i ../lightdm-default-config.patch -} - -build() { - cd lightdm-${pkgver} - - export MOC4='moc-qt4' - export MOC5='moc-qt5' - - ./configure \ - --prefix='/usr' \ - --libexecdir='/usr/lib/lightdm' \ - --localstatedir='/var' \ - --sbindir='/usr/bin' \ - --sysconfdir='/etc' \ - --with-greeter-user='lightdm' \ - --with-greeter-session='lightdm-gtk-greeter' \ - --disable-static \ - --disable-tests - make -} - -package_lightdm() { - depends=('glib2' 'glibc' 'libgcrypt' 'libx11' 'libxcb' 'libxdmcp' - 'libxklavier' 'pam' 'polkit') - optdepends=('accountsservice: Enhanced user accounts handling' - 'lightdm-gtk-greeter: GTK greeter' - 'lightdm-kde-greeter: Qt greeter' - 'xorg-server-xephyr: LightDM test mode') - 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='lightdm.install' - - cd lightdm-${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 755 "${pkgdir}"/var/cache/lightdm - install -dm 770 "${pkgdir}"/var/lib/lightdm{,-data} - install -dm 711 "${pkgdir}"/var/log/lightdm - chmod +t "${pkgdir}"/var/{cache/lightdm,lib/lightdm{,-data}} - chown 620:620 -R "${pkgdir}"/var/lib/lightdm{,-data} - chgrp 620 "${pkgdir}"/var/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 750 -g 102 "${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=('gcc-libs' 'glibc' 'lightdm' 'qt4') - depends=('lightdm' 'qt4') - options=('!emptydirs') - - cd lightdm-${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=('gcc-libs' 'glibc' 'lightdm' 'qt5-base') - options=('!emptydirs') - - cd lightdm-${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/extra-x86_64/PKGBUILD (from rev 274069, lightdm/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,136 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Morfeo <morfe...@hotmail.it> + +pkgbase=lightdm +pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') +pkgver=1.18.3 +pkgrel=1 +epoch=1 +pkgdesc='A lightweight display manager' +arch=('i686' 'x86_64') +url='https://launchpad.net/lightdm' +license=('GPL3' 'LGPL3') +makedepends=('gcc-libs' 'glib2' 'glibc' 'gobject-introspection' 'gtk-doc' + 'intltool' 'itstool' 'libgcrypt' 'libx11' 'libxcb' 'libxdmcp' + 'libxklavier' 'pam' 'polkit' 'qt4' 'qt5-base' 'vala') +source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/lightdm-${pkgver}.tar.xz" + 'lightdm.service' + 'lightdm.tmpfiles' + 'lightdm.pam' + 'lightdm-autologin.pam' + 'lightdm.rules' + 'lightdm-default-config.patch' + 'Xsession') +sha256sums=('d99215aeca38db2da84eede2ac3b9e875a746b3bc81bb3a30e0b8d89b87e1494' + '0db37a14521be729411a767f157fbd07adb738b14006277def53a1efe4dacfb8' + 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' + 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' + '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' + 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' + 'cf8783a9c56b8460d557f14f4687346194eb72e6060e23d6c8d7a7e856b2d2a4' + 'd30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5') + +prepare() { + cd lightdm-${pkgver} + + patch -Np1 -i ../lightdm-default-config.patch +} + +build() { + cd lightdm-${pkgver} + + export MOC4='moc-qt4' + export MOC5='moc-qt5' + + ./configure \ + --prefix='/usr' \ + --libexecdir='/usr/lib/lightdm' \ + --localstatedir='/var' \ + --sbindir='/usr/bin' \ + --sysconfdir='/etc' \ + --with-greeter-user='lightdm' \ + --with-greeter-session='lightdm-gtk-greeter' \ + --disable-static \ + --disable-tests + make +} + +package_lightdm() { + depends=('glib2' 'glibc' 'libgcrypt' 'libx11' 'libxcb' 'libxdmcp' + 'libxklavier' 'pam' 'polkit') + optdepends=('accountsservice: Enhanced user accounts handling' + 'lightdm-gtk-greeter: GTK greeter' + 'lightdm-kde-greeter: Qt greeter' + 'xorg-server-xephyr: LightDM test mode') + 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='lightdm.install' + + cd lightdm-${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 755 "${pkgdir}"/var/cache/lightdm + install -dm 770 "${pkgdir}"/var/lib/lightdm{,-data} + install -dm 711 "${pkgdir}"/var/log/lightdm + chmod +t "${pkgdir}"/var/{cache/lightdm,lib/lightdm{,-data}} + chown 620:620 -R "${pkgdir}"/var/lib/lightdm{,-data} + chgrp 620 "${pkgdir}"/var/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 750 -g 102 "${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=('gcc-libs' 'glibc' 'lightdm' 'qt4') + depends=('lightdm' 'qt4') + options=('!emptydirs') + + cd lightdm-${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=('gcc-libs' 'glibc' 'lightdm' 'qt5-base') + options=('!emptydirs') + + cd lightdm-${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: extra-x86_64/Xsession =================================================================== --- extra-x86_64/Xsession 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/Xsession 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,64 +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 -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 - -# Run user xsession shell script -script="$HOME/.xsession" -if [ -x "$script" -a ! -d "$script" ]; then - echo "Loading xsession script $script" - . "$script" -fi - -echo "X session wrapper complete, running session $@" - -exec $@ Copied: lightdm/repos/extra-x86_64/Xsession (from rev 274069, lightdm/trunk/Xsession) =================================================================== --- extra-x86_64/Xsession (rev 0) +++ extra-x86_64/Xsession 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,64 @@ +#!/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 -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 + +# Run user xsession shell script +script="$HOME/.xsession" +if [ -x "$script" -a ! -d "$script" ]; then + echo "Loading xsession script $script" + . "$script" +fi + +echo "X session wrapper complete, running session $@" + +exec $@ Deleted: extra-x86_64/lightdm-autologin.pam =================================================================== --- extra-x86_64/lightdm-autologin.pam 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/lightdm-autologin.pam 2016-08-20 09:39:00 UTC (rev 274070) @@ -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/extra-x86_64/lightdm-autologin.pam (from rev 274069, lightdm/trunk/lightdm-autologin.pam) =================================================================== --- extra-x86_64/lightdm-autologin.pam (rev 0) +++ extra-x86_64/lightdm-autologin.pam 2016-08-20 09:39:00 UTC (rev 274070) @@ -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: extra-x86_64/lightdm-default-config.patch =================================================================== --- extra-x86_64/lightdm-default-config.patch 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/lightdm-default-config.patch 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,40 +0,0 @@ -diff -rupN lightdm-1.16.7.orig/data/lightdm.conf lightdm-1.16.7/data/lightdm.conf ---- lightdm-1.16.7.orig/data/lightdm.conf 2016-02-07 10:44:47.229197400 +0100 -+++ lightdm-1.16.7/data/lightdm.conf 2016-02-07 10:47:36.011855600 +0100 -@@ -21,13 +21,13 @@ - #start-default-seat=true - #greeter-user=lightdm - #minimum-display-number=0 --#minimum-vt=7 -+#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799 - #lock-memory=true - #user-authority-in-system-dir=false - #guest-account-script=guest-account - #logind-check-graphical=false - #log-directory=/var/log/lightdm --#run-directory=/var/run/lightdm -+run-directory=/run/lightdm - #cache-directory=/var/cache/lightdm - #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions - #remote-sessions-directory=/usr/share/lightdm/remote-sessions -@@ -110,7 +110,7 @@ - #allow-user-switching=true - #allow-guest=true - #guest-session= --#session-wrapper=lightdm-session -+session-wrapper=/etc/lightdm/Xsession - #greeter-wrapper= - #guest-wrapper= - #display-setup-script= -diff -rupN lightdm-1.16.7.orig/data/users.conf lightdm-1.16.7/data/users.conf ---- lightdm-1.16.7.orig/data/users.conf 2016-02-07 10:44:47.224423000 +0100 -+++ lightdm-1.16.7/data/users.conf 2016-02-07 10:44:53.660216200 +0100 -@@ -9,6 +9,6 @@ - # hidden-shells = Shells that indicate a user cannot login - # - [UserList] --minimum-uid=500 -+minimum-uid=1000 - hidden-users=nobody nobody4 noaccess --hidden-shells=/bin/false /usr/sbin/nologin -+hidden-shells=/bin/false /usr/bin/nologin Copied: lightdm/repos/extra-x86_64/lightdm-default-config.patch (from rev 274069, lightdm/trunk/lightdm-default-config.patch) =================================================================== --- extra-x86_64/lightdm-default-config.patch (rev 0) +++ extra-x86_64/lightdm-default-config.patch 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,40 @@ +diff -rupN lightdm-1.16.7.orig/data/lightdm.conf lightdm-1.16.7/data/lightdm.conf +--- lightdm-1.16.7.orig/data/lightdm.conf 2016-02-07 10:44:47.229197400 +0100 ++++ lightdm-1.16.7/data/lightdm.conf 2016-02-07 10:47:36.011855600 +0100 +@@ -21,13 +21,13 @@ + #start-default-seat=true + #greeter-user=lightdm + #minimum-display-number=0 +-#minimum-vt=7 ++#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799 + #lock-memory=true + #user-authority-in-system-dir=false + #guest-account-script=guest-account + #logind-check-graphical=false + #log-directory=/var/log/lightdm +-#run-directory=/var/run/lightdm ++run-directory=/run/lightdm + #cache-directory=/var/cache/lightdm + #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions + #remote-sessions-directory=/usr/share/lightdm/remote-sessions +@@ -110,7 +110,7 @@ + #allow-user-switching=true + #allow-guest=true + #guest-session= +-#session-wrapper=lightdm-session ++session-wrapper=/etc/lightdm/Xsession + #greeter-wrapper= + #guest-wrapper= + #display-setup-script= +diff -rupN lightdm-1.16.7.orig/data/users.conf lightdm-1.16.7/data/users.conf +--- lightdm-1.16.7.orig/data/users.conf 2016-02-07 10:44:47.224423000 +0100 ++++ lightdm-1.16.7/data/users.conf 2016-02-07 10:44:53.660216200 +0100 +@@ -9,6 +9,6 @@ + # hidden-shells = Shells that indicate a user cannot login + # + [UserList] +-minimum-uid=500 ++minimum-uid=1000 + hidden-users=nobody nobody4 noaccess +-hidden-shells=/bin/false /usr/sbin/nologin ++hidden-shells=/bin/false /usr/bin/nologin Deleted: extra-x86_64/lightdm.install =================================================================== --- extra-x86_64/lightdm.install 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/lightdm.install 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,12 +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 /usr/bin/nologin lightdm - passwd -l lightdm > /dev/null - systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf -} - -post_upgrade() { - post_install -} - -# vim: ts=2 sw=2 et: Copied: lightdm/repos/extra-x86_64/lightdm.install (from rev 274069, lightdm/trunk/lightdm.install) =================================================================== --- extra-x86_64/lightdm.install (rev 0) +++ extra-x86_64/lightdm.install 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,12 @@ +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 /usr/bin/nologin lightdm + passwd -l lightdm > /dev/null + systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf +} + +post_upgrade() { + post_install +} + +# vim: ts=2 sw=2 et: Deleted: extra-x86_64/lightdm.pam =================================================================== --- extra-x86_64/lightdm.pam 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/lightdm.pam 2016-08-20 09:39:00 UTC (rev 274070) @@ -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/extra-x86_64/lightdm.pam (from rev 274069, lightdm/trunk/lightdm.pam) =================================================================== --- extra-x86_64/lightdm.pam (rev 0) +++ extra-x86_64/lightdm.pam 2016-08-20 09:39:00 UTC (rev 274070) @@ -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: extra-x86_64/lightdm.rules =================================================================== --- extra-x86_64/lightdm.rules 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/lightdm.rules 2016-08-20 09:39:00 UTC (rev 274070) @@ -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/extra-x86_64/lightdm.rules (from rev 274069, lightdm/trunk/lightdm.rules) =================================================================== --- extra-x86_64/lightdm.rules (rev 0) +++ extra-x86_64/lightdm.rules 2016-08-20 09:39:00 UTC (rev 274070) @@ -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: extra-x86_64/lightdm.service =================================================================== --- extra-x86_64/lightdm.service 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/lightdm.service 2016-08-20 09:39:00 UTC (rev 274070) @@ -1,14 +0,0 @@ -[Unit] -Description=Light Display Manager -Documentation=man:lightdm(1) -Conflicts=getty@tty1.service -After=getty@tty1.service systemd-user-sessions.service plymouth-quit.service acpid.service - -[Service] -ExecStart=/usr/bin/lightdm -Restart=always -IgnoreSIGPIPE=no -BusName=org.freedesktop.DisplayManager - -[Install] -Alias=display-manager.service Copied: lightdm/repos/extra-x86_64/lightdm.service (from rev 274069, lightdm/trunk/lightdm.service) =================================================================== --- extra-x86_64/lightdm.service (rev 0) +++ extra-x86_64/lightdm.service 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1,14 @@ +[Unit] +Description=Light Display Manager +Documentation=man:lightdm(1) +Conflicts=getty@tty1.service +After=getty@tty1.service systemd-user-sessions.service plymouth-quit.service acpid.service + +[Service] +ExecStart=/usr/bin/lightdm +Restart=always +IgnoreSIGPIPE=no +BusName=org.freedesktop.DisplayManager + +[Install] +Alias=display-manager.service Deleted: extra-x86_64/lightdm.tmpfiles =================================================================== --- extra-x86_64/lightdm.tmpfiles 2016-08-20 09:38:32 UTC (rev 274069) +++ extra-x86_64/lightdm.tmpfiles 2016-08-20 09:39:00 UTC (rev 274070) @@ -1 +0,0 @@ -d /run/lightdm 0711 lightdm lightdm Copied: lightdm/repos/extra-x86_64/lightdm.tmpfiles (from rev 274069, lightdm/trunk/lightdm.tmpfiles) =================================================================== --- extra-x86_64/lightdm.tmpfiles (rev 0) +++ extra-x86_64/lightdm.tmpfiles 2016-08-20 09:39:00 UTC (rev 274070) @@ -0,0 +1 @@ +d /run/lightdm 0711 lightdm lightdm