diff --git a/common/shlibs b/common/shlibs index 12a5ab93128..69241b1710c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -707,7 +707,7 @@ libgdk-3.so.0 gtk+3-3.0.0_1 libgtk-3.so.0 gtk+3-3.0.0_1 libgailutil-3.so.0 gtk+3-3.0.0_1 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1 -liblightdm-qt-2.so.0 liblightdm-qt-1.2.2_1 +liblightdm-qt-3.so.0 liblightdm-qt-1.10.1_1 libcelt051.so.0 celt051-0.5.1.3_1 libcelt0.so.2 celt-0.11.1_1 libspice-server.so.1 spice-0.6.4_1 diff --git a/srcpkgs/lightdm/files/lightdm-autologin.pam b/srcpkgs/lightdm/files/lightdm-autologin.pam deleted file mode 100644 index b95b66d1a22..00000000000 --- a/srcpkgs/lightdm/files/lightdm-autologin.pam +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_permit.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so -session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/srcpkgs/lightdm/files/lightdm.pam b/srcpkgs/lightdm/files/lightdm.pam deleted file mode 100644 index 9ccf0d8d1b2..00000000000 --- a/srcpkgs/lightdm/files/lightdm.pam +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so --auth optional pam_gnome_keyring.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -password required pam_unix.so -session optional pam_loginuid.so -session optional pam_systemd.so --session optional pam_gnome_keyring.so auto_start diff --git a/srcpkgs/lightdm/patches/lightdm-default-config.patch b/srcpkgs/lightdm/patches/lightdm-default-config.patch index 2ab8233f038..f72f16c9e6a 100644 --- a/srcpkgs/lightdm/patches/lightdm-default-config.patch +++ b/srcpkgs/lightdm/patches/lightdm-default-config.patch @@ -1,52 +1,39 @@ ---- data/lightdm.conf 2013-09-02 17:17:41.167211771 +0200 -+++ data/lightdm.conf 2013-09-02 17:20:41.278613565 +0200 -@@ -18,14 +18,14 @@ - # - [LightDM] +--- data/lightdm.conf 2014-03-12 20:56:34.000000000 +0100 ++++ data/lightdm.conf 2014-03-14 15:48:32.089948842 +0100 +@@ -19,12 +19,12 @@ #start-default-seat=true --#greeter-user=lightdm -+greeter-user=lightdm + #greeter-user=lightdm #minimum-display-number=0 -#minimum-vt=7 -+minimum-vt=1 ++#minimum-vt=1 #lock-memory=true #user-authority-in-system-dir=false #guest-account-script=guest-account --#log-directory=/var/log/lightdm + #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 @@ +@@ -93,7 +93,7 @@ #user-session=default #allow-guest=true - #guest-session=UNIMPLEMENTED + #guest-session= -#session-wrapper=lightdm-session +session-wrapper=/etc/lightdm/Xsession #greeter-wrapper= + #guest-wrapper= #display-setup-script= - #greeter-setup-script= -@@ -100,6 +100,7 @@ - #autologin-user-timeout=0 +@@ -107,6 +107,7 @@ #autologin-in-background=false #autologin-session=UNIMPLEMENTED -+pam-service=lightdm-autologin #exit-on-failure=false - ++pam-service=lightdm-autologin + # ---- data/users.conf 2013-09-02 17:17:41.167211771 +0200 -+++ data/users.conf 2013-09-02 17:21:27.955545717 +0200 + # Seat configuration +--- data/users.conf 2013-09-02 17:17:41.167211771 +0200 ++++ data/users.conf 2013-09-02 17:21:27.955545717 +0200 @@ -9,6 +9,6 @@ # hidden-shells = Shells that indicate a user cannot login # diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index abf3a1f0c67..45ad058f06c 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm -version=1.8.8 -revision=2 +version=1.10.1 +revision=1 build_style=gnu-configure configure_args="--with-greeter-session=lightdm-gtk-greeter --with-greeter-user=lightdm --disable-static --disable-tests" @@ -10,12 +10,12 @@ maintainer="Juan RP " license="GPL-3, LGPL-3" homepage="https://launchpad.net/lightdm" distfiles="https://launchpad.net/lightdm/${version%.*}/$version/+download/$pkgname-$version.tar.xz" -checksum=b366c7580574766f40d5b24dbaaecdc5e332be6df44bd4b3df0c04a729b493ba +checksum=737123001a7ae2ab126c75f61dcebb767d082ec043c012285eab6fa6b0d6a58f -hostmakedepends="pkg-config intltool itstool gobject-introspection which" +hostmakedepends="pkg-config intltool itstool gobject-introspection" makedepends="dbus-glib-devel libxklavier-devel libxml2-devel qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel - libgcrypt-devel gnome-icon-theme dbus accountsservice-devel" + libgcrypt-devel accountsservice-devel" depends="gnome-icon-theme dbus accountsservice" conf_files=" /etc/lightdm/keys.conf @@ -25,19 +25,24 @@ conf_files=" /etc/pam.d/lightdm-greeter /etc/pam.d/lightdm-autologin" system_accounts="lightdm" -lightdm_homedir="/var/cache/lightdm" +lightdm_homedir="/var/lib/lightdm" systemd_services="lightdm.service off" -make_dirs="/var/cache/lightdm 0755 lightdm lightdm" +make_dirs=" + /var/lib/lightdm 0755 lightdm lightdm + /var/lib/lightdm-data 0755 lightdm lightdm" post_install() { # Remove provided init file and use our own. rm -rf ${DESTDIR}/etc/init vinstall ${FILESDIR}/lightdm.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/lightdm.tmpfiles 644 usr/lib/tmpfiles.d lightdm.conf - vinstall ${FILESDIR}/lightdm.pam 644 etc/pam.d lightdm - vinstall ${FILESDIR}/lightdm-autologin.pam 644 etc/pam.d lightdm-autologin vinstall ${FILESDIR}/lightdm.rules 644 usr/share/polkit-1/rules.d vinstall ${FILESDIR}/xsession 755 etc/lightdm Xsession + # make pam_systemd optional + for f in ${DESTDIR}/etc/pam.d/*; do + sed 's|\(.*pam_systemd.*\)|-\1|' -i $f + echo "-session optional pam_ck_connector.so" >> $f + done } liblightdm-gobject_package() {