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

Maxime Gauduin alucryd at nymeria.archlinux.org
Mon Nov 4 22:54:18 UTC 2013


    Date: Monday, November 4, 2013 @ 23:54:18
  Author: alucryd
Revision: 100477

Fix weird error

Added:
  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                     |  123 +++++++++++++++++++++++++++++++++++++++++
 Xsession                     |   73 ++++++++++++++++++++++++
 lightdm-autologin.pam        |   13 ++++
 lightdm-default-config.patch |   58 +++++++++++++++++++
 lightdm.install              |   23 +++++++
 lightdm.pam                  |    7 ++
 lightdm.rules                |   15 +++++
 lightdm.service              |   14 ++++
 lightdm.tmpfiles             |    1 
 9 files changed, 327 insertions(+)

Added: PKGBUILD
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-11-04 22:54:18 UTC (rev 100477)
@@ -0,0 +1,123 @@
+# $Id: PKGBUILD 100476 2013-11-04 22:51:26Z alucryd $
+# 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=3
+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:


Property changes on: lightdm/repos/community-i686/PKGBUILD
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: Xsession
===================================================================
--- Xsession	                        (rev 0)
+++ Xsession	2013-11-04 22:54:18 UTC (rev 100477)
@@ -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 $@


Property changes on: lightdm/repos/community-i686/Xsession
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: lightdm-autologin.pam
===================================================================
--- lightdm-autologin.pam	                        (rev 0)
+++ lightdm-autologin.pam	2013-11-04 22:54:18 UTC (rev 100477)
@@ -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


Property changes on: lightdm/repos/community-i686/lightdm-autologin.pam
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: lightdm-default-config.patch
===================================================================
--- lightdm-default-config.patch	                        (rev 0)
+++ lightdm-default-config.patch	2013-11-04 22:54:18 UTC (rev 100477)
@@ -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


Property changes on: lightdm/repos/community-i686/lightdm-default-config.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: lightdm.install
===================================================================
--- lightdm.install	                        (rev 0)
+++ lightdm.install	2013-11-04 22:54:18 UTC (rev 100477)
@@ -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:


Property changes on: lightdm/repos/community-i686/lightdm.install
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: lightdm.pam
===================================================================
--- lightdm.pam	                        (rev 0)
+++ lightdm.pam	2013-11-04 22:54:18 UTC (rev 100477)
@@ -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


Property changes on: lightdm/repos/community-i686/lightdm.pam
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: lightdm.rules
===================================================================
--- lightdm.rules	                        (rev 0)
+++ lightdm.rules	2013-11-04 22:54:18 UTC (rev 100477)
@@ -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;
+        }
+    }
+});


Property changes on: lightdm/repos/community-i686/lightdm.rules
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: lightdm.service
===================================================================
--- lightdm.service	                        (rev 0)
+++ lightdm.service	2013-11-04 22:54:18 UTC (rev 100477)
@@ -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


Property changes on: lightdm/repos/community-i686/lightdm.service
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: lightdm.tmpfiles
===================================================================
--- lightdm.tmpfiles	                        (rev 0)
+++ lightdm.tmpfiles	2013-11-04 22:54:18 UTC (rev 100477)
@@ -0,0 +1 @@
+d /run/lightdm 0711 lightdm lightdm


Property changes on: lightdm/repos/community-i686/lightdm.tmpfiles
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property



More information about the arch-commits mailing list