Imported Upstream version 3.21

Change-Id: Ic8a13f506498e3fc7e356161544e46fceee48fd9
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/debian/changelog b/debian/changelog
index e94da24..93a41e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hostname (3.21) unstable; urgency=medium
+
+  * Minor fixes to the manpage.
+    Thanks to Bjarni Ingi Gislason <bjarniig@rhi.hi.is> (Closes: #900857)
+  * Bumped Standards-Version, no changes needed.
+
+ -- Michael Meskes <meskes@debian.org>  Thu, 27 Sep 2018 10:45:17 +0200
+
 hostname (3.20) unstable; urgency=medium
 
   * Removed old alioth list from maintainers field.

diff --git a/debian/control b/debian/control
index 38116a5..5563d88 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: hostname
 Section: admin
 Priority: required
 Maintainer: Michael Meskes <meskes@debian.org>
-Standards-Version: 4.1.3
+Standards-Version: 4.2.1.1
 Build-Depends: debhelper (>= 11)
 
 Package: hostname

diff --git a/hostname.1 b/hostname.1
index 5e345e7..346c40b 100644 (file)
--- a/hostname.1
+++ b/hostname.1
@@ -62,36 +62,36 @@ function.
 .LP
 .B domainname
 will print the NIS domainname of the system.
-.BR domainname
+.B domainname
 uses the
 .BR gethostname (2)
 function, while
-.BR ypdomainname
+.B ypdomainname
 and
-.BR nisdomainname
+.B nisdomainname
 use the
 .BR getdomainname (2).
 .LP
 .B dnsdomainname
 will print the domain part of the FQDN (Fully Qualified Domain Name). The
 complete FQDN of the system is returned with
-.BR "hostname \-\-fqdn"
+.B hostname \-\-fqdn
 (but see the warnings in section
-.B "THE FQDN"
+.B THE FQDN
 below).
 
 .SS "SET NAME"
 When called with one argument or with the
 .B \-\-file
 option, the commands set the host name or the NIS/YP domain name.
-.BR hostname
+.B hostname
 uses the
 .BR sethostname (2)
 function, while all of the three
-.BR domainname,
-.BR ypdomainname
+.BR domainname ,
+.B ypdomainname
 and
-.BR nisdomainname
+.B nisdomainname
 use
 .BR setdomainname (2).
 Note, that this is effective only until the next reboot.
@@ -102,7 +102,7 @@ Note, that only the super-user can change the names.
 It is not possible to set the FQDN or the DNS domain name with the
 .B dnsdomainname
 command (see
-.B "THE FQDN"
+.B THE FQDN
 below).
 .LP
 The host name is usually set once at system startup in
@@ -118,7 +118,7 @@ returns for the host name, such as,
 .IR ursula.example.com .
 It is usually the hostname followed by the DNS domain name (the part
 after the first dot).  You can check the FQDN using
-.B "hostname \-\-fqdn"
+.B hostname \-\-fqdn
 or the domain name using
 .BR "dnsdomainname" .
 .LP
@@ -154,10 +154,10 @@ If a machine has multiple network interfaces/addresses or is used in a
 mobile environment, then it may either have multiple FQDNs/domain names
 or none at all. Therefore avoid using
 .BR "hostname \-\-fqdn" ,
-.BR "hostname \-\-domain"
+.B hostname \-\-domain
 and
 .BR "dnsdomainname" .
-.BR "hostname \-\-ip-address"
+.B hostname \-\-ip-address
 is subject to the same limitations so it should be avoided as well.
 
 .SH OPTIONS
@@ -176,8 +176,8 @@ contain duplicate entries. Do not make any assumptions about the order of the
 output.
 .TP
 .I "\-b, \-\-boot"
-Always set a hostname; this allows the file specified by \fI-F\fR to be
-non-existant or empty, in which case the default hostname \fIlocalhost\fR
+Always set a hostname; this allows the file specified by \fI\-F\fR to be
+non-existent or empty, in which case the default hostname \fIlocalhost\fR
 will be used if none is yet set.
 .TP
 .I "\-d, \-\-domain"
@@ -187,7 +187,7 @@ to get the DNS domain name because it will show the NIS domain name and
 not the DNS domain name. Use
 .B dnsdomainname
 instead. See the warnings in section
-.B "THE FQDN"
+.B THE FQDN
 above, and avoid using this option.
 .TP
 .I "\-f, \-\-fqdn, \-\-long"
@@ -195,9 +195,9 @@ Display the FQDN (Fully Qualified Domain Name). A FQDN consists of a
 short host name and the DNS domain name. Unless you are using bind or NIS
 for host lookups you can change the FQDN and the DNS domain name (which is
 part of the FQDN) in the \fI/etc/hosts\fR file. See the warnings in section
-.B "THE FQDN"
+.B THE FQDN
 above und use
-.BR "hostname \-\-all-fqdns"
+.B hostname \-\-all-fqdns
 instead wherever possible.
 .TP
 .I "\-F, \-\-file filename"
@@ -207,13 +207,13 @@ a `#') are ignored.
 .I "\-i, \-\-ip-address"
 Display the network address(es) of the host name. Note that this works only
 if the host name can be resolved. Avoid using this option; use
-.BR "hostname \-\-all-ip-addresses"
+.B hostname \-\-all-ip-addresses
 instead.
 .TP
 .I "\-I, \-\-all-ip-addresses"
 Display all network addresses of the host. This option enumerates all
 configured addresses on all network interfaces. The loopback interface and IPv6
-link-local addresses are omitted. Contrary to option \fI-i\fR, this option
+link-local addresses are omitted. Contrary to option \fI\-i\fR, this option
 does not depend on name resolution. Do not make any assumptions about the
 order of the output.
 .TP

diff --git a/hostname.c b/hostname.c
index d81aff3..10c0a67 100644 (file)
--- a/hostname.c
+++ b/hostname.c
@@ -43,7 +43,7 @@
 #include <ctype.h>
 #include <err.h>
 
-#define VERSION "3.20"
+#define VERSION "3.21"
 
 enum type_t { DEFAULT, DNS, FQDN, SHORT, ALIAS, IP, NIS, NIS_DEF, ALL_FQDNS, ALL_IPS };