From af66b1c4af659b9640fc5fafd4d86db144649577 Mon Sep 17 00:00:00 2001 From: "Dr. Tilmann Bubeck" Date: Thu, 20 Aug 2020 19:36:06 +0200 Subject: [PATCH] Fix RHBZ #1870201 --- ISSOCK.patch | 21 +++++++++++++++++++++ xorg-x11-xauth.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ISSOCK.patch diff --git a/ISSOCK.patch b/ISSOCK.patch new file mode 100644 index 0000000..88a296e --- /dev/null +++ b/ISSOCK.patch @@ -0,0 +1,21 @@ +diff -r -u xauth-1.0.10-orig/gethost.c xauth-1.0.10/gethost.c +--- xauth-1.0.10-orig/gethost.c 2017-01-29 22:00:12.000000000 +0100 ++++ xauth-1.0.10/gethost.c 2020-08-20 16:18:08.399196240 +0200 +@@ -202,14 +202,14 @@ + strncpy(path, fulldpyname, sizeof(path)); + path[sizeof(path) - 1] = '\0'; + #endif +- if (0 == stat(path, &sbuf)) { ++ if (0 == stat(path, &sbuf) && S_ISSOCK(sbuf.st_mode) ) { + is_path_to_socket = 1; + } else { + char *dot = strrchr(path, '.'); + if (dot) { + *dot = '\0'; + /* screen = atoi(dot + 1); */ +- if (0 == stat(path, &sbuf)) { ++ if (0 == stat(path, &sbuf) && S_ISSOCK(sbuf.st_mode)) { + is_path_to_socket = 1; + } + } +Nur in xauth-1.0.10: gethost.c~. diff --git a/xorg-x11-xauth.spec b/xorg-x11-xauth.spec index 52da7c5..27fcdd3 100644 --- a/xorg-x11-xauth.spec +++ b/xorg-x11-xauth.spec @@ -3,13 +3,14 @@ Summary: X.Org X11 X authority utilities Name: xorg-x11-%{pkgname} Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} # NOTE: Remove Epoch line if package gets renamed Epoch: 1 License: MIT URL: https://www.x.org Source0: https://www.x.org/pub/individual/app/%{pkgname}-%{version}.tar.bz2 +Patch0: ISSOCK.patch BuildRequires: pkgconfig automake gcc BuildRequires: libX11-devel @@ -29,6 +30,7 @@ used in connecting to an X server. %prep %setup -q -n %{pkgname}-%{version} +%patch0 -p1 %build %configure @@ -48,6 +50,9 @@ make check || cat tests/test-suite.log %{_mandir}/man1/xauth.1* %changelog +* Thu Aug 20 2020 Tilmann Bubeck - 1:1.1-6 +- Fix RHBZ #1870201 + * Wed Jul 29 2020 Fedora Release Engineering - 1:1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild