Compare commits

...

No commits in common. "c8" and "imports/c9-beta/xorg-x11-xauth-1.1-10.el9" have entirely different histories.

4 changed files with 70 additions and 7 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/xauth-1.0.9.tar.bz2 SOURCES/xauth-1.1.tar.bz2

View File

@ -1 +1 @@
5d1f9f59aea271af8fc098cedef469f7a9337747 SOURCES/xauth-1.0.9.tar.bz2 16180e36d75a23cb182cb91e78f24273f1a63967 SOURCES/xauth-1.1.tar.bz2

21
SOURCES/ISSOCK.patch Normal file
View File

@ -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~.

View File

@ -2,16 +2,17 @@
Summary: X.Org X11 X authority utilities Summary: X.Org X11 X authority utilities
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 1.0.9 Version: 1.1
Release: 12%{?dist} Release: 10%{?dist}
# NOTE: Remove Epoch line if package gets renamed # NOTE: Remove Epoch line if package gets renamed
Epoch: 1 Epoch: 1
License: MIT License: MIT
Group: User Interface/X
URL: https://www.x.org URL: https://www.x.org
Source0: https://www.x.org/pub/individual/app/%{pkgname}-%{version}.tar.bz2 Source0: https://www.x.org/pub/individual/app/%{pkgname}-%{version}.tar.bz2
Patch0: ISSOCK.patch
BuildRequires: make
BuildRequires: pkgconfig automake gcc BuildRequires: pkgconfig automake gcc
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: libXau-devel BuildRequires: libXau-devel
@ -30,23 +31,64 @@ used in connecting to an X server.
%prep %prep
%setup -q -n %{pkgname}-%{version} %setup -q -n %{pkgname}-%{version}
%patch0 -p1
%build %build
%configure %configure
make %{?_smp_mflags} %make_build
%install %install
%make_install %make_install
%if 0
%check %check
make check || cat tests/test-suite.log make check || cat tests/test-suite.log
%endif
%files %files
%doc COPYING README %doc COPYING README.md
%{_bindir}/xauth %{_bindir}/xauth
%{_mandir}/man1/xauth.1* %{_mandir}/man1/xauth.1*
%changelog %changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.1-10
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.1-9
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 05 2020 Peter Hutterer <peter.hutterer@redhat.com> 1:1.1-7
- Add BuildRequires for make
* Thu Aug 20 2020 Tilmann Bubeck <bubeck@fedoraproject.org> - 1:1.1-6
- Fix RHBZ #1870201
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1:1.1-4
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 11 2019 Adam Jackson <ajax@redhat.com> - 1:1.1-1
- xauth 1.1
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.9-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.9-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Mar 19 2018 Adam Jackson <ajax@redhat.com> - 1.0.9-12 * Mon Mar 19 2018 Adam Jackson <ajax@redhat.com> - 1.0.9-12
- Nerf the python-related BuildRequires. They're only needed for 'make check', - Nerf the python-related BuildRequires. They're only needed for 'make check',
and cmdtest is not yet a python3 package. and cmdtest is not yet a python3 package.