From nobody Sun Oct 17 04:30:26 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6ADEF17FCDBF; Sun, 17 Oct 2021 04:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HX6W7256Bz4tDf; Sun, 17 Oct 2021 04:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21CCC26554; Sun, 17 Oct 2021 04:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19H4UQhl070269; Sun, 17 Oct 2021 04:30:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19H4UQfh070268; Sun, 17 Oct 2021 04:30:26 GMT (envelope-from git) Date: Sun, 17 Oct 2021 04:30:26 GMT Message-Id: <202110170430.19H4UQfh070268@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: b358f7e7d477 - main - x11/ly: Fix coredumps on STABLE List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b358f7e7d4770ca42ea9478c831eb4d4e67b5700 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=b358f7e7d4770ca42ea9478c831eb4d4e67b5700 commit b358f7e7d4770ca42ea9478c831eb4d4e67b5700 Author: Tom R AuthorDate: 2021-10-17 04:29:30 +0000 Commit: Neel Chauhan CommitDate: 2021-10-17 04:30:18 +0000 x11/ly: Fix coredumps on STABLE Obtained via: private email --- x11/ly/Makefile | 1 + x11/ly/files/patch-src_login.c | 27 ++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/x11/ly/Makefile b/x11/ly/Makefile index a338809f2035..0bc98c2ee69c 100644 --- a/x11/ly/Makefile +++ b/x11/ly/Makefile @@ -1,6 +1,7 @@ PORTNAME= ly DISTVERSIONPREFIX= v DISTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= nc@FreeBSD.org diff --git a/x11/ly/files/patch-src_login.c b/x11/ly/files/patch-src_login.c index 8d70b31c605f..8aeff49939e9 100644 --- a/x11/ly/files/patch-src_login.c +++ b/x11/ly/files/patch-src_login.c @@ -1,5 +1,6 @@ ---- src/login.c.orig 2020-02-03 07:51:05 UTC -+++ src/login.c +diff -ru bak.ly-0.5.2/src/login.c ly-0.5.2/src/login.c +--- src/login.c 2021-10-16 23:20:01.325733000 -0400 ++++ src/login.c 2021-10-16 23:21:46.738595000 -0400 @@ -18,7 +18,7 @@ #include #include @@ -9,7 +10,19 @@ #include int get_free_display() -@@ -243,9 +243,15 @@ void env_init(struct passwd* pwd) +@@ -213,6 +213,11 @@ + // clean env + environ[0] = NULL; + ++ if (lang == NULL) ++ { ++ lang = "C.UTF-8"; ++ } ++ + if (term != NULL) + { + setenv("TERM", term, 1); +@@ -243,9 +248,15 @@ void env_xdg(const char* tty_id, const enum display_server display_server) { @@ -28,7 +41,7 @@ setenv("XDG_SESSION_CLASS", "user", 0); setenv("XDG_SEAT", "seat0", 0); setenv("XDG_VTNR", tty_id, 0); -@@ -271,8 +277,8 @@ void env_xdg(const char* tty_id, const enum display_se +@@ -271,8 +282,8 @@ } } @@ -39,7 +52,7 @@ char *username, pid_t display_pid ) { -@@ -283,24 +289,23 @@ void add_utmp_entry( +@@ -283,24 +294,23 @@ /* only correct for ptys named /dev/tty[pqr][0-9a-z] */ strcpy(entry->ut_id, ttyname(STDIN_FILENO) + strlen("/dev/tty")); @@ -76,7 +89,7 @@ } void xauth(const char* display_name, const char* shell, const char* dir) -@@ -581,7 +586,7 @@ void auth( +@@ -581,7 +591,7 @@ char vt[5]; snprintf(tty_id, 3, "%d", config.tty); @@ -85,7 +98,7 @@ // set env env_init(pwd); -@@ -636,13 +641,13 @@ void auth( +@@ -636,13 +646,13 @@ } // add utmp audit