Attachment 243205 Details for Bug 272368 – patch

[patch] patch

0001-x11-ly-Update-to-0.6.0.patch (text/plain), 11.90 KB, created by embhd on 2023-07-04 19:09:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: embhd

Created: 2023-07-04 19:09:58 UTC

Size: 11.90 KB

patch

obsolete

>From 1d5d6e5b13873ecce074a3e95534a608128c5c68 Mon Sep 17 00:00:00 2001
>From: Michael Burghold <embhd@posteo.de>
>Date: Tue, 4 Jul 2023 20:53:31 +0200
>Subject: [PATCH] x11/ly: Update to 0.6.0
>
>---
> x11/ly/Makefile                   |  2 +-
> x11/ly/distinfo                   |  6 +--
> x11/ly/files/patch-makefile       | 11 ++--
> x11/ly/files/patch-res_config.ini | 89 +++++++++++++++++--------------
> x11/ly/files/patch-src_config.c   |  2 +-
> x11/ly/files/patch-src_draw.c     | 11 ----
> x11/ly/files/patch-src_login.c    | 75 ++++++++++++++------------
> 7 files changed, 98 insertions(+), 98 deletions(-)
> delete mode 100644 x11/ly/files/patch-src_draw.c
>
>diff --git a/x11/ly/Makefile b/x11/ly/Makefile
>index 44e40581e..716a6ad9a 100644
>--- a/x11/ly/Makefile
>+++ b/x11/ly/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	ly
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.5.3
>+DISTVERSION=	0.6.0
> CATEGORIES=	x11
> 
> MAINTAINER=	bapt@FreeBSD.org
>diff --git a/x11/ly/distinfo b/x11/ly/distinfo
>index 9f37c73a3..13aacce25 100644
>--- a/x11/ly/distinfo
>+++ b/x11/ly/distinfo
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1680865749
>-SHA256 (fairyglade-ly-v0.5.3_GH0.tar.gz) = ddbd8bd6d7a00867d269154c564d0c059f2d5b0df111e1995b4abfbb89f683d5
>-SIZE (fairyglade-ly-v0.5.3_GH0.tar.gz) = 22464
>+TIMESTAMP = 1686814209
>+SHA256 (fairyglade-ly-v0.6.0_GH0.tar.gz) = 10b3777f49e0a9370efe5132b3c6618294330700a14a659ee66b5bf313f4baae
>+SIZE (fairyglade-ly-v0.6.0_GH0.tar.gz) = 32706
> SHA256 (nullgemm-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5c284cae748b1cec4eef311845f53ad673f91996ec425c6e323f0c40e829e77f
> SIZE (nullgemm-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5497
> SHA256 (nullgemm-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = bde1826acb80092bd551985082dc872c7f3e48e03132c377f0e5cdd2f9f331e3
>diff --git a/x11/ly/files/patch-makefile b/x11/ly/files/patch-makefile
>index 72492e9b6..e437084f1 100644
>--- a/x11/ly/files/patch-makefile
>+++ b/x11/ly/files/patch-makefile
>@@ -1,4 +1,4 @@
>---- makefile.orig	2020-07-28 15:35:08 UTC
>+--- makefile.orig	2023-07-02 18:00:00 +0200
> +++ makefile
> @@ -1,9 +1,9 @@
>  NAME = ly
>@@ -7,8 +7,8 @@
> -FLAGS+= -Wall -Wextra -Werror=vla -Wno-unused-parameter
> +FLAGS+= -Wall -Wextra -Wno-unused-parameter
>  #FLAGS+= -DDEBUG
>--FLAGS+= -DGIT_VERSION_STRING=\"$(shell git describe --long --tags | sed 's/$[^-]*-g$/r\1/;s/-/./g')\"
>-+FLAGS+= -DGIT_VERSION_STRING=\"${DISTVERSIONFULL}\"
>+-FLAGS+= -DLY_VERSION=\"$(shell git describe --long --tags | sed 's/$[^-]*-g$/r\1/;s/-/./g')\"
>++FLAGS+= -DLY_VERSION=\"${DISTVERSIONFULL}\"
>  LINK = -lpam -lxcb
>  VALGRIND = --show-leak-kinds=all --track-origins=yes --leak-check=full --suppressions=../res/valgrind.supp
>  CMD = ./$(NAME)
>@@ -23,10 +23,10 @@
>  
>  BIND = bin
>  OBJD = obj
>-@@ -71,15 +75,14 @@ leakgrind: $(BIND)/$(NAME)
>+@@ -71,14 +75,14 @@ leakgrind: $(BIND)/$(NAME)
>  
>  install: $(BIND)/$(NAME)
>- 	@echo "installing"
>+ 	@echo "installing ly"
> -	@install -dZ ${DESTDIR}/etc/ly
> -	@install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin
> -	@install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly
>@@ -34,7 +34,6 @@
> -	@install -DZ $(RESD)/wsetup.sh -t $(DATADIR)
> -	@install -dZ $(DATADIR)/lang
> -	@install -DZ $(RESD)/lang/* -t $(DATADIR)/lang
>--	@install -DZ $(RESD)/ly.service -m 644 -t ${DESTDIR}/usr/lib/systemd/system
> -	@install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d
> +	@install -dZ ${DESTDIR}${PREFIX}/etc/ly
> +	@install -DZ $(BIND)/$(NAME) -t ${DESTDIR}${PREFIX}/bin
>diff --git a/x11/ly/files/patch-res_config.ini b/x11/ly/files/patch-res_config.ini
>index 90f0c60ed..207460ddd 100644
>--- a/x11/ly/files/patch-res_config.ini
>+++ b/x11/ly/files/patch-res_config.ini
>@@ -1,72 +1,79 @@
>---- res/config.ini.orig	2020-07-28 15:35:08 UTC
>+--- res/config.ini.orig	2023-06-15 09:30:09.000000000 +0200
> +++ res/config.ini
> @@ -1,3 +1,5 @@
> +# This is a FreeBSD-ready patched version of the upstream configuration file.
> +
>- # animation enabled
>+ # Animation enabled/disabled
>  #animate = false
>- #animate = true
>-@@ -53,12 +55,14 @@
>  
>- # cookie generator
>- #mcookie_cmd = /usr/bin/mcookie
>-+mcookie_cmd = /usr/bin/openssl rand -hex 16
>- 
>- # event timeout in milliseconds
>- #min_refresh_delta = 5
>- 
>- # default path
>- #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin
>-+path = /sbin:/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin:/usr/sbin:/usr/bin:/usr/bin/env
>+@@ -73,14 +75,14 @@
>+ #save = true
>  
>- # command executed when pressing F2
>- #restart_cmd = /sbin/shutdown -r now
>-@@ -68,12 +72,14 @@
>- 
>- # file in which to save and load the default desktop and login
>- #save_file = /etc/ly/save
>+ # File in which to save and load the default desktop and login
>+-#save_file = /etc/ly/save
> +save_file = %%ETCDIR%%/save
>  
>- # service name (set to ly to use the provided pam config file)
>- #service_name = ly
>  
>- # command executed when pressing F1
>- #shutdown_cmd = /sbin/shutdown -a now
>+ # Remove F1/F2 command hints
>+ #hide_f1_commands = false
>+ 
>+ # Command executed when pressing F1
>+-#shutdown_cmd = /sbin/shutdown -a now
> +shutdown_cmd = /sbin/shutdown -p now
>  
>- # terminal reset command (tput is faster)
>- #term_reset_cmd = /usr/bin/tput reset
>-@@ -81,8 +87,12 @@
>+ # Command executed when pressing F2
>+ #restart_cmd = /sbin/shutdown -r now
>+@@ -94,11 +96,15 @@
>  # tty in use
>  #tty = 2
>  
> +# vt in use by X or Wayland
> +#vt = 9
> +
>- # wayland setup command
>- #wayland_cmd = /etc/ly/wsetup.sh
>+ # Console path
>+ #console_dev = /dev/console
>+ 
>+ # Default path
>+ #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin
>++path = /sbin:/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin:/usr/sbin:/usr/bin:/usr/bin/env
>+ 
>+ 
>+ # Event timeout in milliseconds
>+@@ -111,30 +116,30 @@
>+ #term_reset_cmd = /usr/bin/tput reset
>+ 
>+ # Cookie generator
>+-#mcookie_cmd = /usr/bin/mcookie
>++mcookie_cmd = /usr/bin/openssl rand -hex 16
>+ 
>+ 
>+ # Wayland setup command
>+-#wayland_cmd = /etc/ly/wsetup.sh
> +wayland_cmd = %%ETCDIR%%/wsetup.sh
>  
>- # add wayland specifier to session names
>+ # Add wayland specifier to session names
>  #wayland_specifier = false
>-@@ -90,15 +100,20 @@
>  
>- # wayland desktop environments
>- #waylandsessions = /usr/share/wayland-sessions
>+ # Wayland desktop environments
>+-#waylandsessions = /usr/share/wayland-sessions
> +waylandsessions = %%LOCALBASE%%/share/wayland-sessions
>  
>- # xorg server command
>- #x_cmd = /usr/bin/X
>+ 
>+ # xinitrc
>+ #xinitrc = ~/.xinitrc
>+ 
>+ # Xorg server command
>+-#x_cmd = /usr/bin/X
> +x_cmd = %%LOCALBASE%%/bin/X
>  
>- # xorg setup command
>- #x_cmd_setup = /etc/ly/xsetup.sh
>+ # Xorg setup command
>+-#x_cmd_setup = /etc/ly/xsetup.sh
> +x_cmd_setup = %%ETCDIR%%/xsetup.sh
>  
>- # xorg xauthority edition tool
>- #xauth_cmd = /usr/bin/xauth
>+ # Xorg xauthority edition tool
>+-#xauth_cmd = /usr/bin/xauth
> +xauth_cmd = %%LOCALBASE%%/bin/xauth
>  
>- # xorg desktop environments
>- #xsessions = /usr/share/xsessions
>+ # Xorg desktop environments
>+-#xsessions = /usr/share/xsessions
> +xsessions = %%LOCALBASE%%/share/xsessions
>diff --git a/x11/ly/files/patch-src_config.c b/x11/ly/files/patch-src_config.c
>index 7d84e59f7..fd8a595fd 100644
>--- a/x11/ly/files/patch-src_config.c
>+++ b/x11/ly/files/patch-src_config.c
>@@ -24,7 +24,7 @@
>  	};
>  
> -	uint16_t map_len[] = {34};
>-+	uint16_t map_len[] = {35};
>++	uint16_t map_len[] = {40};
>  	struct configator_param* map[] =
>  	{
>  		map_no_section,
>diff --git a/x11/ly/files/patch-src_draw.c b/x11/ly/files/patch-src_draw.c
>deleted file mode 100644
>index cab29b25f..000000000
>--- a/x11/ly/files/patch-src_draw.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/draw.c.orig	2022-02-04 14:30:20 UTC
>-+++ src/draw.c
>-@@ -47,7 +47,7 @@ void draw_init(struct term_buf* buf)
>- 		+ (config.input_len + 1)
>- 		+ buf->labels_max_len;
>- 
>--#if defined(__linux__)
>-+#if defined(__linux__) || defined(__FreeBSD__)
>- 	buf->box_chars.left_up = 0x250c;
>- 	buf->box_chars.left_down = 0x2514;
>- 	buf->box_chars.right_up = 0x2510;
>diff --git a/x11/ly/files/patch-src_login.c b/x11/ly/files/patch-src_login.c
>index 8aeff4993..38ebb55e7 100644
>--- a/x11/ly/files/patch-src_login.c
>+++ b/x11/ly/files/patch-src_login.c
>@@ -1,7 +1,6 @@
>-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 @@
>+--- src/login.c.orig	2023-07-02 19:12:26.395407000 +0200
>++++ src/login.c	2023-07-02 19:34:02.260778000 +0200
>+@@ -19,7 +19,7 @@
>  #include <sys/stat.h>
>  #include <sys/wait.h>
>  #include <unistd.h>
>@@ -10,39 +9,43 @@ diff -ru bak.ly-0.5.2/src/login.c ly-0.5.2/src/login.c
>  #include <xcb/xcb.h>
>  
>  int get_free_display()
>-@@ -213,6 +213,11 @@
>+@@ -214,13 +214,13 @@
>  	// clean env
>  	environ[0] = NULL;
>+ 	
>+-	setenv("TERM", term ? term : "linux", 1);
>++	setenv("TERM", term ? term : "xterm", 1);
>+ 	setenv("HOME", pwd->pw_dir, 1);
>+ 	setenv("PWD", pwd->pw_dir, 1);
>+ 	setenv("SHELL", pwd->pw_shell, 1);
>+ 	setenv("USER", pwd->pw_name, 1);
>+ 	setenv("LOGNAME", pwd->pw_name, 1);
>+-	setenv("LANG", lang ? lang : "C", 1);
>++	setenv("LANG", lang ? lang : "C.UTF-8", 1);
>  
>-+	if (lang == NULL)
>-+	{
>-+		lang = "C.UTF-8";
>-+	}
>-+
>- 	if (term != NULL)
>- 	{
>- 		setenv("TERM", term, 1);
>-@@ -243,9 +248,15 @@
>+ 	// Set PATH if specified in the configuration
>+ 	if (strlen(config.path))
>+@@ -259,9 +259,15 @@
>  
>- void env_xdg(const char* tty_id, const enum display_server display_server)
>+ void env_xdg(const char* tty_id, const char* desktop_name)
>  {
>--	char user[15];
>--	snprintf(user, 15, "/run/user/%d", getuid());
>--	setenv("XDG_RUNTIME_DIR", user, 0);
>+-    char user[20];
>+-    snprintf(user, 20, "/run/user/%d", getuid());
>+-    setenv("XDG_RUNTIME_DIR", user, 0);
> +	// The "/run/user/%d" directory is not available on FreeBSD. It is much
> +	// better to stick to the defaults and let applications using
> +	// XDG_RUNTIME_DIR to fall back to directories inside user's home
> +	// directory.
> +	/*
>-+	 * char user[15];
>-+	 * snprintf(user, 15, "/run/user/%d", getuid());
>++	 * char user[20];
>++	 * snprintf(user, 20, "/run/user/%d", getuid());
> +	 * setenv("XDG_RUNTIME_DIR", user, 0);
> +	 */
>- 	setenv("XDG_SESSION_CLASS", "user", 0);
>- 	setenv("XDG_SEAT", "seat0", 0);
>- 	setenv("XDG_VTNR", tty_id, 0);
>-@@ -271,8 +282,8 @@
>- 	}
>+     setenv("XDG_SESSION_CLASS", "user", 0);
>+     setenv("XDG_SESSION_ID", "1", 0);
>+     setenv("XDG_SESSION_DESKTOP", desktop_name, 0);
>+@@ -269,8 +275,8 @@
>+     setenv("XDG_VTNR", tty_id, 0);
>  }
>  
> -void add_utmp_entry(
>@@ -52,7 +55,7 @@ diff -ru bak.ly-0.5.2/src/login.c ly-0.5.2/src/login.c
>  	char *username,
>  	pid_t display_pid
>  ) {
>-@@ -283,24 +294,23 @@
>+@@ -281,24 +287,22 @@
>  	/* only correct for ptys named /dev/tty[pqr][0-9a-z] */
>  	strcpy(entry->ut_id, ttyname(STDIN_FILENO) + strlen("/dev/tty"));
>  
>@@ -72,14 +75,14 @@ diff -ru bak.ly-0.5.2/src/login.c ly-0.5.2/src/login.c
>  }
>  
> -void remove_utmp_entry(struct utmp *entry) {
>-+void remove_utmpx_entry(struct utmpx *entry) {
>- 	entry->ut_type = DEAD_PROCESS;
>+-	entry->ut_type = DEAD_PROCESS;
> -	memset(entry->ut_line, 0, UT_LINESIZE);
> -	entry->ut_time = 0;
> -	memset(entry->ut_user, 0, UT_NAMESIZE);
> -	setutent();
> -	pututline(entry);
> -	endutent();
>++void remove_utmpx_entry(struct utmpx *entry) {
> +	memset(entry->ut_line, 0, sizeof(entry->ut_line));
> +	entry->ut_tv.tv_sec = 0;
> +	memset(entry->ut_user, 0, sizeof(entry->ut_user));
>@@ -88,22 +91,24 @@ diff -ru bak.ly-0.5.2/src/login.c ly-0.5.2/src/login.c
> +	endutxent();
>  }
>  
>- void xauth(const char* display_name, const char* shell, const char* dir)
>-@@ -581,7 +591,7 @@
>- 		char vt[5];
>+ void xauth(const char* display_name, const char* shell, char* pwd)
>+@@ -616,7 +620,7 @@
>  
>- 		snprintf(tty_id, 3, "%d", config.tty);
>+ 		// get a display
>+ 		char vt[5];
> -		snprintf(vt, 5, "vt%d", config.tty);
> +		snprintf(vt, 5, "vt%d", config.vt);
>  
>- 		// set env
>+ 		// set env (this clears the environment)
>  		env_init(pwd);
>-@@ -636,13 +646,13 @@
>+@@ -670,14 +674,14 @@
>+ 		exit(EXIT_SUCCESS);
>  	}
>  
>- 	// add utmp audit
>+-	// add utmp audit
> -	struct utmp entry;
> -	add_utmp_entry(&entry, pwd->pw_name, pid);
>++	// add utmpx audit
> +	struct utmpx entry;
> +	add_utmpx_entry(&entry, pwd->pw_name, pid);
>  
>-- 
>2.40.1
>

Actions: View | Diff

Attachments on bug 272368: 243205 | 243750 | 243751