forked from pool/coreutils
d326a25e75
- Avoid segmentation fault in "join -i" with long line input (bnc#798541, VUL-1) - Avoid segmentation fault in "sort -d" and "sort -M" with long line input (bnc#798538, VUL-1) - Avoid segmentation fault in "uniq" with long line input (bnc#796243, VUL-1) - Fix test-suite errors (bnc#798261). OBS-URL: https://build.opensuse.org/request/show/149348 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=84
111 lines
4.2 KiB
Diff
111 lines
4.2 KiB
Diff
Index: doc/coreutils.texi
|
|
===================================================================
|
|
--- doc/coreutils.texi.orig
|
|
+++ doc/coreutils.texi
|
|
@@ -66,7 +66,6 @@
|
|
* groups: (coreutils)groups invocation. Print group names a user is in.
|
|
* head: (coreutils)head invocation. Output the first part of files.
|
|
* hostid: (coreutils)hostid invocation. Print numeric host identifier.
|
|
-* hostname: (coreutils)hostname invocation. Print or set system name.
|
|
* id: (coreutils)id invocation. Print user identity.
|
|
* install: (coreutils)install invocation. Copy and change attributes.
|
|
* join: (coreutils)join invocation. Join lines on a common field.
|
|
@@ -198,7 +197,7 @@ Free Documentation License''.
|
|
* File name manipulation:: dirname basename pathchk mktemp realpath
|
|
* Working context:: pwd stty printenv tty
|
|
* User information:: id logname whoami groups users who
|
|
-* System context:: date arch nproc uname hostname hostid uptime
|
|
+* System context:: date arch nproc uname hostid uptime
|
|
* SELinux context:: chcon runcon
|
|
* Modified command invocation:: chroot env nice nohup stdbuf su timeout
|
|
* Process control:: kill
|
|
@@ -416,7 +415,6 @@ System context
|
|
* date invocation:: Print or set system date and time
|
|
* nproc invocation:: Print the number of processors
|
|
* uname invocation:: Print system information
|
|
-* hostname invocation:: Print or set system name
|
|
* hostid invocation:: Print numeric host identifier
|
|
* uptime invocation:: Print system uptime and load
|
|
|
|
@@ -14145,7 +14143,6 @@ information.
|
|
* arch invocation:: Print machine hardware name.
|
|
* nproc invocation:: Print the number of processors.
|
|
* uname invocation:: Print system information.
|
|
-* hostname invocation:: Print or set system name.
|
|
* hostid invocation:: Print numeric host identifier.
|
|
* uptime invocation:: Print system uptime and load.
|
|
@end menu
|
|
@@ -14932,15 +14929,6 @@ easily available, as is the case with Li
|
|
Print the machine hardware name (sometimes called the hardware class
|
|
or hardware type).
|
|
|
|
-@item -n
|
|
-@itemx --nodename
|
|
-@opindex -n
|
|
-@opindex --nodename
|
|
-@cindex hostname
|
|
-@cindex node name
|
|
-@cindex network node name
|
|
-Print the network node hostname.
|
|
-
|
|
@item -p
|
|
@itemx --processor
|
|
@opindex -p
|
|
@@ -14994,30 +14982,6 @@ Print the kernel version.
|
|
|
|
@exitstatus
|
|
|
|
-
|
|
-@node hostname invocation
|
|
-@section @command{hostname}: Print or set system name
|
|
-
|
|
-@pindex hostname
|
|
-@cindex setting the hostname
|
|
-@cindex printing the hostname
|
|
-@cindex system name, printing
|
|
-@cindex appropriate privileges
|
|
-
|
|
-With no arguments, @command{hostname} prints the name of the current host
|
|
-system. With one argument, it sets the current host name to the
|
|
-specified string. You must have appropriate privileges to set the host
|
|
-name. Synopsis:
|
|
-
|
|
-@example
|
|
-hostname [@var{name}]
|
|
-@end example
|
|
-
|
|
-The only options are @option{--help} and @option{--version}. @xref{Common
|
|
-options}.
|
|
-
|
|
-@exitstatus
|
|
-
|
|
|
|
@node hostid invocation
|
|
@section @command{hostid}: Print numeric host identifier
|
|
Index: man/Makefile.am
|
|
===================================================================
|
|
--- man/Makefile.am.orig
|
|
+++ man/Makefile.am
|
|
@@ -199,7 +199,7 @@ check-x-vs-1:
|
|
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
|
|
t=$@-t; \
|
|
(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
|
|
- (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) \
|
|
+ (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) hostid \
|
|
| tr -s ' ' '\n' | sed 's/\.1$$//') \
|
|
| $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; }; \
|
|
rm $$t
|
|
Index: man/Makefile.in
|
|
===================================================================
|
|
--- man/Makefile.in.orig
|
|
+++ man/Makefile.in
|
|
@@ -2065,7 +2065,7 @@ check-x-vs-1:
|
|
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
|
|
t=$@-t; \
|
|
(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
|
|
- (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) \
|
|
+ (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) hostid \
|
|
| tr -s ' ' '\n' | sed 's/\.1$$//') \
|
|
| $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; }; \
|
|
rm $$t
|