commit
22e3981138
@ -0,0 +1 @@
|
|||||||
|
SOURCES/xhost-1.0.9.tar.xz
|
@ -0,0 +1 @@
|
|||||||
|
df18ebdec2f6d80fa7b745b8fdc28d637821ce23 SOURCES/xhost-1.0.9.tar.xz
|
@ -0,0 +1,50 @@
|
|||||||
|
From 26aaeb86431dc81234a46e63386a9a0b5c1f2af8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
Date: Fri, 28 Jun 2024 10:34:49 +1000
|
||||||
|
Subject: [PATCH app/xhost] Replace inet_addr()/inet_aton() with a call to
|
||||||
|
inet_pton()
|
||||||
|
|
||||||
|
We unconditionally require inet_pton() for our IPv6 check so let's use
|
||||||
|
the same call for the IPv4 check too. This removes the need for
|
||||||
|
inet_aton() which is labelled as deprecated because it doesn't support
|
||||||
|
IPv4.
|
||||||
|
---
|
||||||
|
configure.ac | 3 ---
|
||||||
|
xhost.c | 7 +------
|
||||||
|
2 files changed, 1 insertion(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 60a74c21e580..802eccb959ad 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -42,9 +42,6 @@ case $host_os in
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
-# Checks for library functions.
|
||||||
|
-AC_CHECK_FUNCS([inet_aton])
|
||||||
|
-
|
||||||
|
# Internationalization & localization support
|
||||||
|
AC_SEARCH_LIBS([gettext], [intl], [USE_GETTEXT="yes"], [USE_GETTEXT="no"])
|
||||||
|
AC_MSG_CHECKING([where to install localized messages])
|
||||||
|
diff --git a/xhost.c b/xhost.c
|
||||||
|
index 22304bd814b4..26ba179272bb 100644
|
||||||
|
--- a/xhost.c
|
||||||
|
+++ b/xhost.c
|
||||||
|
@@ -544,12 +544,7 @@ change_host(Display *dpy, char *name, Bool add)
|
||||||
|
* First see if inet_aton/inet_addr can grok the name; if so, then use it.
|
||||||
|
*/
|
||||||
|
if (((family == FamilyWild) || (family == FamilyInternet)) &&
|
||||||
|
-#ifdef HAVE_INET_ATON
|
||||||
|
- (inet_aton (name, &addr) != 0)
|
||||||
|
-#else
|
||||||
|
- ((addr.s_addr = inet_addr(name)) != -1)
|
||||||
|
-#endif
|
||||||
|
- ) {
|
||||||
|
+ (inet_pton (AF_INET, name, &addr) == 1)) {
|
||||||
|
ha.family = FamilyInternet;
|
||||||
|
ha.length = sizeof(addr.s_addr);
|
||||||
|
ha.address = (char *) &addr.s_addr;
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
@ -0,0 +1,85 @@
|
|||||||
|
Name: xhost
|
||||||
|
Version: 1.0.9
|
||||||
|
Release: 8%{?dist}
|
||||||
|
Summary: Manage hosts or users allowed to connect to the X server
|
||||||
|
|
||||||
|
License: MIT AND ICU
|
||||||
|
URL: https://www.x.org
|
||||||
|
Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch01: 0001-Replace-inet_addr-inet_aton-with-a-call-to-inet_pton.patch
|
||||||
|
|
||||||
|
BuildRequires: automake libtool
|
||||||
|
BuildRequires: gcc make gettext
|
||||||
|
BuildRequires: pkgconfig(x11)
|
||||||
|
BuildRequires: pkgconfig(xmu)
|
||||||
|
BuildRequires: pkgconfig(xau)
|
||||||
|
BuildRequires: pkgconfig(xtrans)
|
||||||
|
BuildRequires: pkgconfig(xorg-macros) >= 1.8
|
||||||
|
|
||||||
|
Obsoletes: xorg-x11-server-utils < 7.7-40
|
||||||
|
|
||||||
|
%description
|
||||||
|
xhost is used to manage the list of host names or user names
|
||||||
|
allowed to make connections to the X server.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup
|
||||||
|
|
||||||
|
%build
|
||||||
|
autoreconf -v --install
|
||||||
|
%configure --disable-silent-rules
|
||||||
|
%make_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license COPYING
|
||||||
|
%{_bindir}/%{name}
|
||||||
|
%{_mandir}/man1/%{name}.1*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Fri Jun 28 2024 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.9-8
|
||||||
|
- Replace inet_aton() with inet_pton() to silence rpminspect
|
||||||
|
|
||||||
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.0.9-7
|
||||||
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Sep 08 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.9-5
|
||||||
|
- SPDX migration
|
||||||
|
|
||||||
|
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Dec 13 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.9-2
|
||||||
|
- add xgettext to build requires
|
||||||
|
|
||||||
|
* Tue Dec 13 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.9-1
|
||||||
|
- xhost 1.0.9
|
||||||
|
|
||||||
|
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 06 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.8-1
|
||||||
|
- xhost 1.0.8
|
||||||
|
|
||||||
|
* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.7-2
|
||||||
|
- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754)
|
||||||
|
|
||||||
|
* Wed Mar 03 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.7-1
|
||||||
|
- Split xhost out from xorg-x11-server-utils into a separate package
|
||||||
|
(#1934386)
|
||||||
|
|
Loading…
Reference in new issue