From owner-svn-ports-head@freebsd.org Sat Aug 5 08:17:57 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E8B2DC56F4; Sat, 5 Aug 2017 08:17:57 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BCB086A705; Sat, 5 Aug 2017 08:17:56 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v758HtXP009165; Sat, 5 Aug 2017 08:17:55 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v758HsJP009154; Sat, 5 Aug 2017 08:17:54 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201708050817.v758HsJP009154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sat, 5 Aug 2017 08:17:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447392 - in head/x11: lightdm lightdm-gtk-greeter lightdm/files X-SVN-Group: ports-head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in head/x11: lightdm lightdm-gtk-greeter lightdm/files X-SVN-Commit-Revision: 447392 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2017 08:17:57 -0000 Author: woodsb02 Date: Sat Aug 5 08:17:54 2017 New Revision: 447392 URL: https://svnweb.freebsd.org/changeset/ports/447392 Log: 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) Added: head/x11/lightdm/files/patch-src_x-server-local.c (contents, props changed) Modified: head/x11/lightdm-gtk-greeter/Makefile head/x11/lightdm/Makefile head/x11/lightdm/distinfo head/x11/lightdm/files/patch-data_lightdm.conf head/x11/lightdm/files/patch-data_pam_lightdm head/x11/lightdm/files/patch-liblightdm-gobject_language.c head/x11/lightdm/files/patch-src_process.c head/x11/lightdm/files/patch-src_session-child.c head/x11/lightdm/files/patch-src_x-server.c head/x11/lightdm/pkg-plist Modified: head/x11/lightdm-gtk-greeter/Makefile ============================================================================== --- head/x11/lightdm-gtk-greeter/Makefile Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm-gtk-greeter/Makefile Sat Aug 5 08:17:54 2017 (r447392) @@ -3,7 +3,7 @@ PORTNAME= lightdm-gtk-greeter PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ Modified: head/x11/lightdm/Makefile ============================================================================== --- head/x11/lightdm/Makefile Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/Makefile Sat Aug 5 08:17:54 2017 (r447392) @@ -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 Modified: head/x11/lightdm/distinfo ============================================================================== --- head/x11/lightdm/distinfo Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/distinfo Sat Aug 5 08:17:54 2017 (r447392) @@ -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 Modified: head/x11/lightdm/files/patch-data_lightdm.conf ============================================================================== --- head/x11/lightdm/files/patch-data_lightdm.conf Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/files/patch-data_lightdm.conf Sat Aug 5 08:17:54 2017 (r447392) @@ -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 Modified: head/x11/lightdm/files/patch-data_pam_lightdm ============================================================================== --- head/x11/lightdm/files/patch-data_pam_lightdm Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/files/patch-data_pam_lightdm Sat Aug 5 08:17:54 2017 (r447392) @@ -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 Modified: head/x11/lightdm/files/patch-liblightdm-gobject_language.c ============================================================================== --- head/x11/lightdm/files/patch-liblightdm-gobject_language.c Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/files/patch-liblightdm-gobject_language.c Sat Aug 5 08:17:54 2017 (r447392) @@ -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); Modified: head/x11/lightdm/files/patch-src_process.c ============================================================================== --- head/x11/lightdm/files/patch-src_process.c Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/files/patch-src_process.c Sat Aug 5 08:17:54 2017 (r447392) @@ -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) Modified: head/x11/lightdm/files/patch-src_session-child.c ============================================================================== --- head/x11/lightdm/files/patch-src_session-child.c Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/files/patch-src_session-child.c Sat Aug 5 08:17:54 2017 (r447392) @@ -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 @@ -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 (); Added: head/x11/lightdm/files/patch-src_x-server-local.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/lightdm/files/patch-src_x-server-local.c Sat Aug 5 08:17:54 2017 (r447392) @@ -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); + Modified: head/x11/lightdm/files/patch-src_x-server.c ============================================================================== --- head/x11/lightdm/files/patch-src_x-server.c Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/files/patch-src_x-server.c Sat Aug 5 08:17:54 2017 (r447392) @@ -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; Modified: head/x11/lightdm/pkg-plist ============================================================================== --- head/x11/lightdm/pkg-plist Sat Aug 5 07:07:01 2017 (r447391) +++ head/x11/lightdm/pkg-plist Sat Aug 5 08:17:54 2017 (r447392) @@ -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