From a0aeb683db136aa59abcc04ea5b77f1fc678b3f4 Mon Sep 17 00:00:00 2001 From: Ben Woods Date: Thu, 6 Jun 2019 23:05:21 +0000 Subject: [PATCH] x11/lightdm: Update to 1.30.0, fix crash and change default config This update addresses a crash in lightdm, related to the way the user environment for the lightdm process is setup in src/process.c. The configuration option in lightdm.conf for locked memory is now honoured - the default configuration has been updated to disable this, and pkg-message has been updated to reflect this change. Changes this release: https://github.com/CanonicalLtd/lightdm/releases/tag/1.30.0 PR: 238083 Submitted by: madpilot Reported by: David.Boyd49@twc.com Differential Revision: https://reviews.freebsd.org/D20541 --- x11/lightdm/Makefile | 13 +- x11/lightdm/distinfo | 6 +- x11/lightdm/files/patch-data_lightdm.conf | 10 +- x11/lightdm/files/patch-src_process.c | 25 +-- x11/lightdm/pkg-message | 13 +- x11/lightdm/pkg-plist | 220 +++++++++++----------- 6 files changed, 143 insertions(+), 144 deletions(-) diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile index fece8ca18e34..642b56ab1e5d 100644 --- a/x11/lightdm/Makefile +++ b/x11/lightdm/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= lightdm -PORTVERSION= 1.28.0 -PORTREVISION= 1 +PORTVERSION= 1.30.0 CATEGORIES= x11 MASTER_SITES= https://github.com/CanonicalLtd/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ @@ -39,16 +38,16 @@ GROUPS= lightdm PORTSCOUT= limitw:1,even SUB_FILES= Xsession -OPTIONS_DEFINE= DOCS VALA -OPTIONS_DEFAULT=VALA +OPTIONS_DEFINE= DOCS VAPI +OPTIONS_DEFAULT=VAPI OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdoc-check:textproc/gtk-doc DOCS_CONFIGURE_ENABLE= gtk-doc -VALA_BUILD_DEPENDS= vapigen:lang/vala -VALA_CONFIGURE_ENABLE= vala -VALA_USE= gnome=introspection:build +VAPI_BUILD_DEPENDS= vapigen:lang/vala +VAPI_CONFIGURE_ENABLE= vala +VAPI_USE= gnome=introspection:build post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ diff --git a/x11/lightdm/distinfo b/x11/lightdm/distinfo index 5a51b4844a43..022d54bad452 100644 --- a/x11/lightdm/distinfo +++ b/x11/lightdm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549074437 -SHA256 (lightdm-1.28.0.tar.xz) = f20f599d8d7cf90b77a2df33c6e9e615abc443123b1b228de1c20a636aecfa07 -SIZE (lightdm-1.28.0.tar.xz) = 517460 +TIMESTAMP = 1559844986 +SHA256 (lightdm-1.30.0.tar.xz) = a118779650a3a5b20f05d53c4f9e377b484fbc1810a6b0914a60840d9a581f95 +SIZE (lightdm-1.30.0.tar.xz) = 509220 diff --git a/x11/lightdm/files/patch-data_lightdm.conf b/x11/lightdm/files/patch-data_lightdm.conf index 24def133f02f..4fa124de5e6e 100644 --- a/x11/lightdm/files/patch-data_lightdm.conf +++ b/x11/lightdm/files/patch-data_lightdm.conf @@ -1,15 +1,17 @@ ---- data/lightdm.conf.orig 2016-12-07 02:20:29 UTC +--- data/lightdm.conf.orig 2018-09-05 01:33:31 UTC +++ data/lightdm.conf -@@ -22,7 +22,7 @@ +@@ -22,8 +22,8 @@ #start-default-seat=true #greeter-user=lightdm #minimum-display-number=0 -#minimum-vt=7 +-#lock-memory=true +minimum-vt=9 - #lock-memory=true ++lock-memory=false #user-authority-in-system-dir=false #guest-account-script=guest-account -@@ -114,7 +114,7 @@ + #logind-check-graphical=false +@@ -108,7 +108,7 @@ #allow-user-switching=true #allow-guest=true #guest-session= diff --git a/x11/lightdm/files/patch-src_process.c b/x11/lightdm/files/patch-src_process.c index 3a61886b1dc8..ef18f78fb2a9 100644 --- a/x11/lightdm/files/patch-src_process.c +++ b/x11/lightdm/files/patch-src_process.c @@ -1,20 +1,11 @@ --- src/process.c.orig 2018-08-30 00:28:55 UTC +++ src/process.c -@@ -238,11 +238,16 @@ process_start (Process *process, gboolean block) - - /* Set environment */ - if (priv->clear_environment) -+ { - #ifdef HAVE_CLEARENV - clearenv (); - #else -- environ = NULL; -+ extern char **environ; -+ char *cleanenv[1]; -+ environ = cleanenv; -+ cleanenv[0] = NULL; - #endif -+ } - for (guint i = 0; i < env_length; i++) - setenv (env_keys[i], env_values[i], TRUE); +@@ -73,6 +73,8 @@ static GHashTable *processes = NULL; + static pid_t signal_pid; + static int signal_pipe[2]; ++extern char **environ; ++ + Process * + process_get_current (void) + { diff --git a/x11/lightdm/pkg-message b/x11/lightdm/pkg-message index e7dfa70e54cd..bad0c5c5ec2e 100644 --- a/x11/lightdm/pkg-message +++ b/x11/lightdm/pkg-message @@ -1,9 +1,16 @@ +[ +{ + message: <