diff options
| -rw-r--r-- | .SRCINFO | 35 | ||||
| -rw-r--r-- | PKGBUILD | 179 | ||||
| -rw-r--r-- | Xsession | 23 | ||||
| -rw-r--r-- | lightdm-default-config.patch | 24 | ||||
| -rw-r--r-- | lightdm.service | 2 | ||||
| -rw-r--r-- | lightdm.sysusers | 1 | ||||
| -rw-r--r-- | lightdm.tmpfiles | 6 |
7 files changed, 147 insertions, 123 deletions
@@ -1,15 +1,14 @@ pkgbase = lightdm-devel pkgdesc = A lightweight display manager - pkgver = 1.24.0 + pkgver = 1.30.0 pkgrel = 1 - url = https://launchpad.net/lightdm + url = https://www.freedesktop.org/wiki/Software/LightDM/ arch = i686 arch = x86_64 license = GPL3 license = LGPL3 - makedepends = gcc-libs makedepends = glib2 - makedepends = glibc + makedepends = git makedepends = gobject-introspection makedepends = gtk-doc makedepends = intltool @@ -24,27 +23,28 @@ pkgbase = lightdm-devel makedepends = qt4 makedepends = qt5-base makedepends = vala - source = https://launchpad.net/lightdm/1.24/1.24.0/+download/lightdm-1.24.0.tar.xz + makedepends = yelp-tools + source = git+https://github.com/CanonicalLtd/lightdm.git#tag=1.30.0 source = lightdm.service + source = lightdm.sysusers source = lightdm.tmpfiles source = lightdm.pam source = lightdm-autologin.pam source = lightdm.rules source = lightdm-default-config.patch source = Xsession - sha256sums = cd509b74382bcf382c6e3e4b54ac30ba804022fec968d6993d134552ea1a43a2 - sha256sums = 0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a - sha256sums = b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f + sha256sums = SKIP + sha256sums = 0db37a14521be729411a767f157fbd07adb738b14006277def53a1efe4dacfb8 + sha256sums = fd93291bfc9985f0a1bb288472866aa0a9bcd259e024c3a29d20ca158bc08403 + sha256sums = cd69f928a1a5b30a30ba916e1b64c9f3657597cb28f3f0e220494d6e5e4bf587 sha256sums = e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0 sha256sums = 33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a sha256sums = a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6 - sha256sums = ed3dca57ef19d32499b72668bc78eaff0d9e772718b76f3816c5ee5f816b1891 - sha256sums = 7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4 + sha256sums = 782a52dc39a7d6f2c6ee31e66897e3502fc14864e3e4ede8e3d1a0da74b8dfdf + sha256sums = d30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5 pkgname = lightdm-devel - install = lightdm.install depends = glib2 - depends = glibc depends = libgcrypt depends = libx11 depends = libxcb @@ -54,10 +54,7 @@ pkgname = lightdm-devel depends = polkit optdepends = accountsservice: Enhanced user accounts handling optdepends = lightdm-gtk-greeter: GTK greeter - optdepends = lightdm-kde-greeter: Qt greeter optdepends = xorg-server-xephyr: LightDM test mode - provides = lightdm - conflicts = lightdm backup = etc/apparmor.d/lightdm-guest-session backup = etc/lightdm/keys.conf backup = etc/lightdm/lightdm.conf @@ -69,21 +66,13 @@ pkgname = lightdm-devel pkgname = liblightdm-qt4-devel pkgdesc = LightDM Qt client library - depends = gcc-libs - depends = glibc depends = lightdm depends = qt4 - provides = liblightdm-qt4 - conflicts = liblightdm-qt4 options = !emptydirs pkgname = liblightdm-qt5-devel pkgdesc = LightDM Qt client library - depends = gcc-libs - depends = glibc depends = lightdm depends = qt5-base - provides = liblightdm-qt5 - conflicts = liblightdm-qt5 options = !emptydirs @@ -1,81 +1,120 @@ -# Maintainer: David Birks <david@tellus.space> +# Maintainer: ny-a <nyaarch64@gmail..com> +# Contributor: David Birks <david@tellus.space> # Contributor: Maxime Gauduin <alucryd@archlinux.org> # Contributor: padfoot <padfoot@exemail.com.au> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm-devel -pkgname=('lightdm-devel' 'liblightdm-qt4-devel' 'liblightdm-qt5-devel') -pkgver=1.24.0 +pkgname=( + lightdm-devel + liblightdm-qt4-devel + liblightdm-qt5-devel +) +pkgver=1.30.0 pkgrel=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=('cd509b74382bcf382c6e3e4b54ac30ba804022fec968d6993d134552ea1a43a2' - '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a' - 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' +arch=(i686 x86_64) +url=https://www.freedesktop.org/wiki/Software/LightDM/ +license=( + GPL3 + LGPL3 +) +makedepends=( + glib2 + git + gobject-introspection + gtk-doc + intltool + itstool + libgcrypt + libx11 + libxcb + libxdmcp + libxklavier + pam + polkit + qt4 + qt5-base + vala + yelp-tools +) +source=( + git+https://github.com/CanonicalLtd/lightdm.git#tag=${pkgver} + lightdm.service + lightdm.sysusers + lightdm.tmpfiles + lightdm.pam + lightdm-autologin.pam + lightdm.rules + lightdm-default-config.patch + Xsession +) +sha256sums=('SKIP' + '0db37a14521be729411a767f157fbd07adb738b14006277def53a1efe4dacfb8' + 'fd93291bfc9985f0a1bb288472866aa0a9bcd259e024c3a29d20ca158bc08403' + 'cd69f928a1a5b30a30ba916e1b64c9f3657597cb28f3f0e220494d6e5e4bf587' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' - 'ed3dca57ef19d32499b72668bc78eaff0d9e772718b76f3816c5ee5f816b1891' - '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') + '782a52dc39a7d6f2c6ee31e66897e3502fc14864e3e4ede8e3d1a0da74b8dfdf' + 'd30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5') prepare() { - cd lightdm-${pkgver} + cd lightdm patch -Np1 -i ../lightdm-default-config.patch + + NOCONFIGURE=1 ./autogen.sh } build() { - cd lightdm-${pkgver} + cd lightdm - export MOC4='moc-qt4' - export MOC5='moc-qt5' + 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' \ + --prefix=/usr \ + --libexecdir=/usr/lib/lightdm \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ --disable-static \ - --disable-tests + --disable-tests \ + --enable-gtk-doc \ + --with-greeter-user=lightdm \ + --with-greeter-session=lightdm-gtk-greeter make } package_lightdm-devel() { - 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') - provides=('lightdm') - conflicts=('lightdm') - 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} + depends=( + glib2 + libgcrypt + libx11 + libxcb + libxdmcp + libxklavier + pam + polkit + ) + optdepends=( + 'accountsservice: Enhanced user accounts handling' + 'lightdm-gtk-greeter: GTK 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 + ) + + cd lightdm make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall @@ -83,12 +122,9 @@ package_lightdm-devel() { 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 + # Dbus + mv "${pkgdir}"/{etc,usr/share}/dbus-1/system.d + rmdir "${pkgdir}"/etc/dbus-1 # PAM install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm @@ -99,19 +135,21 @@ package_lightdm-devel() { 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 -dm 755 "${pkgdir}"/usr/lib/{systemd/system,sysusers.d,tmpfiles.d} install -m 644 ../lightdm.service "${pkgdir}"/usr/lib/systemd/system/lightdm.service + install -m 644 ../lightdm.sysusers "${pkgdir}"/usr/lib/sysusers.d/lightdm.conf install -m 644 ../lightdm.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lightdm.conf } package_liblightdm-qt4-devel() { pkgdesc='LightDM Qt client library' - depends=('gcc-libs' 'glibc' 'lightdm' 'qt4') - provides=('liblightdm-qt4') - conflicts=('liblightdm-qt4') - options=('!emptydirs') + depends=( + lightdm + qt4 + ) + options=(!emptydirs) - cd lightdm-${pkgver} + cd lightdm make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install @@ -123,12 +161,13 @@ package_liblightdm-qt4-devel() { package_liblightdm-qt5-devel() { pkgdesc='LightDM Qt client library' - depends=('gcc-libs' 'glibc' 'lightdm' 'qt5-base') - provides=('liblightdm-qt5') - conflicts=('liblightdm-qt5') - options=('!emptydirs') + depends=( + lightdm + qt5-base + ) + options=(!emptydirs) - cd lightdm-${pkgver} + cd lightdm make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install @@ -16,7 +16,7 @@ done for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do if [ -f "$file" ]; then echo "Loading resource: $file" - xrdb -nocpp -merge "$file" + xrdb -merge "$file" fi done @@ -41,7 +41,7 @@ fi unset XKB_IN_USE -# Run all system xinitrc shell scripts. +# Run all system xinitrc shell scripts xinitdir="/etc/X11/xinit/xinitrc.d" if [ -d "$xinitdir" ]; then for script in $xinitdir/*; do @@ -52,20 +52,11 @@ if [ -d "$xinitdir" ]; then 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" +# 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 $@" diff --git a/lightdm-default-config.patch b/lightdm-default-config.patch index 32a8f8cd86f1..4fbd2e3d1bfc 100644 --- a/lightdm-default-config.patch +++ b/lightdm-default-config.patch @@ -1,12 +1,12 @@ -diff -rupN lightdm-1.11.9.orig/data/lightdm.conf lightdm-1.11.9/data/lightdm.conf ---- lightdm-1.11.9.orig/data/lightdm.conf 2014-09-14 12:55:09.591944064 +0200 -+++ lightdm-1.11.9/data/lightdm.conf 2014-09-14 12:58:13.396791044 +0200 -@@ -20,13 +20,13 @@ +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=1 ++#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 @@ -15,9 +15,9 @@ diff -rupN lightdm-1.11.9.orig/data/lightdm.conf lightdm-1.11.9/data/lightdm.con -#run-directory=/var/run/lightdm +run-directory=/run/lightdm #cache-directory=/var/cache/lightdm - #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions + #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions #remote-sessions-directory=/usr/share/lightdm/remote-sessions -@@ -101,7 +101,7 @@ +@@ -110,7 +110,7 @@ #allow-user-switching=true #allow-guest=true #guest-session= @@ -26,9 +26,9 @@ diff -rupN lightdm-1.11.9.orig/data/lightdm.conf lightdm-1.11.9/data/lightdm.con #greeter-wrapper= #guest-wrapper= #display-setup-script= -diff -rupN lightdm-1.11.9.orig/data/users.conf lightdm-1.11.9/data/users.conf ---- lightdm-1.11.9.orig/data/users.conf 2014-09-14 12:55:09.591944064 +0200 -+++ lightdm-1.11.9/data/users.conf 2014-09-14 12:59:21.426117548 +0200 +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 # @@ -36,5 +36,5 @@ diff -rupN lightdm-1.11.9.orig/data/users.conf lightdm-1.11.9/data/users.conf -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 +-hidden-shells=/bin/false /usr/sbin/nologin /sbin/nologin ++hidden-shells=/bin/false /usr/bin/nologin /bin/nologin diff --git a/lightdm.service b/lightdm.service index 9b22f034c5da..4a793031be3a 100644 --- a/lightdm.service +++ b/lightdm.service @@ -2,7 +2,7 @@ Description=Light Display Manager Documentation=man:lightdm(1) Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service +After=getty@tty1.service systemd-user-sessions.service plymouth-quit.service acpid.service [Service] ExecStart=/usr/bin/lightdm diff --git a/lightdm.sysusers b/lightdm.sysusers new file mode 100644 index 000000000000..134c3744ba75 --- /dev/null +++ b/lightdm.sysusers @@ -0,0 +1 @@ +u lightdm - "Light Display Manager" /var/lib/lightdm diff --git a/lightdm.tmpfiles b/lightdm.tmpfiles index d8ef132d3daa..55d222576908 100644 --- a/lightdm.tmpfiles +++ b/lightdm.tmpfiles @@ -1 +1,5 @@ -d /run/lightdm 0711 lightdm lightdm +d /run/lightdm 0711 lightdm lightdm - +d /var/cache/lightdm 0711 root lightdm - +d /var/lib/lightdm 1770 lightdm lightdm - +d /var/lib/lightdm-data 1770 lightdm lightdm - +d /var/log/lightdm 0711 root lightdm - |