Merge branch 'canonical:main' into announce/default-session

.github/workflows/test.yaml

@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - ubuntu:rolling
           - fedora:latest
 
     runs-on: ubuntu-latest

Makefile.am

@@ -14,3 +14,8 @@ EXTRA_DIST = \
 	COPYING.LGPL2 \
 	COPYING.LGPL3 \
 	NEWS
+
+DISTCLEANFILES = po/.intltool-merge-cache.lock
+
+lightdm-${VERSION}.tar.xz.asc: lightdm-${VERSION}.tar.xz
+	gpg --armor --detach-sig --sign $<

NEWS

@@ -1,3 +1,24 @@
+Overview of changes in lightdm 1.32.0
+
+   * Overwrite existing X authority files to avoid corruption
+   * Change logind-check-graphical default config value to true
+   * Block autologin if shell in nologin or false
+   * Fix failure if with greeters sending two login requests quickly.
+   * Drop Qt 4 support, it's been unsupported since 2015
+   * Fix lightdm_set_layout
+   * Improve method of determining a session is Wayland
+   * Don't call setenv with a NULL value - the behaviour is undefined
+   * Replace deprecated QAbstractItemModel::setRoleNames
+   * Move D-Bus conf file to $(datadir)/dbus-1/system.d
+   * Fix tests failing when compiled with --with-greeter-user
+   * Use Python 3 in tests
+   * Disable compiler optimizations for test programs
+   * Compilation fix for glibc 2.33
+   * Remove deprecated use of G_TYPE_INSTANCE_GET_PRIVATE, G_PARAM_PRIVATE
+   * Fix compile failure due to use of clearenv on FreeBSD
+   * Use a size_t to resolve a compile warning
+   * Fix DesktopManager typo in man page
+
 Overview of changes in lightdm 1.30.0
 
     * Add lightdm_user_get_is_locked ()

README.md

@@ -13,8 +13,6 @@ Key features of LightDM are:
 - Supports remote login (incoming - XDMCP, VNC, outgoing - XDMCP, pluggable).
 - Comprehensive test suite.
 
-Releases are synchronised with the [Ubuntu release schedule](https://wiki.ubuntu.com/Releases) and supported for the duration of each Ubuntu release. Each release is announced on the [mailing list](http://lists.freedesktop.org/mailman/listinfo/lightdm).
-
 The core LightDM project does not provide any greeter with it and you should install a greeter appropriate to your system. Popular greeter projects are:
 
  * [LightDM GTK+ Greeter](https://github.com/Xubuntu/lightdm-gtk-greeter) - a greeter that has moderate requirements (GTK+).
@@ -49,6 +47,6 @@ Configuration is in keyfile format. For most installations you will want to chan
 
 # Questions
 
-Questions should be asked on the [mailing list](http://lists.freedesktop.org/mailman/listinfo/lightdm). All questions are welcome.
+Discussion about LightDM should be done on the [forum](https://discourse.ubuntu.com/c/light-dm/107). All questions are welcome.
 
 [Stack Overflow](http://stackoverflow.com/search?q=lightdm) and [Ask Ubuntu](http://askubuntu.com/search?q=lightdm) are good sites for frequently asked questions.

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(lightdm, 1.30.0)
+AC_INIT(lightdm, 1.32.0)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
@@ -48,7 +48,7 @@ AC_CHECK_HEADERS(security/pam_appl.h, [], AC_MSG_ERROR(PAM not found))
 
 AC_CHECK_HEADERS(gcrypt.h, [], AC_MSG_ERROR(libgcrypt not found))
 
-AC_CHECK_FUNCS(setresgid setresuid clearenv)
+AC_CHECK_FUNCS(setresgid setresuid clearenv __getgroups_chk)
 
 PKG_CHECK_MODULES(LIGHTDM, [
     glib-2.0 >= 2.44
@@ -216,6 +216,9 @@ po/Makefile.in
 src/Makefile
 tests/Makefile
 tests/src/Makefile
+tests/scripts/login-pam-config.conf
+tests/scripts/login-pam.conf
+tests/scripts/switch-to-greeter-return-session-pam.conf
 ])
 AC_OUTPUT
 

data/lightdm.conf

@@ -26,7 +26,7 @@
 #lock-memory=true
 #user-authority-in-system-dir=false
 #guest-account-script=guest-account
-#logind-check-graphical=false
+#logind-check-graphical=true
 #log-directory=/var/log/lightdm
 #run-directory=/var/run/lightdm
 #cache-directory=/var/cache/lightdm
@@ -160,4 +160,4 @@
 #listen-address=
 #width=1024
 #height=768
-#depth=8
+#depth=24

data/pam/lightdm-autologin

@@ -1,4 +1,6 @@
 #%PAM-1.0
+# Block login if shell in nologin or false
+auth      required pam_succeed_if.so shell notin /sbin/nologin:/usr/sbin/nologin:/bin/false:/usr/bin/false
 
 # Block login if they are globally disabled
 auth      required pam_nologin.so

debian/changelog

@@ -1,3 +1,29 @@
+lightdm (1.32.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release:
+   - Overwrite existing X authority files to avoid corruption
+   - Change logind-check-graphical default config value to true
+   - Block autologin if shell in nologin or false
+   - Fix failure if with greeters sending two login requests quickly.
+   - Drop Qt 4 support, it's been unsupported since 2015
+   - Fix lightdm_set_layout
+   - Improve method of determining a session is Wayland
+   - Don't call setenv with a NULL value - the behaviour is undefined
+   - Replace deprecated QAbstractItemModel::setRoleNames
+   - Move D-Bus conf file to $(datadir)/dbus-1/system.d
+   - Fix tests failing when compiled with --with-greeter-user
+   - Use Python 3 in tests
+   - Disable compiler optimizations for test programs
+   - Compilation fix for glibc 2.33
+   - Remove deprecated use of G_TYPE_INSTANCE_GET_PRIVATE, G_PARAM_PRIVATE
+   - Fix compile failure due to use of clearenv on FreeBSD
+   - Use a size_t to resolve a compile warning
+   - Fix DesktopManager typo in man page
+  * debian/lightdm.install:
+    - Update for new D-Bus config location
+
+ -- Robert Ancell <[email protected]>  Tue, 09 Aug 2022 12:30:51 +1200
+
 lightdm (1.30.0-0ubuntu1) eoan; urgency=medium
 
   * New upstream release:

debian/lightdm.install

@@ -7,7 +7,6 @@ usr/share/locale
 usr/share/polkit-1
 usr/lib/lightdm
 usr/bin
-etc/dbus-1/
 etc/lightdm/users.conf
 etc/lightdm/lightdm.conf usr/share/doc/lightdm/
 etc/lightdm/keys.conf usr/share/doc/lightdm/

debian/lightdm.lightdm-greeter.pam

@@ -1,15 +1,15 @@
 #%PAM-1.0
 auth    required        pam_permit.so
-auth    optional        pam_gnome_keyring.so
-auth    optional        pam_kwallet.so
-auth    optional        pam_kwallet5.so
+-auth    optional        pam_gnome_keyring.so
+-auth    optional        pam_kwallet.so
+-auth    optional        pam_kwallet5.so
 @include common-account
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
 session required        pam_limits.so
 @include common-session
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-session optional        pam_gnome_keyring.so auto_start
-session optional        pam_kwallet.so auto_start
-session optional        pam_kwallet5.so auto_start
+-session optional        pam_gnome_keyring.so auto_start
+-session optional        pam_kwallet.so auto_start
+-session optional        pam_kwallet5.so auto_start
 session required        pam_env.so readenv=1
 session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale

debian/lightdm.pam

@@ -2,18 +2,18 @@
 auth    requisite       pam_nologin.so
 auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
 @include common-auth
-auth    optional        pam_gnome_keyring.so
-auth    optional        pam_kwallet.so
-auth    optional        pam_kwallet5.so
+-auth    optional        pam_gnome_keyring.so
+-auth    optional        pam_kwallet.so
+-auth    optional        pam_kwallet5.so
 @include common-account
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
 #session required        pam_loginuid.so
 session required        pam_limits.so
 @include common-session
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-session optional        pam_gnome_keyring.so auto_start
-session optional        pam_kwallet.so auto_start
-session optional        pam_kwallet5.so auto_start
+-session optional        pam_gnome_keyring.so auto_start
+-session optional        pam_kwallet.so auto_start
+-session optional        pam_kwallet5.so auto_start
 session required        pam_env.so readenv=1
 session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
 @include common-password

liblightdm-gobject/layout.c

@@ -148,24 +148,24 @@ void
 lightdm_set_layout (LightDMLayout *dmlayout)
 {
     g_return_if_fail (dmlayout != NULL);
+    lightdm_get_layouts();
 
     g_debug ("Setting keyboard layout to '%s'", lightdm_layout_get_name (dmlayout));
 
     g_autofree gchar *layout = NULL;
     g_autofree gchar *variant = NULL;
     parse_layout_string (lightdm_layout_get_name (dmlayout), &layout, &variant);
 
-    XklConfigRec *config = xkl_config_rec_new ();
-    config->layouts = g_malloc (sizeof (gchar *) * 2);
-    config->variants = g_malloc (sizeof (gchar *) * 2);
-    config->model = g_strdup (xkl_config->model);
-    config->layouts[0] = g_steal_pointer (&layout);
-    config->layouts[1] = NULL;
-    config->variants[0] = g_steal_pointer (&variant);
-    config->variants[1] = NULL;
-    if (!xkl_config_rec_activate (config, xkl_engine))
+    if (layouts && xkl_config)
+    {
+        xkl_config->layouts[0] = g_steal_pointer(&layout);
+        xkl_config->layouts[1] = NULL;
+        xkl_config->variants[0] = g_steal_pointer(&variant);
+        xkl_config->variants[1] = NULL;
+        default_layout = dmlayout;
+    }
+    if (!xkl_config_rec_activate (xkl_config, xkl_engine))
         g_warning ("Failed to activate XKL config");
-    g_object_unref (config);
 }
 
 /**

po/az.po

@@ -1,15 +1,15 @@
 # Azerbaijani translation for lightdm
 # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the lightdm package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# Osman Kerimli <[email protected]>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lightdm\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: Osman Kerimli <[email protected]>\n"
 "POT-Creation-Date: 2010-12-06 11:05+0000\n"
-"PO-Revision-Date: 2012-04-14 10:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2018-12-18 00:11+0000\n"
+"Last-Translator: Osman Kerimli <[email protected]>\n"
 "Language-Team: Azerbaijani <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +19,66 @@ msgstr ""
 
 #: ../greeters/gtk/lightdm-gtk-greeter.c:409
 msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr ""
+msgstr "Bütün proqramları bağlayıb kompüteri yenidən başlatmaq istədiyinizə əmin"
+"sinizmi?"
 
 #: ../greeters/gtk/greeter.ui.h:1
 msgid "Cancel"
-msgstr ""
+msgstr "Ləğv et"
 
 #: ../greeters/gtk/lightdm-gtk-greeter.c:410
 msgid "Restart"
-msgstr ""
+msgstr "Yenidən başlat"
 
 #: ../greeters/gtk/lightdm-gtk-greeter.c:434
 msgid ""
 "Are you sure you want to close all programs and shutdown the computer?"
 msgstr ""
+"Bütün proqramları bağlayıb kompüteri yenidən başlatmaq istədiyinizə əminsinizmi?"
 
 #: ../greeters/gtk/lightdm-gtk-greeter.c:435
 msgid "Shutdown"
-msgstr ""
+msgstr "Söndür"
 
 #: ../greeters/gtk/greeter.ui.h:4
 msgid "Large Font"
-msgstr ""
+msgstr "Böyük Şrift"
 
 #: ../greeters/ldm-gtk-greeter.c:611
 msgid "High Constrast"
-msgstr ""
+msgstr "Yüksək Kontrast"
 
 #: ../greeters/ldm-gtk-greeter.c:615
 msgid "Options"
-msgstr ""
+msgstr "Seçimlər"
 
 #: ../greeters/ldm-gtk-greeter.c:620
 msgid "Language"
-msgstr ""
+msgstr "Dil"
 
 #: ../greeters/ldm-gtk-greeter.c:646
 msgid "Keyboard Layout"
-msgstr ""
+msgstr "Klaviatura tərtibatı"
 
 #: ../greeters/ldm-gtk-greeter.c:668
 msgid "Session"
-msgstr ""
+msgstr "Sessiya"
 
 #: ../greeters/gtk/greeter.ui.h:8
 msgid "Suspend"
-msgstr ""
+msgstr "Dayandır"
 
 #: ../greeters/gtk/greeter.ui.h:2
 msgid "Hibernate"
-msgstr ""
+msgstr "Qış yuxusu"
 
 #: ../greeters/gtk/greeter.ui.h:6
 msgid "Restart..."
-msgstr ""
+msgstr "Yenidən başlat..."
 
 #: ../greeters/gtk/greeter.ui.h:7
 msgid "Shutdown..."
-msgstr ""
+msgstr "Söndür..."
 
 #. Description on how to use Light Display Manager displayed on command-line
 #: ../src/lightdm.c:100
@@ -85,6 +87,8 @@ msgid ""
 "Usage:\n"
 "  %s - Display Manager"
 msgstr ""
+"İstifadə:\n"
+"  %s - Displey Menecer"
 
 #. Description on how to use Light Display Manager displayed on command-line
 #: ../src/lightdm.c:106
@@ -98,3 +102,10 @@ msgid ""
 "  -v, --version                   Show release version\n"
 "  -h, --help                      Show help options"
 msgstr ""
+"Kömək Seçimləri:\n"
+"  -c, --config <file>             Konfiqurasiya faylı istifadə et\n"
+"      --pid-file <file>           PID-i yazmaq üçün fayl\n"
+"  -d, --debug                     Xəta arıdıcı mesajlarını dərc et\n"
+"      --test-mode                 İmtiyazsız istifadəçi kimi başlat\n"
+"  -v, --version                   Buraxılış versiyasını göstər\n"
+"  -h, --help                      Kömək seçimlərini göstər"

po/lightdm.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-21 12:34+1200\n"
+"POT-Creation-Date: 2022-07-18 15:24+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"