[rpms/openssh] rawhide: Remove support for abstract UNIX sockets

[Zoltan Fridrich <zfridric@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/openssh
            Branch : rawhide
            Commit : f48279187d5eeefbfa05d6294afe753bb3d1c61d
            Author : Zoltan Fridrich <zfridric@redhat.com>
            Date   : 2026-07-08T09:52:52+02:00
            Stats  : +4/-71 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/openssh/c/f48279187d5eeefbfa05d6294afe753bb3d1c61d?branch=rawhide

            Log:
            Remove support for abstract UNIX sockets

Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>

---
diff --git a/0008-openssh-7.2p2-x11.patch b/0008-openssh-7.2p2-x11.patch
deleted file mode 100644
index 055c596..0000000
--- a/0008-openssh-7.2p2-x11.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7c3ca5470c00d96996e40f449cb0a0465e81da95 Mon Sep 17 00:00:00 2001
-From: Dmitry Belyavskiy <beldmit@gmail.com>
-Date: Thu, 15 May 2025 13:43:28 +0200
-Subject: [PATCH 08/54] openssh-7.2p2-x11
-
----
- channels.c | 25 +++++++++++++++++++------
- 1 file changed, 19 insertions(+), 6 deletions(-)
-
-diff --git a/channels.c b/channels.c
-index d7c55fc89..71cc67d17 100644
---- a/channels.c
-+++ b/channels.c
-@@ -5178,11 +5178,13 @@ x11_create_display_inet(struct ssh *ssh, int x11_display_offset,
- }
- 
- static int
--connect_local_xsocket_path(const char *pathname)
-+connect_local_xsocket_path(const char *pathname, int len)
- {
- 	int sock;
- 	struct sockaddr_un addr;
- 
-+	if (len <= 0)
-+		return -1;
- 	sock = socket(AF_UNIX, SOCK_STREAM, 0);
- 	if (sock == -1) {
- 		error("socket: %.100s", strerror(errno));
-@@ -5190,11 +5192,12 @@ connect_local_xsocket_path(const char *pathname)
- 	}
- 	memset(&addr, 0, sizeof(addr));
- 	addr.sun_family = AF_UNIX;
--	strlcpy(addr.sun_path, pathname, sizeof addr.sun_path);
--	if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0)
-+	if (len > sizeof addr.sun_path)
-+		len = sizeof addr.sun_path;
-+	memcpy(addr.sun_path, pathname, len);
-+	if (connect(sock, (struct sockaddr *)&addr, sizeof addr - (sizeof addr.sun_path - len) ) == 0)
- 		return sock;
- 	close(sock);
--	error("connect %.100s: %.100s", addr.sun_path, strerror(errno));
- 	return -1;
- }
- 
-@@ -5099,8 +5102,19 @@
- connect_local_xsocket(u_int dnr)
- {
- 	char buf[1024];
--	snprintf(buf, sizeof buf, _PATH_UNIX_X, dnr);
--	return connect_local_xsocket_path(buf);
-+	int len, ret;
-+	len = snprintf(buf + 1, sizeof (buf) - 1, _PATH_UNIX_X, dnr);
-+#ifdef linux
-+	if (getenv("SSH_INSECURE_ABSTRACT_SOCKET_ENABLED") != NULL) {
-+		buf[0] = '\0';
-+		if ((ret = connect_local_xsocket_path(buf, len + 1)) >= 0)
-+			return ret;
-+	}
-+#endif
-+	if ((ret = connect_local_xsocket_path(buf + 1, len)) >= 0)
-+		return ret;
-+	error("connect %.100s: %.100s", buf + 1, strerror(errno));
-+	return -1;
- }
- 
- #ifdef __APPLE__
--- 
-2.53.0
-

diff --git a/openssh.spec b/openssh.spec
index f82c907..35e5be2 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -39,7 +39,7 @@
 Summary: An open source implementation of SSH protocol version 2
 Name: openssh
 Version: %{openssh_ver}
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.openssh.com/portable.html
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -68,7 +68,6 @@ Patch0004: 0004-openssh-6.6p1-keycat.patch
 Patch0005: 0005-openssh-6.6p1-allow-ip-opts.patch
 Patch0006: 0006-openssh-5.9p1-ipv6man.patch
 Patch0007: 0007-openssh-5.8p2-sigpipe.patch
-Patch0008: 0008-openssh-7.2p2-x11.patch
 Patch0009: 0009-openssh-5.1p1-askpass-progress.patch
 Patch0010: 0010-openssh-4.3p2-askpass-grab-info.patch
 Patch0011: 0011-openssh-8.7p1-redhat.patch
@@ -514,6 +513,9 @@ test -f %{sysconfig_anaconda} && \
 %attr(0755,root,root) %{_libdir}/sshtest/sk-dummy.so
 
 %changelog
+* Wed Jul 08 2026 Zoltan Fridrich <zfridric@redhat.com> - 10.3p1-7
+- Remove support for abstract UNIX sockets
+
 * Tue Jul 07 2026 Dmitry Belyavskiy <dbelyavs@redhat.com> - 10.3p1-6
 - Improve GSS KEX algorithms documentation
   Patches are submitted by xspielinbox+redhat@protonmail.com