From f6b0901df9118c840758c12dfcf4eb798ee2075a Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 9 Feb 2018 17:21:59 +0000
Subject: [PATCH] hostname: Update to 3.20

Drops dependency to obsolete RPCSVC code in glibc.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/hostname |  8 ----
 lfs/hostname                     |  8 ++--
 src/patches/hostname-rh.patch    | 69 --------------------------------
 3 files changed, 4 insertions(+), 81 deletions(-)
 delete mode 100644 src/patches/hostname-rh.patch

diff --git a/config/rootfiles/common/hostname b/config/rootfiles/common/hostname
index 83cbfc4508..7378b8dcf4 100644
--- a/config/rootfiles/common/hostname
+++ b/config/rootfiles/common/hostname
@@ -1,10 +1,2 @@
-bin/dnsdomainname
-bin/domainname
 bin/hostname
-bin/nisdomainname
-bin/ypdomainname
-#usr/share/man/man1/dnsdomainname.1
-#usr/share/man/man1/domainname.1
 #usr/share/man/man1/hostname.1
-#usr/share/man/man1/nisdomainname.1
-#usr/share/man/man1/ypdomainname.1
diff --git a/lfs/hostname b/lfs/hostname
index feac3a0f8d..02b0656516 100644
--- a/lfs/hostname
+++ b/lfs/hostname
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.15
+VER        = 3.20
 
 THISAPP    = hostname_$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f93c87de2517850de5f47234e3bcb563
+$(DL_FILE)_MD5 = 9919d0f4e0a70a0d4161deef729e8514
 
 install : $(TARGET)
 
@@ -70,8 +70,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/hostname-rh.patch
 	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install BINDIR=/bin
+	cd $(DIR_APP) && install -m 755 hostname /bin
+	cd $(DIR_APP) && install hostname.1 /usr/share/man/man1
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/patches/hostname-rh.patch b/src/patches/hostname-rh.patch
deleted file mode 100644
index d56ae59a93..0000000000
--- a/src/patches/hostname-rh.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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
-@@ -80,6 +80,28 @@ complete FQDN of the system is returned
- .B "THE FQDN"
- below).
- 
-+.LP
-+The function 
-+.BR gethostname(2)
-+is used to get the hostname.  When the 
-+.BR "hostname \-a, \-d, \-f or \-i" 
-+is called will 
-+.BR gethostbyname(3)
-+be called.  The difference in 
-+.BR gethostname(2)
-+and
-+.BR gethostbyname(3)
-+is that
-+.BR gethostbyname(3)
-+is network aware, so it consults 
-+.IR /etc/nsswitch.conf
-+and
-+.IR /etc/host.conf
-+to decide whether to read information in
-+.IR /etc/hostname
-+or
-+.IR /etc/hosts
-+
- .SS "SET NAME"
- When called with one argument or with the
- .B \-\-file
-@@ -105,8 +127,7 @@ command (see
- .B "THE FQDN"
- below).
- .LP
--The host name is usually set once at system startup in
--.I /etc/init.d/hostname.sh
-+The host name is usually set once at system startup
- (normally by reading the contents of a file which contains
- the host name, e.g.
- .IR /etc/hostname ).
-- 
2.39.5