8 files changed, 58 insertions, 76 deletions

diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index 1da5f8533aad..9a517153aea5 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	lightdm
-PORTVERSION=	1.24.0
-PORTREVISION=	3
+PORTVERSION=	1.28.0
 CATEGORIES=	x11
-MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
+MASTER_SITES=	https://github.com/CanonicalLtd/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 
 MAINTAINER=	woodsb02@FreeBSD.org
 COMMENT=	Lightweight Display Manager
@@ -23,20 +22,21 @@ LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
 		libgcrypt.so:security/libgcrypt \
 		libxklavier.so:x11/libxklavier
 
-USES=		compiler:c++11-lang localbase gettext gmake libtool pathfix \
-		pkgconfig tar:xz
+USES=		compiler:c++11-lang gettext gmake gnome libtool localbase \
+		pathfix pkgconfig tar:xz
 USE_CXXSTD=	c++11
-GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 intlhack
+USE_GNOME=	glib20 intltool
 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
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-tests # PAM errors
+INSTALL_TARGET=	install-strip
 USERS=		lightdm
 GROUPS=		lightdm
+PORTSCOUT=	limitw:1,even
+SUB_FILES=	Xsession
 
 OPTIONS_DEFINE=	DOCS VALA
 OPTIONS_DEFAULT=VALA
diff --git a/x11/lightdm/distinfo b/x11/lightdm/distinfo
index 305edda84ff2..5a51b4844a43 100644
--- a/x11/lightdm/distinfo
+++ b/x11/lightdm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514284072
-SHA256 (lightdm-1.24.0.tar.xz) = cd509b74382bcf382c6e3e4b54ac30ba804022fec968d6993d134552ea1a43a2
-SIZE (lightdm-1.24.0.tar.xz) = 517552
+TIMESTAMP = 1549074437
+SHA256 (lightdm-1.28.0.tar.xz) = f20f599d8d7cf90b77a2df33c6e9e615abc443123b1b228de1c20a636aecfa07
+SIZE (lightdm-1.28.0.tar.xz) = 517460
diff --git a/x11/lightdm/files/patch-liblightdm-gobject_language.c b/x11/lightdm/files/patch-liblightdm-gobject_language.c
index 57c21706e526..adfbd9a9e9a4 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-12-09 01:04:48 UTC
+--- liblightdm-gobject/language.c.orig	2018-08-29 22:30:07 UTC
 +++ liblightdm-gobject/language.c
-@@ -57,6 +57,12 @@ G_DEFINE_TYPE (LightDMLanguage, lightdm_language, G_TY
+@@ -57,6 +57,12 @@ G_DEFINE_TYPE_WITH_PRIVATE (LightDMLanguage, lightdm_l
  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)
  {
-@@ -93,7 +99,7 @@ update_languages (void)
+@@ -83,7 +89,7 @@ update_languages (void)
                  continue;
  
              /* Ignore the non-interesting languages */
@@ -23,8 +23,8 @@ https://bugs.launchpad.net/lightdm/+bug/790186
 +            if (strcmp (command, "locale -a") == 0 && !is_utf8 (code))
                  continue;
  
-             language = g_object_new (LIGHTDM_TYPE_LANGUAGE, "code", code, NULL);
-@@ -109,12 +115,6 @@ update_languages (void)
+             LightDMLanguage *language = g_object_new (LIGHTDM_TYPE_LANGUAGE, "code", code, NULL);
+@@ -94,12 +100,6 @@ update_languages (void)
      have_languages = TRUE;
  }
  
@@ -37,33 +37,33 @@ 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)
-@@ -154,7 +154,7 @@ get_locale_name (const gchar *code)
-         for (i = 0; avail_locales[i]; i++)
-         {
-             gchar *loc = avail_locales[i];
--            if (!g_strrstr (loc, ".utf8"))
-+            if (!is_utf8 (loc))
-                 continue;
-             if (g_str_has_prefix (loc, language))
-             {
-@@ -248,10 +248,16 @@ lightdm_language_get_name (LightDMLanguage *language)
+@@ -131,7 +131,7 @@ get_locale_name (const gchar *code)
+     for (gint i = 0; avail_locales[i]; i++)
+     {
+         const gchar *loc = avail_locales[i];
+-        if (!g_strrstr (loc, ".utf8"))
++        if (!is_utf8 (loc))
+             continue;
+         if (g_str_has_prefix (loc, language))
+             return g_strdup (loc);
+@@ -214,10 +214,16 @@ lightdm_language_get_name (LightDMLanguage *language)
          if (locale)
          {
-             gchar *current = setlocale (LC_ALL, NULL);
+             const gchar *current = setlocale (LC_ALL, NULL);
 +#ifdef LC_IDENTIFICATION
              setlocale (LC_IDENTIFICATION, locale);
 +#endif
              setlocale (LC_MESSAGES, "");
  
 +#ifdef _NL_IDENTIFICATION_LANGUAGE
-             gchar *language_en = nl_langinfo (_NL_IDENTIFICATION_LANGUAGE);
+             const gchar *language_en = nl_langinfo (_NL_IDENTIFICATION_LANGUAGE);
 +#else
-+            gchar *language_en = "Unknown";
++            const gchar *language_en = "Unknown";
 +#endif
              if (language_en && strlen (language_en) > 0)
                  priv->name = g_strdup (dgettext ("iso_639_3", language_en));
  
-@@ -291,10 +297,16 @@ lightdm_language_get_territory (LightDMLanguage *langu
+@@ -254,10 +260,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 452446560055..3a61886b1dc8 100644
--- a/x11/lightdm/files/patch-src_process.c
+++ b/x11/lightdm/files/patch-src_process.c
@@ -1,9 +1,9 @@
---- src/process.c.orig	2017-01-26 22:04:26 UTC
+--- src/process.c.orig	2018-08-30 00:28:55 UTC
 +++ src/process.c
-@@ -228,11 +228,16 @@ process_start (Process *process, gboolean block)
+@@ -238,11 +238,16 @@ process_start (Process *process, gboolean block)
  
          /* Set environment */
-         if (process->priv->clear_environment)
+         if (priv->clear_environment)
 +        {
  #ifdef HAVE_CLEARENV
              clearenv ();
@@ -15,6 +15,6 @@
 +            cleanenv[0] = NULL;
  #endif
 +        }
-         for (i = 0; i < env_length; i++)
+         for (guint i = 0; i < env_length; i++)
              setenv (env_keys[i], env_values[i], TRUE);
  
diff --git a/x11/lightdm/files/patch-src_session-child.c b/x11/lightdm/files/patch-src_session-child.c
index 88f5674eb558..ba8fd14b5577 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	2017-01-26 21:11:24 UTC
+--- src/session-child.c.orig	2018-02-06 23:31:03 UTC
 +++ src/session-child.c
 @@ -13,7 +13,6 @@
  #include <grp.h>
@@ -8,7 +8,7 @@
  #include <utmpx.h>
  #include <sys/mman.h>
  
-@@ -202,29 +201,6 @@ read_xauth (void)
+@@ -192,28 +191,6 @@ read_xauth (void)
      return x_authority_new (x_authority_family, x_authority_address, x_authority_address_length, x_authority_number, x_authority_name, x_authority_data, x_authority_data_length);
  }
  
@@ -17,7 +17,6 @@
 -updwtmpx (const gchar *wtmp_file, struct utmpx *ut)
 -{
 -    struct utmp u;
--
 -    memset (&u, 0, sizeof (u));
 -    u.ut_type = ut->ut_type;
 -    u.ut_pid = ut->ut_pid;
@@ -38,7 +37,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)
+@@ -363,7 +340,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 +45,7 @@
  
  #if HAVE_LIBAUDIT
              audit_event (AUDIT_USER_LOGIN, username, -1, remote_host_name, tty, FALSE);
-@@ -449,7 +424,7 @@ session_child_run (int argc, char **argv)
+@@ -393,7 +369,7 @@ session_child_run (int argc, char **argv)
          else
          {
              /* Set POSIX variables */
@@ -55,15 +54,15 @@
              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)
+@@ -708,7 +684,6 @@ session_child_run (int argc, char **argv)
              if (!pututxline (&ut))
                  g_printerr ("Failed to write utmpx: %s\n", strerror (errno));
              endutxent ();
 -            updwtmpx ("/var/log/wtmp", &ut);
  
- #if HAVE_LIBAUDIT          
+ #if HAVE_LIBAUDIT
              audit_event (AUDIT_USER_LOGIN, username, uid, remote_host_name, tty, TRUE);
-@@ -792,7 +766,6 @@ session_child_run (int argc, char **argv)
+@@ -749,7 +724,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
deleted file mode 100644
index 560142a662de..000000000000
--- a/x11/lightdm/files/patch-src_x-server-local.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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 e0526d728cff..394789feaa3f 100644
--- a/x11/lightdm/files/patch-src_x-server.c
+++ b/x11/lightdm/files/patch-src_x-server.c
@@ -1,11 +1,15 @@
---- src/x-server.c.orig	2016-06-17 04:53:18 UTC
+--- src/x-server.c.orig	2018-08-30 00:28:55 UTC
 +++ src/x-server.c
-@@ -143,7 +143,7 @@ x_server_connect_session (DisplayServer *display_serve
-     {
-         gchar *t;
+@@ -152,10 +152,10 @@ x_server_connect_session (DisplayServer *display_serve
+         g_autofree gchar *tty_text = NULL;
+         g_autofree gchar *vt_text = NULL;
  
--        t = g_strdup_printf ("/dev/tty%d", vt);
-+        t = g_strdup_printf ("/dev/ttyv%d", vt-1);
-         session_set_tty (session, t);
-         g_free (t);
+-        tty_text = g_strdup_printf ("/dev/tty%d", vt);
++        tty_text = g_strdup_printf ("/dev/ttyv%d", vt - 1);
+         session_set_tty (session, tty_text);
  
+-        vt_text = g_strdup_printf ("%d", vt);
++        vt_text = g_strdup_printf ("%d", vt - 1);
+         session_set_env (session, "XDG_VTNR", vt_text);
+     }
+     else
diff --git a/x11/lightdm/pkg-plist b/x11/lightdm/pkg-plist
index 1f4ae258c2e4..dc0f4b7c735b 100644
--- a/x11/lightdm/pkg-plist
+++ b/x11/lightdm/pkg-plist
@@ -28,8 +28,10 @@ libexec/lightdm-guest-session
 man/man1/dm-tool.1.gz
 man/man1/lightdm.1.gz
 sbin/lightdm
+share/accountsservice/interfaces/org.freedesktop.DisplayManager.AccountsService.xml
 share/bash-completion/completions/dm-tool
 share/bash-completion/completions/lightdm
+share/dbus-1/interfaces/org.freedesktop.DisplayManager.AccountsService.xml
 %%VALA%%share/gir-1.0/LightDM-1.gir
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMGreeter.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMLanguage.html
@@ -160,6 +162,7 @@ share/bash-completion/completions/lightdm
 %%VALA%%share/locale/zh_CN/LC_MESSAGES/lightdm.mo
 %%VALA%%share/locale/zh_HK/LC_MESSAGES/lightdm.mo
 %%VALA%%share/locale/zh_TW/LC_MESSAGES/lightdm.mo
+share/polkit-1/actions/org.freedesktop.DisplayManager.AccountsService.policy
 %%VALA%%share/vala/vapi/liblightdm-gobject-1.deps
 %%VALA%%share/vala/vapi/liblightdm-gobject-1.vapi
 share/xgreeters/default.desktop