git: 3312d027696f - main - x11/xtrans: Don't unlink X11 Unix sockets.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Fri, 01 Sep 2023 11:48:55 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3312d027696ff994d07c434a2baaba1f5b18d998

commit 3312d027696ff994d07c434a2baaba1f5b18d998
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2023-09-01 11:43:07 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2023-09-01 11:47:43 +0000

    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
---
 net/tigervnc-server/Makefile        | 2 +-
 x11-fonts/libFS/Makefile            | 1 +
 x11-fonts/libXfont/Makefile         | 2 +-
 x11-fonts/libXfont2/Makefile        | 1 +
 x11-fonts/xfs/Makefile              | 1 +
 x11-servers/xarcan/Makefile         | 2 +-
 x11-servers/xorg-server/Makefile    | 2 +-
 x11-servers/xwayland-devel/Makefile | 1 +
 x11/cinnamon-session/Makefile       | 2 +-
 x11/gnome-session/Makefile          | 2 +-
 x11/libICE/Makefile                 | 2 +-
 x11/libSM/Makefile                  | 1 +
 x11/libX11/Makefile                 | 1 +
 x11/mate-session-manager/Makefile   | 2 +-
 x11/xtrans/Makefile                 | 4 ++++
 x11/xtrans/distinfo                 | 2 ++
 16 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile
index 49aedad1e729..58521dc70fc0 100644
--- 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
index c51f826175da..48b0c392b09c 100644
--- 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
index e0750c7e4f5e..eca8f6929661 100644
--- 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
index d10550abf555..68af160d2f22 100644
--- 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
index b6a4235e631a..f0878131eef1 100644
--- 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
index 29b5becd63f1..8457c41e322e 100644
--- 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
index 06ab654918b0..089fe72c7c99 100644
--- 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
index 9523a1dce2d9..da21ae5d9f50 100644
--- 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
index 5323fe2e906e..ac7b0a1c80a2 100644
--- 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
index 34803627a6d7..19c81b255980 100644
--- 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
index f9eb9aecd771..2c1f6d44bd98 100644
--- 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
index a6bc98b9ea45..2123c493af6e 100644
--- 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
index 98834ffca38f..f75b3c0ee12d 100644
--- 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
index a145ce00de3b..0a7e2e19768d 100644
--- 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
index b6de999676f2..7454a2c7b6db 100644
--- 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
index 6f07674e064e..7ea1167b4c8d 100644
--- 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