diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 9cd9a48..a5e85fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,2 @@ -hostname_3.04.tar.gz -/hostname_3.05.tar.gz -/hostname_3.06.tar.gz -/hostname_3.07.tar.gz -/hostname_3.08.tar.gz -/hostname_3.09.tar.gz -/hostname_3.10.tar.gz -/hostname_3.11.tar.gz -/hostname_3.12.tar.gz -/hostname_3.13.tar.gz -/hostname_3.14.tar.gz -/hostname_3.15.tar.gz +/gpl-2.0.txt +/hostname_*.tar.xz diff --git a/changelog b/changelog new file mode 100644 index 0000000..599e045 --- /dev/null +++ b/changelog @@ -0,0 +1,185 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 3.23-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_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 + +* Thu May 31 2018 David Kaspar [Dee'Kej] - 3.20-5 +- nis-domainname.service moved here from initscripts package + +* Wed Mar 7 2018 Pavel Zhukov - 3.20-4 +- Add gcc to BuildRequires + +* Wed Feb 07 2018 Fedora Release Engineering - 3.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Feb 1 2018 Florian Weimer - 3.20-2 +- Build with linker flags from redhat-rpm-config + +* Thu Feb 1 2018 Pavel Zhukov - 3.20-1 +- New version 3.20 + +* Wed Jan 31 2018 Pavel Zhukov - 3.19-2 +- New version 3.19 + +* Wed Aug 02 2017 Fedora Release Engineering - 3.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Aug 10 2016 Pavel Šimerda - 3.18-1 +- New version 3.18 + +* Wed Feb 03 2016 Fedora Release Engineering - 3.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 3.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 3.15-5 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Sat Aug 16 2014 Fedora Release Engineering - 3.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jul 12 2014 Tom Callaway - 3.15-3 +- fix license handling + +* Sat Jun 07 2014 Fedora Release Engineering - 3.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Nov 04 2013 Jiri Popelka - 3.15-1 +- 3.15 + +* Wed Oct 16 2013 Jiri Popelka - 3.14-3 +- use BINDIR + +* Mon Oct 14 2013 Jaromír Končický - 3.14-2 +- Install binaries into /usr/bin + +* Sun Sep 08 2013 Jiri Popelka - 3.14-1 +- 3.14 + +* Sat Aug 03 2013 Fedora Release Engineering - 3.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jun 18 2013 Jiri Popelka - 3.13-1 +- 3.13: -v references removed upstream + +* Tue Mar 26 2013 Jiri Popelka - 3.12-4 +- remove void -v option from --help + +* Fri Mar 08 2013 Jiri Popelka - 3.12-3 +- do not ship outdated french man pages (#919198) + +* Thu Feb 14 2013 Fedora Release Engineering - 3.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Dec 07 2012 Jiri Popelka - 3.12-1 +- 3.12: man page improvements + +* Fri Nov 30 2012 Jiri Popelka - 3.11-4 +- revert /usr move for now + +* Fri Nov 30 2012 Jiri Popelka - 3.11-3 +- remove some rh-specific bits from rh.patch as they are no longer valid (#881913) +- remove outdated de & pt man pages +- /usr move: use _bindir macro + +* Thu Jul 19 2012 Fedora Release Engineering - 3.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 21 2012 Jiri Popelka - 3.11-1 +- 3.11 + +* Wed Jan 18 2012 Jiri Popelka - 3.10-1 +- 3.10 + +* Fri Jan 13 2012 Fedora Release Engineering - 3.09-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 29 2011 Jiri Popelka - 3.09-1 +- 3.09 + +* Sat Dec 24 2011 Jiri Popelka - 3.08-1 +- 3.08 + +* Fri Dec 23 2011 Jiri Popelka - 3.07-1 +- 3.07 + +* Mon Mar 07 2011 Jiri Popelka - 3.06-1 +- 3.06 + +* Wed Feb 09 2011 Fedora Release Engineering - 3.05-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Nov 16 2010 Jiri Popelka - 3.05-1 +- 3.05 + +* Fri Apr 30 2010 Ville Skyttä - 3.04-2 +- Mark localized man pages with %%lang. + +* Thu Mar 25 2010 Jiri Popelka - 3.04-1 +- 3.04 + +* Tue Feb 02 2010 Jiri Popelka - 3.03-1 +- 3.03 + +* Tue Nov 10 2009 Jiri Popelka - 3.01-1 +- Initial package. Up to now hostname has been part of net-tools package. +- This package is based on Debian's hostname because Debian has had hostname + as separate package since 1997 and the code is much better then the old one + contained in net-tools. diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..ce1b655 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,16 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_testing] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +#gating rawhide +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/gpl-2.0.txt b/gpl-2.0.txt deleted file mode 100644 index d159169..0000000 --- a/gpl-2.0.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/hostname-rh.patch b/hostname-rh.patch index 761cdbf..2d1d151 100644 --- a/hostname-rh.patch +++ b/hostname-rh.patch @@ -1,44 +1,9 @@ -diff -up hostname/Makefile.rh hostname/Makefile ---- hostname/Makefile.rh 2013-11-04 10:12:59.670379153 +0100 -+++ hostname/Makefile 2013-11-04 10:15:04.957314495 +0100 -@@ -10,21 +10,17 @@ OBJS=hostname.o - - hostname: $(OBJS) - $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -lnsl -- ln -fs hostname dnsdomainname -- ln -fs hostname domainname -- ln -fs hostname ypdomainname -- ln -fs hostname nisdomainname - - install: hostname - install -d ${BASEDIR}$(MANDIR)/man1 -- install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 -+ install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 - ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1 - ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1 - ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1 - ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1 - - install -d ${BASEDIR}$(BINDIR) -- install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR) -+ install -m 0755 hostname ${BASEDIR}$(BINDIR) - ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname - ln -fs hostname ${BASEDIR}$(BINDIR)/domainname - ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname -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 -@@ -70,7 +70,7 @@ - and - .BR nisdomainname - use the --.BR yp_get_default_domain (3). -+.BR getdomainname (2). - .LP - .B dnsdomainname - will print the domain part of the FQDN (Fully Qualified Domain Name). The -@@ -80,6 +80,28 @@ complete FQDN of the system is returned - .B "THE FQDN" +diff --git a/hostname.1 b/hostname.1 +index 74dd306..02eefa7 100644 +--- a/hostname.1 ++++ b/hostname.1 +@@ -80,6 +80,28 @@ complete FQDN of the system is returned with + .B THE FQDN below). +.LP @@ -53,7 +18,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 @@ -67,7 +32,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 8c2c4fe..4ad0e49 100644 --- a/hostname.spec +++ b/hostname.spec @@ -1,12 +1,18 @@ Summary: Utility to set/show the host name or domain name Name: hostname -Version: 3.15 -Release: 8%{?dist} -License: GPLv2+ -Group: System Environment/Base -URL: http://packages.qa.debian.org/h/hostname.html -Source0: http://ftp.de.debian.org/debian/pool/main/h/hostname/hostname_%{version}.tar.gz +Version: 3.25 +Release: %autorelease +License: GPL-2.0-or-later +URL: https://tracker.debian.org/pkg/hostname +Source0: https://ftp.debian.org/debian/pool/main/h/hostname/hostname_%{version}.tar.xz 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. # Initial changes Patch1: hostname-rh.patch @@ -17,14 +23,33 @@ DNS name, and to display or set its hostname or NIS domain name. %prep %setup -q -n hostname -cp %{SOURCE1} . -%patch1 -p1 -b .rh +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} . +%patch -P 1 -p1 %build -make CFLAGS="%{optflags} $CFLAGS" +make CFLAGS="%{optflags} $CFLAGS -D_GNU_SOURCE" LDFLAGS="$RPM_LD_FLAGS" %install -make BASEDIR=%{buildroot} BINDIR=%{_bindir} install +make DESTDIR=%{buildroot} install + +install -m 0755 -d %{buildroot}%{_libexecdir}/%{name} +install -m 0755 -d %{buildroot}%{_prefix}/lib/systemd/system +install -m 0755 nis-domainname %{buildroot}%{_libexecdir}/%{name} +install -m 0644 nis-domainname.service %{buildroot}%{_prefix}/lib/systemd/system + +%post +if [ $1 -eq 1 ]; then + # Initial installation... + systemctl --no-reload preset nis-domainname.service &>/dev/null || : +fi + +%preun +if [ $1 -eq 0 ]; then + # Package removal, not upgrade... + systemctl --no-reload disable --now nis-domainname.service &>/dev/null || : +fi + +# NOTE: Nothing to do for upgrade (in postun), nis-domainname.service is oneshot. %files %doc COPYRIGHT @@ -32,109 +57,8 @@ make BASEDIR=%{buildroot} BINDIR=%{_bindir} install %license gpl-2.0.txt %{_bindir}/* %{_mandir}/man1/* +%{_prefix}/lib/systemd/system/* +%{_libexecdir}/%{name} %changelog -* Fri Jun 30 2017 Pavel Zhukov - 3.15-8 -- Man page: change yp_get_default_domain with getdomainname (#1168989) - -* Wed Feb 03 2016 Fedora Release Engineering - 3.15-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 3.15-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 21 2015 Till Maas - 3.15-5 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Sat Aug 16 2014 Fedora Release Engineering - 3.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jul 12 2014 Tom Callaway - 3.15-3 -- fix license handling - -* Sat Jun 07 2014 Fedora Release Engineering - 3.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Nov 04 2013 Jiri Popelka - 3.15-1 -- 3.15 - -* Wed Oct 16 2013 Jiri Popelka - 3.14-3 -- use BINDIR - -* Mon Oct 14 2013 Jaromír Končický - 3.14-2 -- Install binaries into /usr/bin - -* Sun Sep 08 2013 Jiri Popelka - 3.14-1 -- 3.14 - -* Sat Aug 03 2013 Fedora Release Engineering - 3.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 18 2013 Jiri Popelka - 3.13-1 -- 3.13: -v references removed upstream - -* Tue Mar 26 2013 Jiri Popelka - 3.12-4 -- remove void -v option from --help - -* Fri Mar 08 2013 Jiri Popelka - 3.12-3 -- do not ship outdated french man pages (#919198) - -* Thu Feb 14 2013 Fedora Release Engineering - 3.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Dec 07 2012 Jiri Popelka - 3.12-1 -- 3.12: man page improvements - -* Fri Nov 30 2012 Jiri Popelka - 3.11-4 -- revert /usr move for now - -* Fri Nov 30 2012 Jiri Popelka - 3.11-3 -- remove some rh-specific bits from rh.patch as they are no longer valid (#881913) -- remove outdated de & pt man pages -- /usr move: use _bindir macro - -* Thu Jul 19 2012 Fedora Release Engineering - 3.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 21 2012 Jiri Popelka - 3.11-1 -- 3.11 - -* Wed Jan 18 2012 Jiri Popelka - 3.10-1 -- 3.10 - -* Fri Jan 13 2012 Fedora Release Engineering - 3.09-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Dec 29 2011 Jiri Popelka - 3.09-1 -- 3.09 - -* Sat Dec 24 2011 Jiri Popelka - 3.08-1 -- 3.08 - -* Fri Dec 23 2011 Jiri Popelka - 3.07-1 -- 3.07 - -* Mon Mar 07 2011 Jiri Popelka - 3.06-1 -- 3.06 - -* Wed Feb 09 2011 Fedora Release Engineering - 3.05-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 16 2010 Jiri Popelka - 3.05-1 -- 3.05 - -* Fri Apr 30 2010 Ville Skyttä - 3.04-2 -- Mark localized man pages with %%lang. - -* Thu Mar 25 2010 Jiri Popelka - 3.04-1 -- 3.04 - -* Tue Feb 02 2010 Jiri Popelka - 3.03-1 -- 3.03 - -* Tue Nov 10 2009 Jiri Popelka - 3.01-1 -- Initial package. Up to now hostname has been part of net-tools package. -- This package is based on Debian's hostname because Debian has had hostname - as separate package since 1997 and the code is much better then the old one - contained in net-tools. +%autochangelog diff --git a/nis-domainname b/nis-domainname new file mode 100755 index 0000000..b8d1059 --- /dev/null +++ b/nis-domainname @@ -0,0 +1,10 @@ +#!/usr/bin/bash + +source /etc/sysconfig/network + +if [ -n "${NISDOMAIN}" ] && [ -x /usr/bin/nisdomainname ]; then + nisdomainname ${NISDOMAIN} + exit $? +fi + +exit 0 diff --git a/nis-domainname.service b/nis-domainname.service new file mode 100644 index 0000000..9c92742 --- /dev/null +++ b/nis-domainname.service @@ -0,0 +1,14 @@ +[Unit] +Description=Read and set NIS domainname from /etc/sysconfig/network +Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service sysinit.target +DefaultDependencies=no +Conflicts=shutdown.target +ConditionPathExists=/etc/sysconfig/network + +[Service] +ExecStart=/usr/libexec/hostname/nis-domainname +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/plans/all.fmf b/plans/all.fmf new file mode 100644 index 0000000..bab1e43 --- /dev/null +++ b/plans/all.fmf @@ -0,0 +1,6 @@ +summary: Test plan with all Fedora tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/hostname.git +execute: + how: tmt diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..0e7f58d --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,6 @@ +--- +badfuncs: + allowed: + # hostname uses gethostbyname (safely) to display alias name(s). + /usr/bin/hostname: + - gethostbyname diff --git a/sources b/sources index aa657a7..2726704 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -f93c87de2517850de5f47234e3bcb563 hostname_3.15.tar.gz +SHA512 (hostname_3.25.tar.xz) = 57b8e741cd3d895112d93ca8a7cbec95f3ad1a90c5691377ab8b242906bdcb932fa3401159432ec86f24bbbfe24c078832792c70e62e8d65a2317ee05a5efc64 +SHA512 (gpl-2.0.txt) = aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957