From nobody Wed Dec 13 09:39:43 2023 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 4Sqr6l6gQ2z53VMV; Wed, 13 Dec 2023 09:39:43 +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 4Sqr6l5T82z4Lmt; Wed, 13 Dec 2023 09:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702460383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wRs14WIUSbxxqKT12zuHNGWlTKUrX6BP4cKm8ROuUl4=; b=qrb46hdnopJ6WMHmwf2CARKeyuZZe6oGEWxRGV1x+P7jqXndQMOAK7i1dzBruKFgfHbGmT rzZn/4d0YoNUzVYOXFoURKrHfn8b54MEBJldFTMGR4ACFNzk1sAsGWSruCGXkMgFshDC0Y jlJB08mwo7NDOpxI/Yo3QOjJKod63JUc7CzdZtl2tORO1HH/XUiNMP1Doo+CW2x8/30T+W BYD3Je4/IVzlH0XSeN2mOG8jLkcDobBd5cGMcAQbcqKHqZ0brfuTMjclwDcv3lgeEzbcso 4BpQrqMSlLQzjNgOJEdbO+dWzDakCtMNcNUxOfFnkq6of+XYtaSOT4w7jOg9zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702460383; a=rsa-sha256; cv=none; b=x4EpdepGflKiGjFpZlbwLJZN+k0igo/+Jcq+1hNoIXhZk4zSL4eUVG3reMZIx2Lwy032Kd IXeqzAYKoaMdSzXuKjcdPlGhMy0XQoOnMuYD9/d3nk04GEUm5egDC7xzXbePN8wTDZbpoX rRrAsHZfErbOhhWXMz3b5+exRfn+1PLZTHenN24yu7p9z3Zdu5afj2raRuvVr71UUfMKCp J9MY+dCzwGpVUZLjdq/KgAejr844U8SXZl/tlwNHO8am6TyBF6r4K6WZ4/NRPCF+jUpQDv EjM7MdTVOqOu6ykadH8YA0Idl1tx6N8gwsnqODPfNebK/g8HbP5NxWflq+TPEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702460383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wRs14WIUSbxxqKT12zuHNGWlTKUrX6BP4cKm8ROuUl4=; b=p7461I/kUVt3h/Kj5l9qAXwGV380nAlwaQw+jTLJtQ79/xYZ7PREPGgDDANctVFM0Q0IpP C8dnnm41HyeOTqvWSSJHoQVXZpMqTr2ad+JDVMwQXxUUNWBBgDiADHxpHEU5XynwwOx9Ld z9I/Md20rnpNm5aTD3OE/qFO1G0UzpOHQzlafvpeugr0t1f92pnbTXCy6LLqmfOJ3cVzOm 0PXCNAPdJT6PhAvvnBc2VXU4q6Cykz7mRHc0AK513w2eLmHRoJNvSiQE/3W1Trp0TzS1fk NqrILN0MPz/jEqQrP2J66JUJlNZbeA88S0NfvLfncSL3UR9NR16JOmOy064zvw== 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 4Sqr6l4YglztFR; Wed, 13 Dec 2023 09:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BD9dhGj031164; Wed, 13 Dec 2023 09:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BD9dhOx031161; Wed, 13 Dec 2023 09:39:43 GMT (envelope-from git) Date: Wed, 13 Dec 2023 09:39:43 GMT Message-Id: <202312130939.3BD9dhOx031161@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8fc19c94fdb2 - main - x11-servers/xorg-server: Update to 21.1.10 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: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fc19c94fdb2996135426c90894c3cf0d6763994 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fc19c94fdb2996135426c90894c3cf0d6763994 commit 8fc19c94fdb2996135426c90894c3cf0d6763994 Author: Emmanuel Vadot AuthorDate: 2023-12-13 09:37:45 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-13 09:37:45 +0000 x11-servers/xorg-server: Update to 21.1.10 Security: CVE-2023-6377, CVE-2023-6478 Sponsored by: Beckhoff Automation GmbH & Co. KG --- x11-servers/xorg-server/Makefile | 4 +- x11-servers/xorg-server/distinfo | 6 +-- ...0002-xephyr_Dont_check_for_SeatId_anymore.patch | 63 ---------------------- 3 files changed, 4 insertions(+), 69 deletions(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index ccb282de8c63..2fbe0289c8ca 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= xorg -PORTVERSION= 21.1.9 +PORTVERSION= 21.1.10 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -14,8 +14,6 @@ LICENSE= MIT FLAVORS= xorg xnest xephyr xvfb FLAVOR?= ${FLAVORS:[1]} -EXTRA_PATCHES= ${FILESDIR}/0002-xephyr_Dont_check_for_SeatId_anymore.patch:-p1 - USES= compiler:c11 cpe gl meson pkgconfig tar:xz xorg USE_GL= gl diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index e45ad0c84119..85c455d1a009 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698308109 -SHA256 (xorg-server-21.1.9.tar.xz) = ff697be2011b4c4966b7806929e51b7a08e9d33800d505305d26d9ccde4b533a -SIZE (xorg-server-21.1.9.tar.xz) = 4935860 +TIMESTAMP = 1702448243 +SHA256 (xorg-server-21.1.10.tar.xz) = ceb0b3a2efc57ac3ccf388d3dc88b97615068639fb284d469689ae3d105611d0 +SIZE (xorg-server-21.1.10.tar.xz) = 4935984 diff --git a/x11-servers/xorg-server/files/0002-xephyr_Dont_check_for_SeatId_anymore.patch b/x11-servers/xorg-server/files/0002-xephyr_Dont_check_for_SeatId_anymore.patch deleted file mode 100644 index f0158bfe1ad3..000000000000 --- a/x11-servers/xorg-server/files/0002-xephyr_Dont_check_for_SeatId_anymore.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001 -From: nerdopolis -Date: Tue, 11 Jan 2022 18:41:42 -0500 -Subject: [PATCH] xephyr: Don't check for SeatId anymore - -After a change for the xserver to automatically determine the seat -based on the XDG_SEAT variable, xephyr stopped working. This was -because of an old feature where xephyr used to handle evdev -directly. This was dropped some time ago, and now this check is -not needed ---- - hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------ - 1 file changed, 16 insertions(+), 18 deletions(-) - -diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c -index 020461db2..09cd28cb3 100644 ---- a/hw/kdrive/ephyr/ephyrinit.c -+++ b/hw/kdrive/ephyr/ephyrinit.c -@@ -70,25 +70,23 @@ InitInput(int argc, char **argv) - KdKeyboardInfo *ki; - KdPointerInfo *pi; - -- if (!SeatId) { -- KdAddKeyboardDriver(&EphyrKeyboardDriver); -- KdAddPointerDriver(&EphyrMouseDriver); -- -- if (!kdHasKbd) { -- ki = KdNewKeyboard(); -- if (!ki) -- FatalError("Couldn't create Xephyr keyboard\n"); -- ki->driver = &EphyrKeyboardDriver; -- KdAddKeyboard(ki); -- } -+ KdAddKeyboardDriver(&EphyrKeyboardDriver); -+ KdAddPointerDriver(&EphyrMouseDriver); -+ -+ if (!kdHasKbd) { -+ ki = KdNewKeyboard(); -+ if (!ki) -+ FatalError("Couldn't create Xephyr keyboard\n"); -+ ki->driver = &EphyrKeyboardDriver; -+ KdAddKeyboard(ki); -+ } - -- if (!kdHasPointer) { -- pi = KdNewPointer(); -- if (!pi) -- FatalError("Couldn't create Xephyr pointer\n"); -- pi->driver = &EphyrMouseDriver; -- KdAddPointer(pi); -- } -+ if (!kdHasPointer) { -+ pi = KdNewPointer(); -+ if (!pi) -+ FatalError("Couldn't create Xephyr pointer\n"); -+ pi->driver = &EphyrMouseDriver; -+ KdAddPointer(pi); - } - - KdInitInput(); --- -GitLab -