x11/lightdm: Update to 1.22.0

- Update PAM file to include system defaults
- Set PATH to default from /etc/login.conf
- Don't pass-through empty PATH from lightdm to X11 (breaks runtime)

10 files changed, 90 insertions, 41 deletions

diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index 7afa4bf9a1f3..79a5d29c40b2 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lightdm
-PORTVERSION=	1.20.0
-PORTREVISION=	7
+PORTVERSION=	1.22.0
 CATEGORIES=	x11
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
@@ -31,6 +30,7 @@ USE_GNOME=	glib20 intlhack
 USE_XORG=	x11 xcb xdmcp
 CONFIGURE_ARGS=	--disable-tests # PAM errors
 INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
 USE_RC_SUBR=	lightdm
 SUB_FILES=	Xsession
 
diff --git a/x11/lightdm/distinfo b/x11/lightdm/distinfo
index 99f519c14eec..d8afeae64829 100644
--- a/x11/lightdm/distinfo
+++ b/x11/lightdm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482730054
-SHA256 (lightdm-1.20.0.tar.xz) = f03b7804a4902d189849a060292e4987d1e4f8272a1edb3e681e6f3cdfaa5ba4
-SIZE (lightdm-1.20.0.tar.xz) = 506488
+TIMESTAMP = 1501502611
+SHA256 (lightdm-1.22.0.tar.xz) = e4b9afb6a7e627440ccda140972631e54d005340ec6043d538281f28a8dbab28
+SIZE (lightdm-1.22.0.tar.xz) = 517416
diff --git a/x11/lightdm/files/patch-data_lightdm.conf b/x11/lightdm/files/patch-data_lightdm.conf
index c2f0c35050a6..24def133f02f 100644
--- a/x11/lightdm/files/patch-data_lightdm.conf
+++ b/x11/lightdm/files/patch-data_lightdm.conf
@@ -1,4 +1,4 @@
---- data/lightdm.conf.orig	2016-12-26 04:21:00 UTC
+--- data/lightdm.conf.orig	2016-12-07 02:20:29 UTC
 +++ data/lightdm.conf
 @@ -22,7 +22,7 @@
  #start-default-seat=true
diff --git a/x11/lightdm/files/patch-data_pam_lightdm b/x11/lightdm/files/patch-data_pam_lightdm
index 7a7b46b1d6fb..f8c3e79f4632 100644
--- a/x11/lightdm/files/patch-data_pam_lightdm
+++ b/x11/lightdm/files/patch-data_pam_lightdm
@@ -1,26 +1,37 @@
 --- data/pam/lightdm.orig	2015-08-09 23:30:00 UTC
 +++ data/pam/lightdm
-@@ -1,13 +1,13 @@
- #%PAM-1.0
+@@ -1,20 +1,18 @@
+-#%PAM-1.0
++#
++# PAM configuration for the "lightdm" service
++#
  
- # Block login if they are globally disabled
+-# Block login if they are globally disabled
 -auth      required pam_nologin.so
-+account      required pam_nologin.so
++# auth
++auth		sufficient	pam_self.so		no_warn
++auth		include		system
  
- # Load environment from /etc/environment and ~/.pam_environment
+-# Load environment from /etc/environment and ~/.pam_environment
 -auth      required pam_env.so
-+#auth      required pam_env.so
++# account
++account		requisite	pam_securetty.so
++account		required	pam_nologin.so
++account		include		system
  
- # Use /etc/passwd and /etc/shadow for passwords
+-# Use /etc/passwd and /etc/shadow for passwords
 -auth      required pam_unix.so
-+auth      required pam_unix.so        no_warn try_first_pass
++# session
++session		include		system
  
- # Check account is active, change password if required
- account   required pam_unix.so
-@@ -16,5 +16,4 @@ account   required pam_unix.so
- password  required pam_unix.so
- 
- # Setup session
+-# Check account is active, change password if required
+-account   required pam_unix.so
+-
+-# Allow password to be changed
+-password  required pam_unix.so
+-
+-# Setup session
 -session   required pam_unix.so
 -session   optional pam_systemd.so
-+session   required pam_permit.so
++# password
++password	include		system
diff --git a/x11/lightdm/files/patch-liblightdm-gobject_language.c b/x11/lightdm/files/patch-liblightdm-gobject_language.c
index 5b0bf032c4c6..57c21706e526 100644
--- a/x11/lightdm/files/patch-liblightdm-gobject_language.c
+++ b/x11/lightdm/files/patch-liblightdm-gobject_language.c
@@ -1,8 +1,8 @@
 https://bugs.launchpad.net/lightdm/+bug/790186
 
---- liblightdm-gobject/language.c.orig	2016-09-30 03:23:52 UTC
+--- liblightdm-gobject/language.c.orig	2016-12-09 01:04:48 UTC
 +++ liblightdm-gobject/language.c
-@@ -36,6 +36,12 @@ G_DEFINE_TYPE (LightDMLanguage, lightdm_language, G_TY
+@@ -57,6 +57,12 @@ G_DEFINE_TYPE (LightDMLanguage, lightdm_language, G_TY
  static gboolean have_languages = FALSE;
  static GList *languages = NULL;
  
@@ -15,7 +15,7 @@ https://bugs.launchpad.net/lightdm/+bug/790186
  static void
  update_languages (void)
  {
-@@ -72,7 +78,7 @@ update_languages (void)
+@@ -93,7 +99,7 @@ update_languages (void)
                  continue;
  
              /* Ignore the non-interesting languages */
@@ -24,7 +24,7 @@ https://bugs.launchpad.net/lightdm/+bug/790186
                  continue;
  
              language = g_object_new (LIGHTDM_TYPE_LANGUAGE, "code", code, NULL);
-@@ -88,12 +94,6 @@ update_languages (void)
+@@ -109,12 +115,6 @@ update_languages (void)
      have_languages = TRUE;
  }
  
@@ -37,7 +37,7 @@ https://bugs.launchpad.net/lightdm/+bug/790186
  /* Get a valid locale name that can be passed to setlocale(), so we always can use nl_langinfo() to get language and country names. */
  static gchar *
  get_locale_name (const gchar *code)
-@@ -133,7 +133,7 @@ get_locale_name (const gchar *code)
+@@ -154,7 +154,7 @@ get_locale_name (const gchar *code)
          for (i = 0; avail_locales[i]; i++)
          {
              gchar *loc = avail_locales[i];
@@ -46,7 +46,7 @@ https://bugs.launchpad.net/lightdm/+bug/790186
                  continue;
              if (g_str_has_prefix (loc, language))
              {
-@@ -227,10 +227,16 @@ lightdm_language_get_name (LightDMLanguage *language)
+@@ -248,10 +248,16 @@ lightdm_language_get_name (LightDMLanguage *language)
          if (locale)
          {
              gchar *current = setlocale (LC_ALL, NULL);
@@ -63,7 +63,7 @@ https://bugs.launchpad.net/lightdm/+bug/790186
              if (language_en && strlen (language_en) > 0)
                  priv->name = g_strdup (dgettext ("iso_639_3", language_en));
  
-@@ -270,10 +276,16 @@ lightdm_language_get_territory (LightDMLanguage *langu
+@@ -291,10 +297,16 @@ lightdm_language_get_territory (LightDMLanguage *langu
          if (locale)
          {
              gchar *current = setlocale (LC_ALL, NULL);
diff --git a/x11/lightdm/files/patch-src_process.c b/x11/lightdm/files/patch-src_process.c
index b285bd8a30ed..452446560055 100644
--- a/x11/lightdm/files/patch-src_process.c
+++ b/x11/lightdm/files/patch-src_process.c
@@ -1,4 +1,4 @@
---- src/process.c.orig	2017-04-12 15:33:03 UTC
+--- src/process.c.orig	2017-01-26 22:04:26 UTC
 +++ src/process.c
 @@ -228,11 +228,16 @@ process_start (Process *process, gboolean block)
  
diff --git a/x11/lightdm/files/patch-src_session-child.c b/x11/lightdm/files/patch-src_session-child.c
index d0cd13b4a84c..88f5674eb558 100644
--- a/x11/lightdm/files/patch-src_session-child.c
+++ b/x11/lightdm/files/patch-src_session-child.c
@@ -1,4 +1,4 @@
---- src/session-child.c.orig	2016-10-19 12:20:14 UTC
+--- src/session-child.c.orig	2017-01-26 21:11:24 UTC
 +++ src/session-child.c
 @@ -13,7 +13,6 @@
  #include <grp.h>
@@ -38,7 +38,7 @@
  #if HAVE_LIBAUDIT
  static void
  audit_event (int type, const gchar *username, uid_t uid, const gchar *remote_host_name, const gchar *tty, gboolean success)
-@@ -420,7 +396,6 @@ session_child_run (int argc, char **argv
+@@ -420,7 +396,6 @@ session_child_run (int argc, char **argv)
              ut.ut_tv.tv_sec = tv.tv_sec;
              ut.ut_tv.tv_usec = tv.tv_usec;
  
@@ -46,7 +46,16 @@
  
  #if HAVE_LIBAUDIT
              audit_event (AUDIT_USER_LOGIN, username, -1, remote_host_name, tty, FALSE);
-@@ -749,7 +724,6 @@ session_child_run (int argc, char **argv
+@@ -449,7 +424,7 @@ session_child_run (int argc, char **argv)
+         else
+         {
+             /* Set POSIX variables */
+-            pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin");
++            pam_putenv (pam_handle, "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin");
+             pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username));
+             pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username));
+             pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user)));
+@@ -751,7 +726,6 @@ session_child_run (int argc, char **argv)
              if (!pututxline (&ut))
                  g_printerr ("Failed to write utmpx: %s\n", strerror (errno));
              endutxent ();
@@ -54,7 +63,7 @@
  
  #if HAVE_LIBAUDIT          
              audit_event (AUDIT_USER_LOGIN, username, uid, remote_host_name, tty, TRUE);
-@@ -786,7 +760,6 @@ session_child_run (int argc, char **argv
+@@ -792,7 +766,6 @@ session_child_run (int argc, char **argv)
              if (!pututxline (&ut))
                  g_printerr ("Failed to write utmpx: %s\n", strerror (errno));
              endutxent ();
diff --git a/x11/lightdm/files/patch-src_x-server-local.c b/x11/lightdm/files/patch-src_x-server-local.c
new file mode 100644
index 000000000000..560142a662de
--- /dev/null
+++ b/x11/lightdm/files/patch-src_x-server-local.c
@@ -0,0 +1,24 @@
+--- src/x-server-local.c.orig	2016-12-09 00:50:21 UTC
++++ src/x-server-local.c
+@@ -549,17 +549,13 @@ x_server_local_start (DisplayServer *display_server)
+         }
+     }
+ 
+-    /* Pass through library variables */
+-    if (g_getenv ("LD_PRELOAD"))
+-        process_set_env (server->priv->x_server_process, "LD_PRELOAD", g_getenv ("LD_PRELOAD"));
+-    if (g_getenv ("LD_LIBRARY_PATH"))
+-        process_set_env (server->priv->x_server_process, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH"));
+-    if (g_getenv ("PATH"))
+-        process_set_env (server->priv->x_server_process, "PATH", g_getenv ("PATH"));
+-
+     /* Variable required for regression tests */
+     if (g_getenv ("LIGHTDM_TEST_ROOT"))
++    {
+         process_set_env (server->priv->x_server_process, "LIGHTDM_TEST_ROOT", g_getenv ("LIGHTDM_TEST_ROOT"));
++        process_set_env (server->priv->x_server_process, "LD_PRELOAD", g_getenv ("LD_PRELOAD"));
++        process_set_env (server->priv->x_server_process, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH"));
++    }
+ 
+     result = process_start (server->priv->x_server_process, FALSE);
+ 
diff --git a/x11/lightdm/files/patch-src_x-server.c b/x11/lightdm/files/patch-src_x-server.c
index ffaf8c5f0106..e0526d728cff 100644
--- a/x11/lightdm/files/patch-src_x-server.c
+++ b/x11/lightdm/files/patch-src_x-server.c
@@ -1,6 +1,6 @@
 --- src/x-server.c.orig	2016-06-17 04:53:18 UTC
 +++ src/x-server.c
-@@ -143,7 +143,7 @@ x_server_connect_session (DisplayServer 
+@@ -143,7 +143,7 @@ x_server_connect_session (DisplayServer *display_serve
      {
          gchar *t;
  
diff --git a/x11/lightdm/pkg-plist b/x11/lightdm/pkg-plist
index ce4f88bd3ff8..1f4ae258c2e4 100644
--- a/x11/lightdm/pkg-plist
+++ b/x11/lightdm/pkg-plist
@@ -3,10 +3,10 @@ etc/apparmor.d/abstractions/lightdm
 etc/apparmor.d/abstractions/lightdm_chromium-browser
 etc/apparmor.d/lightdm-guest-session
 etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
+%%ETCDIR%%/Xsession
 @sample %%ETCDIR%%/keys.conf.sample
 @sample %%ETCDIR%%/lightdm.conf.sample
 @sample %%ETCDIR%%/users.conf.sample
-%%ETCDIR%%/Xsession
 etc/pam.d/lightdm
 etc/pam.d/lightdm-autologin
 etc/pam.d/lightdm-greeter
@@ -31,19 +31,24 @@ sbin/lightdm
 share/bash-completion/completions/dm-tool
 share/bash-completion/completions/lightdm
 %%VALA%%share/gir-1.0/LightDM-1.gir
-%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/core.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMGreeter.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMLanguage.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMLayout.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMSession.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMUser.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMUserList.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/deprecated-api-index.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/home.png
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/index.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/left-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/left.png
-%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/lightdm-gobject-1-Greeter-Interface.html
-%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/lightdm-gobject-1-Keyboard-Layout.html
-%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/lightdm-gobject-1-Languages.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/lightdm-gobject-1-Power-Management.html
-%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/lightdm-gobject-1-Sessions.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/lightdm-gobject-1-System-Information.html
-%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/lightdm-gobject-1-User-Accounts.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/lightdm-gobject-1.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/object-tree.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/right-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/right.png
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/style.css