x11/xtrans: Don't unlink X11 Unix sockets.

Without this change calling `Xorg -displayfd ..` would always make X to use :0 as the DISPLAY. This was a showstopper for running parallel desktop sessions. The leftover UDS' are cleaned up during system's boot by the /etc/rc.d/cleartmp service. Based on work of jbeich and Olivier Certner <olivier.freebsd@free.fr>. PR: 253277 Approved by: manu Sponsored by: Serenity Cybersecurity, LLC Differential Revision: https://reviews.freebsd.org/D30557
freebsd · Sep 1, 2023 · 3312d02 · 3312d02
1 parent 0e8db54
commit 3312d02
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 8 deletions.
diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-server
 
 COMMENT=	TigerVNC Server

diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libFS
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org

diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libXfont
 PORTVERSION=	1.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	x11-fonts
 

diff --git a/x11-fonts/libXfont2/Makefile b/x11-fonts/libXfont2/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libXfont2
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org

diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xfs
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 

diff --git a/x11-servers/xarcan/Makefile b/x11-servers/xarcan/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xarcan
 DISTVERSION=	0.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-servers
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xorg
 PORTVERSION=	21.1.8
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver

diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
@@ -2,6 +2,7 @@ PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	21.0.99.1-511
 DISTVERSIONSUFFIX=	-g8128a2155
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 

diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cinnamon-session
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gnome-session
 PORTVERSION=	42.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome

diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libICE
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 

diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libSM
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libX11
 DISTVERSION=	1.8.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 

diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mate-session-manager
 PORTVERSION=	1.26.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate

diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
@@ -1,7 +1,11 @@
 PORTNAME=	xtrans
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	x11
 
+PATCH_SITES=	https://gitlab.freedesktop.org/xorg/lib/libxtrans/-/commit/
+PATCHFILES+=	4e6763a5914c.patch:-p1 # https://gitlab.freedesktop.org/xorg/lib/libxtrans/-/merge_requests/8
+
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Abstract network code for X
 

diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1553322927
 SHA256 (xorg/lib/xtrans-1.4.0.tar.bz2) = 377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773
 SIZE (xorg/lib/xtrans-1.4.0.tar.bz2) = 185371
+SHA256 (xorg/lib/4e6763a5914c.patch) = cd4b2f8f98b43ae04eb3e4046668d9aa1374e065b836ea6a51f029e0658794ae
+SIZE (xorg/lib/4e6763a5914c.patch) = 1347