diff --git a/.gitignore b/.gitignore index 4b17131..e48118c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/hostname_3.20.tar.gz -/hostname_3.20.tar.gz +hostname_3.23.tar.gz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 6063580..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - diff --git a/hostname-rh.patch b/hostname-rh.patch index 147c118..99f5477 100644 --- a/hostname-rh.patch +++ b/hostname-rh.patch @@ -22,7 +22,7 @@ diff -up hostname/hostname.1.rh hostname/hostname.1 --- hostname/hostname.1.rh 2013-11-03 15:24:23.000000000 +0100 +++ hostname/hostname.1 2013-11-04 10:12:59.670379153 +0100 @@ -80,6 +80,28 @@ complete FQDN of the system is returned - .B "THE FQDN" + .B THE FQDN below). +.LP @@ -37,7 +37,7 @@ diff -up hostname/hostname.1.rh hostname/hostname.1 +and +.BR gethostbyname(3) +is that -+.BR gethostbyname(3) ++.BR gethostbyname(5) +is network aware, so it consults +.IR /etc/nsswitch.conf +and @@ -51,7 +51,7 @@ diff -up hostname/hostname.1.rh hostname/hostname.1 When called with one argument or with the .B \-\-file @@ -105,8 +127,7 @@ command (see - .B "THE FQDN" + .B THE FQDN below). .LP -The host name is usually set once at system startup in diff --git a/hostname.spec b/hostname.spec index 534d9d4..48dd76f 100644 --- a/hostname.spec +++ b/hostname.spec @@ -1,15 +1,15 @@ Summary: Utility to set/show the host name or domain name Name: hostname -Version: 3.20 -Release: 7%{?dist}.0.1 -License: GPLv2+ -Group: System Environment/Base +Version: 3.23 +Release: 14%{?dist} +License: GPL-2.0-or-later URL: http://packages.qa.debian.org/h/hostname.html Source0: http://ftp.de.debian.org/debian/pool/main/h/hostname/hostname_%{version}.tar.gz Source1: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Source2: nis-domainname Source3: nis-domainname.service BuildRequires: gcc +BuildRequires: make # NOTE: We are *not* requiring systemd on purpose, because we want to allow # hostname package to be installed in containers without the systemd. @@ -24,7 +24,7 @@ DNS name, and to display or set its hostname or NIS domain name. %prep %setup -q -n hostname cp %{SOURCE1} %{SOURCE2} %{SOURCE3} . -%patch1 -p1 +%patch -P 1 -p1 %build make CFLAGS="%{optflags} $CFLAGS -D_GNU_SOURCE" LDFLAGS="$RPM_LD_FLAGS" @@ -58,14 +58,63 @@ fi %{_bindir}/* %{_mandir}/man1/* %{_prefix}/lib/systemd/system/* -%{_libexecdir}/%{name}/* +%{_libexecdir}/%{name} %changelog -* Thu Jun 03 2021 Carl George - 3.20-7.0.1 -- Manually revert 3.20-7 with positive release bump rhbz#1956378 +* Tue Oct 29 2024 Troy Dawson - 3.23-14 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Thu May 6 2021 Pavel Zhukov - 3.20-7 -- Nisdomainname service depends on network +* Mon Jun 24 2024 Troy Dawson - 3.23-13 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 3.23-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 3.23-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 02 2023 Martin Osvald - 3.23-10 +- SPDX migration + +* Thu Jul 20 2023 Fedora Release Engineering - 3.23-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.23-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 3.23-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.23-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 3.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 3.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Nov 14 2019 Pavel Zhukov - 3.23-1 +- New version 3.23 (#1771102) + +* Fri Aug 30 2019 Pavel Zhukov - 3.22-1 +- New release v3.22 (#1747011) + +* Thu Jul 25 2019 Fedora Release Engineering - 3.20-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Apr 3 2019 Pavel Zhukov - 3.20-7 +- Own whole libexec/hostname directory (#1695488) + +* Fri Feb 01 2019 Fedora Release Engineering - 3.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Fri Jul 13 2018 Fedora Release Engineering - 3.20-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index da2caed..ff71a58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hostname_3.20.tar.gz) = 43d143d135c1ec0a9f2c2bc1d96109a2916142f0dd6bf000e53a47c6a856b517cab491bbabf0370021ac0434e619f957be7c0cb72f7a51c8e8c6d19c3936c8ad +SHA512 (hostname_3.23.tar.gz) = aff70bc381ea58944e01f0cabfc674a273b18b0935a87737e16964c08c24382177cc3495368f88a877e293b7fbda76684979cc227eca93e4b033b9c3a975af01