From afb3a6af37be742cfb6b1b1b0017e748a2bd0a8e Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 19 Dec 2012 13:57:32 +0100 Subject: [PATCH] net-tools: Updated (1.60 -> 1.60.20121017-git8217b88b) Note: There wasn't a release net-tools for 11 years now, but development it seems that upstream development is going on at http://net-tools.sourceforge.net, thus we are going to use a recent git snapshot now, for people who still like to use ifconfig and the other historical commands included within the net-tools package! Please also note that this commit is removing the ether-wake command which was patched in before by using a patch provided by linuxfromscratch. http://www.linuxfromscratch.org/patches/downloads/net-tools/net-tools-1.60-ether_wake-1.patch --- network/net-tools/config.h | 86 -- network/net-tools/config.h.diet | 93 -- network/net-tools/config.status | 100 -- network/net-tools/config.status.diet | 100 -- network/net-tools/fddi-hotfix-2.6.18.patch | 26 - network/net-tools/gcc34.patch | 56 - ...um.patch => nameif-linenum.patch.disabled} | 3 +- ...-tools-0001-remove-obsolete-commands.patch | 1095 +++++++++++++++++ network/net-tools/net-tools.conf | 18 +- network/net-tools/net-tools.desc | 13 +- network/net-tools/no_hostname.patch | 58 - network/net-tools/typo-basedir.patch | 26 - 12 files changed, 1105 insertions(+), 569 deletions(-) delete mode 100644 network/net-tools/config.h delete mode 100644 network/net-tools/config.h.diet delete mode 100644 network/net-tools/config.status delete mode 100644 network/net-tools/config.status.diet delete mode 100644 network/net-tools/fddi-hotfix-2.6.18.patch delete mode 100644 network/net-tools/gcc34.patch rename network/net-tools/{nameif-linenum.patch => nameif-linenum.patch.disabled} (91%) create mode 100644 network/net-tools/net-tools-0001-remove-obsolete-commands.patch delete mode 100644 network/net-tools/no_hostname.patch delete mode 100644 network/net-tools/typo-basedir.patch diff --git a/network/net-tools/config.h b/network/net-tools/config.h deleted file mode 100644 index a247c5882..000000000 --- a/network/net-tools/config.h +++ /dev/null @@ -1,86 +0,0 @@ -/* -* -* --- T2-COPYRIGHT-NOTE-BEGIN --- -* This copyright note is auto-generated by ./scripts/Create-CopyPatch. -* -* T2 SDE: package/.../net-tools/config.h -* Copyright (C) 2004 - 2006 The T2 SDE Project -* Copyright (C) 1998 - 2003 Clifford Wolf -* -* More information can be found in the files COPYING and README. -* -* 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; version 2 of the License. A copy of the -* GNU General Public License can be found in the file COPYING. -* --- T2-COPYRIGHT-NOTE-END --- -* -* config.h Automatically generated configuration includefile -* -* NET-TOOLS A collection of programs that form the base set of the -* NET-3 Networking Distribution for the LINUX operating -* system. -* -* DO NOT EDIT DIRECTLY -* -*/ - -/* - * - * I18N - * - * (Internationalization) - * - * In this BETA Release the I18N (NLS) is enabled and now based - * on GNU gettext, only a brazilian portuguese and German catalog - * (translation) is present, but others are *highly* welcome! - * - * (answer 'n' if you have no system with GNU gettext support) - * - */ -#define I18N 0 - -/* - * - * Protocol Families. - * - */ -#define HAVE_AFUNIX 1 -#define HAVE_AFINET 1 -#define HAVE_AFINET6 1 -#define HAVE_AFIPX 1 -#define HAVE_AFATALK 1 -#define HAVE_AFAX25 1 -#define HAVE_AFNETROM 1 -#define HAVE_AFROSE 1 -#define HAVE_AFECONET 1 -#define HAVE_AFDECnet 0 - -/* - * - * Device Hardware types. - * - */ -#define HAVE_HWETHER 1 -#define HAVE_HWARC 1 -#define HAVE_HWSLIP 1 -#define HAVE_HWPPP 1 -#define HAVE_HWTUNNEL 1 -#define HAVE_HWTR 1 -#define HAVE_HWAX25 1 -#define HAVE_HWROSE 1 -#define HAVE_HWNETROM 1 -#define HAVE_HWFR 1 -#define HAVE_HWSIT 1 -#define HAVE_HWFDDI 1 -#define HAVE_HWHIPPI 1 -#define HAVE_HWASH 1 -#define HAVE_HWHDLCLAPB 1 - -/* - * - * Other Features. - * - */ -#define HAVE_FW_MASQUERADE 1 -#define HAVE_IP_TOOLS 1 diff --git a/network/net-tools/config.h.diet b/network/net-tools/config.h.diet deleted file mode 100644 index c8f3bbbe4..000000000 --- a/network/net-tools/config.h.diet +++ /dev/null @@ -1,93 +0,0 @@ -/* -* -* --- ROCK-COPYRIGHT-NOTE-BEGIN --- -* -* This copyright note is auto-generated by ./scripts/Create-CopyPatch. -* Please add additional copyright information _after_ the line containing -* the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -* the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -* -* ROCK Linux: rock-src/package/.../net-tools/config.h.diet -* Copyright (C) 1998 - 2003 Clifford Wolf -* -* 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. A copy of the GNU General Public -* License can be found at Documentation/COPYING. -* -* Many people helped and are helping developing ROCK Linux. Please -* have a look at http://www.rocklinux.org/ and the Documentation/TEAM -* file for details. -* -* --- ROCK-COPYRIGHT-NOTE-END --- -* -* config.h Automatically generated configuration includefile -* -* NET-TOOLS A collection of programs that form the base set of the -* NET-3 Networking Distribution for the LINUX operating -* system. -* -* DO NOT EDIT DIRECTLY -* -*/ - -/* - * - * I18N - * - * (Internationalization) - * - * In this BETA Release the I18N (NLS) is enabled and now based - * on GNU gettext, only a brazilian portuguese and German catalog - * (translation) is present, but others are *highly* welcome! - * - * (answer 'n' if you have no system with GNU gettext support) - * - */ -#define I18N 0 - -/* - * - * Protocol Families. - * - */ -#define HAVE_AFUNIX 1 -#define HAVE_AFINET 1 -#define HAVE_AFINET6 0 -#define HAVE_AFIPX 1 -#define HAVE_AFATALK 1 -#define HAVE_AFAX25 1 -#define HAVE_AFNETROM 1 -#define HAVE_AFROSE 1 -#define HAVE_AFECONET 1 -#define HAVE_AFDECnet 0 - -/* - * - * Device Hardware types. - * - */ -#define HAVE_HWETHER 1 -#define HAVE_HWARC 1 -#define HAVE_HWSLIP 1 -#define HAVE_HWPPP 1 -#define HAVE_HWTUNNEL 1 -#define HAVE_HWTR 1 -#define HAVE_HWAX25 1 -#define HAVE_HWROSE 1 -#define HAVE_HWNETROM 1 -#define HAVE_HWFR 1 -#define HAVE_HWSIT 1 -#define HAVE_HWFDDI 0 -#define HAVE_HWHIPPI 1 -#define HAVE_HWASH 1 -#define HAVE_HWHDLCLAPB 1 - -/* - * - * Other Features. - * - */ -#define HAVE_FW_MASQUERADE 1 -#define HAVE_IP_TOOLS 1 diff --git a/network/net-tools/config.status b/network/net-tools/config.status deleted file mode 100644 index 32176116e..000000000 --- a/network/net-tools/config.status +++ /dev/null @@ -1,100 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../net-tools/config.status -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# 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; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- -# -# config.in Configure.sh source for the net-tools. -# This file contains the definition of what the support -# library contains. Most of all, it defines which types -# of address families and hardware we know of. -# -# NET-TOOLS A collection of programs that form the base set of the -# NET-3 Networking Distribution for the LINUX operating -# system. -# -# Version: config.in 1.21 (98-06-30) -# -# Author: Fred N. van Kempen, -# Copyright 1988-1993 MicroWalt Corporation -# -# Bernd 'eckes' Eckenfels -# Arnaldo Carvalho de Melo -# GNU gettext - I18N -# -# 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. -# -= /* -= * config.h Automatically generated configuration includefile -= * -= * NET-TOOLS A collection of programs that form the base set of the -= * NET-3 Networking Distribution for the LINUX operating -= * system. -= * -= * DO NOT EDIT DIRECTLY -= * -= */ -* -* -* I18N -* -* (Internationalization) -* -* In this BETA Release the I18N (NLS) is enabled and now based -* on GNU gettext, only a brazilian portuguese and German catalog -* (translation) is present, but others are *highly* welcome! -* -* (answer 'n' if you have no system with GNU gettext support) -* -bool 'Does your system support GNU gettext?' I18N n -* -* -* Protocol Families. -* -bool 'UNIX protocol family' HAVE_AFUNIX y -bool 'INET (TCP/IP) protocol family' HAVE_AFINET y -bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y -bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y -bool 'Appletalk DDP protocol family' HAVE_AFATALK y -bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y -bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y -bool 'Rose (packet radio) protocol family' HAVE_AFROSE y -bool 'Econet protocol family' HAVE_AFECONET y -bool 'DECnet protocol family' HAVE_AFDECnet n -* -* -* Device Hardware types. -* -bool 'Ethernet (generic) support' HAVE_HWETHER y -bool 'ARCnet support' HAVE_HWARC y -bool 'SLIP (serial line) support' HAVE_HWSLIP y -bool 'PPP (serial line) support' HAVE_HWPPP y -bool 'IPIP Tunnel support' HAVE_HWTUNNEL y -bool 'Token ring (generic) support' HAVE_HWTR y -bool 'AX25 (packet radio) support' HAVE_HWAX25 y -bool 'Rose (packet radio) support' HAVE_HWROSE y -bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y -bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y -bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y -bool 'FDDI (generic) support' HAVE_HWFDDI y -bool 'HIPPI (generic) support' HAVE_HWHIPPI y -bool 'Ash hardware support' HAVE_HWASH y -bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y -* -* -* Other Features. -* -bool 'IP Masquerading support' HAVE_FW_MASQUERADE y -bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y diff --git a/network/net-tools/config.status.diet b/network/net-tools/config.status.diet deleted file mode 100644 index 144678664..000000000 --- a/network/net-tools/config.status.diet +++ /dev/null @@ -1,100 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../net-tools/config.status.diet -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# 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; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- -# -# config.in Configure.sh source for the net-tools. -# This file contains the definition of what the support -# library contains. Most of all, it defines which types -# of address families and hardware we know of. -# -# NET-TOOLS A collection of programs that form the base set of the -# NET-3 Networking Distribution for the LINUX operating -# system. -# -# Version: config.in 1.21 (98-06-30) -# -# Author: Fred N. van Kempen, -# Copyright 1988-1993 MicroWalt Corporation -# -# Bernd 'eckes' Eckenfels -# Arnaldo Carvalho de Melo -# GNU gettext - I18N -# -# 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. -# -= /* -= * config.h Automatically generated configuration includefile -= * -= * NET-TOOLS A collection of programs that form the base set of the -= * NET-3 Networking Distribution for the LINUX operating -= * system. -= * -= * DO NOT EDIT DIRECTLY -= * -= */ -* -* -* I18N -* -* (Internationalization) -* -* In this BETA Release the I18N (NLS) is enabled and now based -* on GNU gettext, only a brazilian portuguese and German catalog -* (translation) is present, but others are *highly* welcome! -* -* (answer 'n' if you have no system with GNU gettext support) -* -bool 'Does your system support GNU gettext?' I18N n -* -* -* Protocol Families. -* -bool 'UNIX protocol family' HAVE_AFUNIX y -bool 'INET (TCP/IP) protocol family' HAVE_AFINET y -bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n -bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y -bool 'Appletalk DDP protocol family' HAVE_AFATALK y -bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y -bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y -bool 'Rose (packet radio) protocol family' HAVE_AFROSE y -bool 'Econet protocol family' HAVE_AFECONET y -bool 'DECnet protocol family' HAVE_AFDECnet n -* -* -* Device Hardware types. -* -bool 'Ethernet (generic) support' HAVE_HWETHER y -bool 'ARCnet support' HAVE_HWARC y -bool 'SLIP (serial line) support' HAVE_HWSLIP y -bool 'PPP (serial line) support' HAVE_HWPPP y -bool 'IPIP Tunnel support' HAVE_HWTUNNEL y -bool 'Token ring (generic) support' HAVE_HWTR y -bool 'AX25 (packet radio) support' HAVE_HWAX25 y -bool 'Rose (packet radio) support' HAVE_HWROSE y -bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y -bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y -bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y -bool 'FDDI (generic) support' HAVE_HWFDDI n -bool 'HIPPI (generic) support' HAVE_HWHIPPI y -bool 'Ash hardware support' HAVE_HWASH y -bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y -* -* -* Other Features. -* -bool 'IP Masquerading support' HAVE_FW_MASQUERADE y -bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y diff --git a/network/net-tools/fddi-hotfix-2.6.18.patch b/network/net-tools/fddi-hotfix-2.6.18.patch deleted file mode 100644 index c901e54ac..000000000 --- a/network/net-tools/fddi-hotfix-2.6.18.patch +++ /dev/null @@ -1,26 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../net-tools/fddi-hotfix-2.6.18.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- net-tools-1.60/lib/fddi.c.orig 2000-03-05 12:26:02.000000000 +0100 -+++ net-tools-1.60/lib/fddi.c 2006-09-24 00:58:02.000000000 +0200 -@@ -17,6 +17,7 @@ - #include "config.h" - - #include -+#include - - #if HAVE_HWFDDI - #include diff --git a/network/net-tools/gcc34.patch b/network/net-tools/gcc34.patch deleted file mode 100644 index e6979c300..000000000 --- a/network/net-tools/gcc34.patch +++ /dev/null @@ -1,56 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../net-tools/gcc34.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -The usual label at end of compound statement fixes for gcc-3.4. - - - Rene Rebe - ---- ./lib/inet_sr.c.vanilla 2004-07-04 20:31:07.000000000 +0200 -+++ ./lib/inet_sr.c 2004-07-04 20:31:15.000000000 +0200 -@@ -104,7 +104,6 @@ - isnet = 1; break; - case 2: - isnet = 0; break; -- default: - } - - /* Fill in the other fields. */ ---- ./hostname.c.vanilla 2004-07-04 20:31:45.000000000 +0200 -+++ ./hostname.c 2004-07-04 20:32:07.000000000 +0200 -@@ -97,7 +97,6 @@ - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -116,7 +115,6 @@ - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -173,7 +171,6 @@ - *p = '\0'; - printf("%s\n", hp->h_name); - break; -- default: - } - } - diff --git a/network/net-tools/nameif-linenum.patch b/network/net-tools/nameif-linenum.patch.disabled similarity index 91% rename from network/net-tools/nameif-linenum.patch rename to network/net-tools/nameif-linenum.patch.disabled index 5b3642d2a..a5591787d 100644 --- a/network/net-tools/nameif-linenum.patch +++ b/network/net-tools/nameif-linenum.patch.disabled @@ -1,7 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../net-tools/nameif-linenum.patch +# Filename: package/.../net-tools/nameif-linenum.patch.disabled +# Copyright (C) 2012 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # diff --git a/network/net-tools/net-tools-0001-remove-obsolete-commands.patch b/network/net-tools/net-tools-0001-remove-obsolete-commands.patch new file mode 100644 index 000000000..386a638a9 --- /dev/null +++ b/network/net-tools/net-tools-0001-remove-obsolete-commands.patch @@ -0,0 +1,1095 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../net-tools/net-tools-0001-remove-obsolete-commands.patch +# Copyright (C) 2012 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. +# --- SDE-COPYRIGHT-NOTE-END --- + +From f9c5e446972d81873c1c6b614584bd6b293a1242 Mon Sep 17 00:00:00 2001 +From: Christian Wiese +Date: Wed, 19 Dec 2012 13:05:50 +0100 +Subject: [PATCH] remove obsolete commands + +hostname is provided by inetutils +{nis,yp}domainname is provided by yp-tools +--- + Makefile | 14 +--- + man/de_DE/dnsdomainname.1 | 1 - + man/de_DE/domainname.1 | 1 - + man/de_DE/hostname.1 | 229 --------------------------------------------- + man/de_DE/nisdomainname.1 | 1 - + man/de_DE/ypdomainname.1 | 1 - + man/en_US/dnsdomainname.1 | 1 - + man/en_US/domainname.1 | 1 - + man/en_US/hostname.1 | 213 ----------------------------------------- + man/en_US/nisdomainname.1 | 1 - + man/en_US/ypdomainname.1 | 1 - + man/fr_FR/dnsdomainname.1 | 1 - + man/fr_FR/domainname.1 | 1 - + man/fr_FR/hostname.1 | 212 ----------------------------------------- + man/fr_FR/nisdomainname.1 | 1 - + man/fr_FR/ypdomainname.1 | 1 - + man/pt_BR/dnsdomainname.1 | 1 - + man/pt_BR/domainname.1 | 1 - + man/pt_BR/hostname.1 | 191 ------------------------------------- + man/pt_BR/nisdomainname.1 | 1 - + man/pt_BR/ypdomainname.1 | 1 - + 21 files changed, 2 insertions(+), 873 deletions(-) + delete mode 100644 man/de_DE/dnsdomainname.1 + delete mode 100644 man/de_DE/domainname.1 + delete mode 100644 man/de_DE/hostname.1 + delete mode 100644 man/de_DE/nisdomainname.1 + delete mode 100644 man/de_DE/ypdomainname.1 + delete mode 100644 man/en_US/dnsdomainname.1 + delete mode 100644 man/en_US/domainname.1 + delete mode 100644 man/en_US/hostname.1 + delete mode 100644 man/en_US/nisdomainname.1 + delete mode 100644 man/en_US/ypdomainname.1 + delete mode 100644 man/fr_FR/dnsdomainname.1 + delete mode 100644 man/fr_FR/domainname.1 + delete mode 100644 man/fr_FR/hostname.1 + delete mode 100644 man/fr_FR/nisdomainname.1 + delete mode 100644 man/fr_FR/ypdomainname.1 + delete mode 100644 man/pt_BR/dnsdomainname.1 + delete mode 100644 man/pt_BR/domainname.1 + delete mode 100644 man/pt_BR/hostname.1 + delete mode 100644 man/pt_BR/nisdomainname.1 + delete mode 100644 man/pt_BR/ypdomainname.1 + +diff --git a/Makefile b/Makefile +index cdea348..e41d727 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,7 +31,7 @@ BASEDIR ?= $(DESTDIR) + NET_LIB_PATH = lib + NET_LIB_NAME = net-tools + +-PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif ++PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif + + -include config.make + ifeq ($(HAVE_IP_TOOLS),1) +@@ -197,7 +197,6 @@ installbin: + install -m 0755 -d ${BASEDIR}/sbin + install -m 0755 -d ${BASEDIR}/bin + install -m 0755 arp ${BASEDIR}/sbin +- install -m 0755 hostname ${BASEDIR}/bin + install -m 0755 ifconfig ${BASEDIR}/bin + install -m 0755 nameif ${BASEDIR}/sbin + install -m 0755 netstat ${BASEDIR}/bin +@@ -212,21 +211,12 @@ endif + ifeq ($(HAVE_MII),1) + install -m 0755 mii-tool $(BASEDIR)/sbin + endif +- ln -fs hostname $(BASEDIR)/bin/dnsdomainname +- ln -fs hostname $(BASEDIR)/bin/ypdomainname +- ln -fs hostname $(BASEDIR)/bin/nisdomainname +- ln -fs hostname $(BASEDIR)/bin/domainname +-ifeq ($(HAVE_AFDECnet),1) +- ln -fs hostname $(BASEDIR)/bin/nodename +-endif + + savebin: + @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ + ${BASEDIR}/bin/netstat \ + ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \ +- ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \ +- ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \ +- ${BASEDIR}/bin/domainname ; do \ ++ ; do \ + [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved. + + installdata: +diff --git a/man/de_DE/dnsdomainname.1 b/man/de_DE/dnsdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/de_DE/dnsdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/de_DE/domainname.1 b/man/de_DE/domainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/de_DE/domainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/de_DE/hostname.1 b/man/de_DE/hostname.1 +deleted file mode 100644 +index ce0cadb..0000000 +--- a/man/de_DE/hostname.1 ++++ /dev/null +@@ -1,229 +0,0 @@ +-.\" +-.\" Original by ?? +-.\" +-.\" German translation by Ralf Baechle (ralf@gnu.org) +-.\" +-.TH HOSTNAME 1 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" +- +-.SH NAME +-hostname \- den Rechnernamen anzeigen oder setzen. +-.br +-domainname \- den NIS/YP Domainnamen anzeigen oder setzen +-.br +-dnsdomainname \- den DNS Domainnamen des Systems anzeigen +-.br +-nisdomainname \- den NIS/YP Domainnamen anzeigen oder setzen +-.br +-ypdomainname \- den NIS/YP Domainnamen anzeigen oder setzen +-.br +-nodename \- den DECnet-Knotennamen anzeigen oder setzen +- +-.SH SYNOPSIS +-.B hostname +-.RB [ \-v ] +-.RB [ \-a ] +-.RB [ \-\-alias ] +-.RB [ \-d ] +-.RB [ \-\-domain ] +-.RB [ \-f ] +-.RB [ \-\-fqdn ] +-.RB [ \-i ] +-.RB [ \-\-ip-address ] +-.RB [ \-\-long ] +-.RB [ \-s ] +-.RB [ \-\-short ] +-.RB [ \-y ] +-.RB [ \-\-yp ] +-.RB [ \-\-nis ] +-.RB [ \-n ] +-.RB [ \-\-node ] +- +-.PP +-.B hostname +-.RB [ \-v ] +-.RB [ \-F\ Dateiname ] +-.RB [ \-\-file\ Dateiname ] +-.RB [ Rechnername ] +- +-.PP +-.B domainname +-.RB [ \-v ] +-.RB [ \-F\ Dateiname ] +-.RB [ \-\-file\ Dateiname ] +-.RB [ Name ] +- +-.PP +-.B nodename +-.RB [ \-v ] +-.RB [ \-F\ Dateiname ] +-.RB [ \-\-file\ Dateiname ] +-.RB [ Name ] +- +-.PP +-.B hostname +-.RB [ \-v ] +-.RB [ \-h ] +-.RB [ \-\-help ] +-.RB [ \-V ] +-.RB [ \-\-version ] +- +-.PP +-.B dnsdomainname +-.RB [ \-v ] +-.br +-.B nisdomainname +-.RB [ \-v ] +-.br +-.B ypdomainname +-.RB [ \-v ] +- +-.SH BESCHREIBUNG +-.B Hostname +-ist das Programm, das zum Anzeigen oder setzen des aktuellen Host-, Domain-, +-oder Knotennamens des Systems verwendet wird. Diese Namen werden von vielen +-der Netzwerksprogrammen zur Identifikation der Maschine verwendet. +-Au\(sserdem wird der Domainname von NIS/YP verwendet. +- +-.SS "NAMEN AUSLESEN" +-Wenn ohne Argumente augerufen, zeigen die Programme den aktuellen Namen an: +- +-.LP +-.B hostname +-zeigt den aktuellen Rechnernamen des Systems, wie von der +-.BR gethostname (2) +-Funktion ermittelt wird, an. +- +-.LP +-.B "domainname, nisdomainname, ypdomainname" +-zeigen den Namen des Systems, wie er von der +-.BR getdomainname (2) +-Funktion ermittelt wird, an. Dieser Name wird auch der YP/NIS Domainname +-des Systems genannt. +- +-.LP +-.B nodename +-druckt den DECnet-Knotennamen des Systems, wie er von der +-.BR getnodename (2) +-Function ermittelt wird, aus. +- +-.LP +-.B dnsdomainname +-druckt den Domainteil des FQDN (Fully Qualified Domain Name oder zu deutsch +-vollst\(:andig spezifizierter Domainname) aus. Der vollst\(:andige FQDN +-des Systems wird von +-.B "hostname \-\-fqdn" +-ausgegeben. +- +-.SS "NAME SETZEN" +-Wenn mit nur einem Argument oder mit der +-.B \-\-file +-Option aufgerufen, dann setzen diese Kommandos den Rechnernamen, den NIS/YP +-Domainnamen oder den DECnet-Knotennamen. +- +-.LP +-Nur der Superuser darf den Namen \(:andern. +- +-.LP +-Es ist nicht m\(:ogich den FQDN oder den DNS Domainnamen mit dem +-.B dnsdomainname +-Befehl (Siehe +-.B "Der FQDN" +-unten) zu setzen. +- +-.LP +-Der Rechnername wird \(:ublicherweise einmal beim Systemstart in +-.I /etc/rc.d/rc.inet1 +-or +-.I /etc/init.d/boot +-gesetzt. Der Rechnername wird dabei \(:ublicherweise aus einer Datei +-die den Rechnernamen, z.B. +-.I /etc/HOSTNAME +-gesetzt. +- +-.SS DER FQDN +-Der FQDN (wie er von +-.B "hostname \-\-fqdn" +-ausgegeben wird) +-oder der DNS-Domainname (wie er von +-.B "dnsdomainname" +-ausgegeben wird) +-kann nicht mit diesem Befehl ge\(:andert werden. Der FQDN eines Systems ist +-der Name, den der +-.BR resolver (3) +-als den Namen des Systems zur\(:uckgibt. +- +-.LP +-Technisch: Der FQDN ist der Name, den +-.BR gethostbyname (2) +-f\(:ur den Rechnernamen zur\(:uckgibt, den +-.B gethostname (2) +-zur\(:uckgibt. +-Der DNS-Domainname ist der Teil nach dem ersten Punkt. +-.LP +-Deshalb h\(:angt es \(:ublicherweise von der Konfiguration in +-.IR /etc/host.conf ) +-wie der Name ge\(:andert werden kann. \(:Ublicherweise (wenn die Hosts Datei +-gelesen wird, bevor auf DNS oder NIS/YP zugegriffen wird) kann er in +-.I /etc/hosts +-ge\(:andert werden. +- +- +-.SH OPTIONEN +-.TP +-.I "\-a, \-\-alias" +-Den Aliasnamen des Rechners ausgeben, falls benutzt. +-.TP +-.I "\-d, \-\-domain" +-Den Namen der DNS-Domain ausgeben. Der Befehl +-.B domainname +-kann nicht dazu verwendet werden um den Namen der DNS-Dom\(:ane auszugeben, +-da er den NIS Domainname und nicht den DNS Domainnamen ausgibt. Zu diesem +-Zweck dient der Befehl +-.BR dnsdomainname . +-.TP +-.I "\-F, \-\-file filename" +-Den Rechnernamen aus der angegebenen Datei lesen. Zeilen, die mit einem +-#-Zeichen anfangen sind Kommentare und werden ignoriert. +-.TP +-.I "\-f, \-\-fqdn, \-\-long" +-Den FQDN (Fully Qualified Domain Name) anzeigen. Ein FQDN besteht aus einem +-kurzen Rechnernamen ohne Punkt und dem DNS-Domainnamen. Au\(sser wenn BIND +-oder NIS zum Aufl\(:osen von Rechnernamen verwendet wird, kann der FQDN und +-der DNS-Domainname, der Teil des FQDN ist, in der Datei \fI/etc/hosts\fR +-ge\(:andert werden. +-.TP +-.I "\-h, \-\-help" +-Kurzanleitung ausdrucken und beenden. +-.TP +-.I "\-i, \-\-ip-address" +-Die IP-Adresse(n) des Rechners anzeigen und beenden. +-.TP +-.I "\-n, \-\-node" +-Den DECnet-Knotennamen anzeigen. Wenn ein Argument oder die +-.B \-\-file name +-Option angegeben wird, dann kann Root auch einen neuen Knotennamen setzen. +-.TP +-.I "\-s, \-\-short" +-Den Kurznamen anzeigen. Dies ist der ab dem ersten Punkt abgeschnittene +-Rechnername. +-.TP +-.I "\-V, \-\-version" +-Versionsinformation auf der Standardausgabe ausgeben und erfolgreich beenden. +-.TP +-.I "\-v, \-\-verbose" +-Ausf\(:uhrlichere Ausgaben. +-.TP +-.I "\-y, \-\-yp, \-\-nis" +-Den NIS-Domainnamen anzeigen. Wenn ein Argument oder die +-.B \-\-file name +-Option gegeben wird, dann kann Root auch eine neue NIS-Domain setzen. +-.SH DATEIEN +-.B /etc/hosts +-.SH AUTOREN +-Peter Tobias, +-.br +-Bernd Eckenfels, (NIS and manpage). +-.br +-Steve Whitehouse, (DECnet support and manpage). +-.SH \(:Ubersetzung +-Ralf B\(:achle +diff --git a/man/de_DE/nisdomainname.1 b/man/de_DE/nisdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/de_DE/nisdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/de_DE/ypdomainname.1 b/man/de_DE/ypdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/de_DE/ypdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/en_US/dnsdomainname.1 b/man/en_US/dnsdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/en_US/dnsdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/en_US/domainname.1 b/man/en_US/domainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/en_US/domainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/en_US/hostname.1 b/man/en_US/hostname.1 +deleted file mode 100644 +index 9f7dd7f..0000000 +--- a/man/en_US/hostname.1 ++++ /dev/null +@@ -1,213 +0,0 @@ +-.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" +- +-.SH NAME +-hostname \- show or set the system's host name +-.br +-domainname \- show or set the system's NIS/YP domain name +-.br +-dnsdomainname \- show the system's DNS domain name +-.br +-nisdomainname \- show or set system's NIS/YP domain name +-.br +-ypdomainname \- show or set the system's NIS/YP domain name +-.br +-nodename \- show or set the system's DECnet node name +- +-.SH SYNOPSIS +-.B hostname +-.RB [ \-v ] +-.RB [ \-a ] +-.RB [ \-\-alias ] +-.RB [ \-d ] +-.RB [ \-\-domain ] +-.RB [ \-f ] +-.RB [ \-\-fqdn ] +-.RB [ \-i ] +-.RB [ \-\-ip\-address ] +-.RB [ \-\-long ] +-.RB [ \-s ] +-.RB [ \-\-short ] +-.RB [ \-y ] +-.RB [ \-\-yp ] +-.RB [ \-\-nis ] +-.RB [ \-n ] +-.RB [ \-\-node ] +- +-.PP +-.B hostname +-.RB [ \-v ] +-.RB [ \-F\ filename ] +-.RB [ \-\-file\ filename ] +-.RB [ hostname ] +- +-.PP +-.B domainname +-.RB [ \-v ] +-.RB [ \-F\ filename ] +-.RB [ \-\-file\ filename ] +-.RB [ name ] +- +-.PP +-.B nodename +-.RB [ \-v ] +-.RB [ \-F\ filename ] +-.RB [ \-\-file\ filename ] +-.RB [ name ] +- +-.PP +-.B hostname +-.RB [ \-v ] +-.RB [ \-h ] +-.RB [ \-\-help ] +-.RB [ \-V ] +-.RB [ \-\-version ] +- +-.PP +-.B dnsdomainname +-.RB [ \-v ] +-.br +-.B nisdomainname +-.RB [ \-v ] +-.br +-.B ypdomainname +-.RB [ \-v ] +- +-.SH DESCRIPTION +-.B Hostname +-is the program that is used to either set or display +-the current host, domain or node name of the system. These names are used +-by many of the networking programs to identify the machine. The domain +-name is also used by NIS/YP. +- +-.SS "GET NAME" +-When called without any arguments, the program displays the current +-names: +- +-.LP +-.B hostname +-will print the name of the system as returned by the +-.BR gethostname (2) +-function. +- +-.LP +-.B "domainname, nisdomainname, ypdomainname" +-will print the name of the system as returned by the +-.BR getdomainname (2) +-function. This is also known as the YP/NIS domain name of the system. +- +-.LP +-.B nodename +-will print the DECnet node name of the system as returned by the +-.BR getnodename (2) +-function. +- +-.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" . +- +-.SS "SET NAME" +-When called with one argument or with the +-.B \-\-file +-option, the commands set the host name, the NIS/YP domain name or +-the node name. +- +-.LP +-Note, that only the super-user can change the names. +- +-.LP +-It is not possible to set the FQDN or the DNS domain name with the +-.B dnsdomainname +-command (see +-.B "THE FQDN" +-below). +- +-.LP +-The host name is usually set once at system startup in +-.I /etc/rc.d/rc.inet1 +-or +-.I /etc/init.d/boot +-(normally by reading the contents of a file which contains +-the host name, e.g. +-.IR /etc/hostname ). +- +-.SS THE FQDN +-You can't change the FQDN (as returned by +-.BR "hostname \-\-fqdn" ) +-or the DNS domain name (as returned by +-.BR "dnsdomainname" ) +-with this command. The FQDN of the system is the name that the +-.BR resolver (3) +-returns for the host name. +- +-.LP +-Technically: The FQDN is the name +-.BR gethostbyname (2) +-returns for the host name returned by +-.BR gethostname (2). +-The DNS domain name is the part after the first dot. +-.LP +-Therefore it depends on the configuration (usually in +-.IR /etc/host.conf ) +-how you can change it. Usually (if the hosts file is parsed before DNS or +-NIS) you can change it in +-.IR /etc/hosts . +- +- +-.SH OPTIONS +-.TP +-.I "\-a, \-\-alias" +-Display the alias name of the host (if used). +-.TP +-.I "\-d, \-\-domain" +-Display the name of the DNS domain. Don't use the command +-.B domainname +-to get the DNS domain name because it will show the NIS domain name and +-not the DNS domain name. Use +-.B dnsdomainname +-instead. +-.TP +-.I "\-F, \-\-file filename" +-Read the host name from the specified file. Comments (lines starting with +-a `#') are ignored. +-.TP +-.I "\-f, \-\-fqdn, \-\-long" +-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. +-.TP +-.I "\-h, \-\-help" +-Print a usage message and exit. +-.TP +-.I "\-i, \-\-ip\-address" +-Display the IP address(es) of the host. +-.TP +-.I "\-n, \-\-node" +-Display the DECnet node name. If a parameter is given (or +-.B \-\-file name +-) the root can also set a new node name. +-.TP +-.I "\-s, \-\-short" +-Display the short host name. This is the host name cut at the first dot. +-.TP +-.I "\-V, \-\-version" +-Print version information on standard output and exit successfully. +-.TP +-.I "\-v, \-\-verbose" +-Be verbose and tell what's going on. +-.TP +-.I "\-y, \-\-yp, \-\-nis" +-Display the NIS domain name. If a parameter is given (or +-.B \-\-file name +-) then root can also set a new NIS domain. +-.SH FILES +-.B /etc/hosts +-.SH AUTHOR +-Peter Tobias, +-.br +-Bernd Eckenfels, (NIS and manpage). +-.br +-Steve Whitehouse, (DECnet support and manpage). +- +diff --git a/man/en_US/nisdomainname.1 b/man/en_US/nisdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/en_US/nisdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/en_US/ypdomainname.1 b/man/en_US/ypdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/en_US/ypdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/fr_FR/dnsdomainname.1 b/man/fr_FR/dnsdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/fr_FR/dnsdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/fr_FR/domainname.1 b/man/fr_FR/domainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/fr_FR/domainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/fr_FR/hostname.1 b/man/fr_FR/hostname.1 +deleted file mode 100644 +index 3adaf4b..0000000 +--- a/man/fr_FR/hostname.1 ++++ /dev/null +@@ -1,212 +0,0 @@ +-.TH HOSTNAME 1 "15 Mars 1999" "net-tools" "Linux Programmer's Manual" +-.SH NOM +-hostname \- affiche ou définit le nom d'hôte du système +-.br +-domainname \- affiche le nom de domaine NIS/YP du système +-.br +-dnsdomainname \- affiche le nom de domaine du système +-.br +-nisdomainname \- affiche ou définit le nom de domaine NIS/YP du système +-.br +-ypdomainname \- affiche ou définit le nom de domaine NIS/YP du système +-.br +-nodename \- affiche ou définit le nom de domaine DECnet du système +- +-.SH SYNOPSIS +-.B hostname +-.RB [ \-v ] +-.RB [ \-a ] +-.RB [ \-\-alias ] +-.RB [ \-d ] +-.RB [ \-\-domain ] +-.RB [ \-f ] +-.RB [ \-\-fqdn ] +-.RB [ \-i ] +-.RB [ \-\-ip-address ] +-.RB [ \-\-long ] +-.RB [ \-s ] +-.RB [ \-\-short ] +-.RB [ \-y ] +-.RB [ \-\-yp ] +-.RB [ \-\-nis ] +-.RB [ \-n ] +-.RB [ \-\-node ] +- +-.PP +-.B hostname +-.RB [ \-v ] +-.RB [ \-F\ nom_fichier ] +-.RB [ \-\-file\ nom_fichier ] +-.RB [ hostname ] +- +-.PP +-.B domainname +-.RB [ \-v ] +-.RB [ \-F\ nom_fichier ] +-.RB [ \-\-file\ nom_fichier ] +-.RB [ name ] +- +-.PP +-.B nodename +-.RB [ \-v ] +-.RB [ \-F\ nom_fichier ] +-.RB [ \-\-file\ nom_fichier ] +-.RB [ name ] +- +-.PP +-.B hostname +-.RB [ \-v ] +-.RB [ \-h ] +-.RB [ \-\-help ] +-.RB [ \-V ] +-.RB [ \-\-version ] +- +-.PP +-.B dnsdomainname +-.RB [ \-v ] +-.br +-.B nisdomainname +-.RB [ \-v ] +-.br +-.B ypdomainname +-.RB [ \-v ] +- +-.SH DESCRIPTION +-.B Hostname +-est le programme utilisé soit pour définir le nom d'hôte, soit +-pour visualiser le nom d'hôte ou de domaine du système. Ce nom est +-utilisé par différents programmes réseaux pour identifier la machine. Le +-nom de domaine est également utilisé par les NIS/YP. +- +-.SS "OBTENTION DU NOM" +-Appelé sans argument, le programme affiche les noms courants: +- +-.LP +-.B hostname +-fournit le nom du système tel qu'il est retourné par la fonction +-.BR getdomainname (2). +-Ceci est connu comme nom de domaine YP/NIS du système. +- +- +-.LP +-.B nodename +-fournit le nom de noeud DECnet du système tel qu'il est retourné par la +-fonction +-.BR getnodename (2) +-. +- +-.LP +-.B dnsdomainname +-fournit la partie domaine du nom complètement qualifié - FQDN (Fully +-Qualified Domain Name). Le nom FQDN du système est retourné par la commande +-.BR "hostname \-\-fqdn" . +- +-.SS "SET NAME" +-Appelé avec un argument ou avec l'option +-.B \-\-file +-, la commande définit le nom d'hôte, le nom de domaine NIS/YP ou +-le nom de noeud. +- +-.LP +-Notez que seul le super-utilisateur peut changer les noms. +- +-.LP +-Il n'est pas possible de définir le nom FQDN ou le nom de domaine DNS avec +-la commande +-.B dnsdomainname +- (voir +-.B "LE FQDN" +-ci-dessous). +- +-.LP +-Le nom d'hôte est générallement définit une seule fois, au +-démarrage du système, par le script de configuration +-.I /etc/rc.d/rc.inet1. +-ou +-.I /etc/init.d/boot +-(normallement en lisant un fichier contenant ce nom, p.ex. +-.IR /etc/hostname ). +- +-.SS LE FQDN +-Vous pouvez modifier le FQDN (tel que fourni par la commande +-.BR "hostname \-\-fqdn" ) +-ou le nom de domaine DNS (tel que fourni par la commande +-.BR "dnsdomainname" ) +-avec cette commande. Le FQDN du système est le nom que le resolveur ( +-.BR resolver (3) +- ) retourne comme nom d'hôte. +- +-.LP +-Techniquement: Le FQDN est le nom fourni par +-.BR gethostbyname (2) +-à partir du nom d'hôte retourné par +-.BR gethostname (2). +-Le nom de domaine DNS est la partie suivant le premier point. +-.LP +-La façon dont vous pouvez le changer dépend de la configuration +-(habituellement dans +-.IR /etc/host.conf ). +-Si le fichier 'hosts' est analysé avant d'interroger le DNS ou +-NIS) vous pouvez le changer dans le fichier +-.IR /etc/hosts . +- +-.SH OPTIONS +-.TP +-.I "\-a, \-\-alias" +-Affiche l'alias de l'hôte (si utilisé). +-.TP +-.I "\-d, \-\-domain" +-Affiche le nom du domaine DNS. Ne pas utiliser la commande +-.B domainname +-pour obtenir le nom de domaine DNS car vous obtiendrez en réalité le +-nom de domaine NIS. Utilisez plutôt la commande +-.B dnsdomainname +-. +-.TP +-.I "\-F, \-\-file nom_fichier" +-Lit le nom d'hôte à partir du fichier spécifié. Les commentaires (lignes commençant +-par un `#') sont ignorés. +-.TP +-.I "\-f, \-\-fqdn, \-\-long" +-Affiche le nom pleinement qualifié - FQDN (Fully Qualified Domain Name). un +-FQDN consiste en un nom d'hôte court et un nom de domaine. A moins que vous +-utilisiez 'bind' ou les NIS pour la recherche d'hôtes, vous pouvez changer +-le nom FQDN et le nom de domaine (qui fait partie du FQDN) dans le fichier +-\fI/etc/hosts\fR. +-.TP +-.I "\-h, \-\-help" +-Affiche un message d'aide et se termine. +-.TP +-.I "\-i, \-\-ip-address" +-Affiche la (les) adresse(s) IP de l'hôte. +-.TP +-.I "\-n, \-\-node" +-Affiche le nom de noeud DECnet. Si un paramètre est fourni (ou +-.B \-\-file nom_fichier +-) le super-utilisateur peut également définir un nouveau nom de neud. +-.TP +-.I "\-s, \-\-short" +-Affiche le nom d'hôte en format court. Il s'agit du nom d'hôte coupé au +-premier point. +-.TP +-.I "\-V, \-\-version" +-Affiche les informations sur la version sur la sortie standard et se +-termine correctement. +-.TP +-.I "\-v, \-\-verbose" +-Mode verbeux. +-.TP +-.I "\-y, \-\-yp, \-\-nis" +-Affiche le nom de domaine NIS. Si un paramètre est fourni (ou +-.B \-\-file nom_fichier +-) le super-utilisateur peut également définir un nouveau nom de domaine NIS. +-.SH FICHIERS +-.B /etc/hosts +-.SH AUTEURS +-Peter Tobias, +-.br +-Bernd Eckenfels, (NIS et pages de manuel). +-.br +-Steve Whitehouse, (Support DECnet et pages de manuel). +-.SH TRADUCTION +-Jean Michel VANSTEENE (vanstee@worldnet.fr) +diff --git a/man/fr_FR/nisdomainname.1 b/man/fr_FR/nisdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/fr_FR/nisdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/fr_FR/ypdomainname.1 b/man/fr_FR/ypdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/fr_FR/ypdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/pt_BR/dnsdomainname.1 b/man/pt_BR/dnsdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/pt_BR/dnsdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/pt_BR/domainname.1 b/man/pt_BR/domainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/pt_BR/domainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/pt_BR/hostname.1 b/man/pt_BR/hostname.1 +deleted file mode 100644 +index 5880fc8..0000000 +--- a/man/pt_BR/hostname.1 ++++ /dev/null +@@ -1,191 +0,0 @@ +-.TH HOSTNAME 1 "28 de janeiro de 1996" "net-tools" "Manual do Programador Linux" +- +-.SH NOME +-hostname \- mostra ou configura o nome da máquina +-.BR +-domainname \- mostra ou configura o nome do domínio NIS/YP +-.BR +-dnsdomainname \- mostra o nome do domínio DNS +-.BR +-nisdomainname \- mostra ou configura o nome do domínio NIS/YP +-.BR +-ypdomainname \- mostra ou configura o nome do domínio NIS/YP +- +-.SH SINOPSE +-.B hostname +-.RB [ \-v ] +-.RB [ \-a ] +-.RB [ \-\-alias ] +-.RB [ \-d ] +-.RB [ \-\-domain ] +-.RB [ \-f ] +-.RB [ \-\-fqdn ] +-.RB [ \-i ] +-.RB [ \-\-ip-address ] +-.RB [ \-\-long ] +-.RB [ \-s ] +-.RB [ \-\-short ] +-.RB [ \-y ] +-.RB [ \-\-yp ] +-.RB [ \-\-nis ] +- +-.PP +-.B hostname +-.RB [ \-v ] +-.RB [ \-F\ arquivo ] +-.RB [ \-\-file\ arquivo ] +-.RB [ máquina ] +- +-.PP +-.B domainname +-.RB [ \-v ] +-.RB [ \-F\ filename ] +-.RB [ \-\-file\ nome_arquivo ] +-.RB [ nome ] +- +-.PP +-.B hostname +-.RB [ \-v ] +-.RB [ \-h ] +-.RB [ \-\-help ] +-.RB [ \-V ] +-.RB [ \-\-version ] +- +-.PP +-.B dnsdomainname +-.RB [ \-v ] +-.LP +-.B nisdomainname +-.RB [ \-v ] +-.LP +-.B ypdomainname +-.RB [ \-v ] +- +-.SH DESCRIÇÃO +-.B hostname +-é o programa usado para configurar ou mostrar o nome corrente da máquina +-ou o domínio do sistema. Este nome é usado por muitos dos programas de +-rede para identificar a máquina. O nome do domínio também é usado pelo +-NIS/YP. +- +-.SS "OBTER NOME" +-Quando chamado sem argumentos o programa mostra os nomes correntes: +- +-.LP +-.B hostname +-mostrará o nome do sistema conforme retornado pela função +-.BR gethostname (2). +- +- +-.LP +-.B "domainname, nisdomainname, ypdomainname" +-mostrará o nome do sistema conforme retornado pela função +-.BR getdomainname (2). +-Isto também é conhecido como o nome de domínio YP/NIS do sistema. +- +-.LP +-.B dnsdomainname +-mostrara a parte do domínio do FQDN (Nome de domínio completamente qualificado). +-O FQDN do sistema é retornado pelo comando +-.BR "hostname \-\-fqdn" . +- +-.SS "CONFIGURAR NOME" +-Quando chamado com um argumento ou com a opção +-.B \-\-file +-, o comando configura o nome da máquina ou do domínio NIS/YP. +- +-.LP +-Note que somente o super usuário pode mudar os nomes. +- +-.LP +-Nao é possível configurar o FQDN ou o nome do domínio DNS com o comando +-.B dnsdomainname +-(veja +-.B "O FQDN" +-abaixo). +- +-.LP +-O nome da máquina é normalmente configurado durante a inicialização do sistema, +-em +-.I /etc/rc.d/rc.inet1 +-ou +-.I /etc/init.d/boot +-(normalmente lendo o conteúdo de um arquivo que contém o nome da máquina, ex.: +-.IR /etc/hostname ). +- +-.SS O FQDN +-Você não pode mudar o FQDN (conforme retornado por +-.BR "hostname \-\-fqdn" ) +-ou o nome do domínio DNS (conforme retornado por +-.BR "dnsdomainname" ) +-com este comando. O FQDN do sistema é o nome que o +-.BR resolver (3) +-retorna para o nome da máquina. +- +-.LP +-Tecnicamente: O FQDN é o nome retornado pelo +-.BR gethostbyname (2) +-para o nome retornado pelo +-.BR gethostname (2). +-O nome do domínio DNS é a parte após o primeiro ponto. +-.LP +-Portanto isto depende da configuração (normalmente em +-.IR /etc/host.conf ) +-para que você possa mudá-lo. Normalmente (se o arquivo hosts for lido antes +-do DNS ou NIS) você pode mudá-lo em +-.IR /etc/hosts . +- +- +-.SH OPÇÕES +-.TP +-.I "\-a, \-\-alias" +-Mostra o alias da máquina (se usado). +-.TP +-.I "\-d, \-\-domain" +-Mostra o nome do domínio DNS. Não use o comando +-.B domainname +-para obter o nome do domínio DNS porque ele mostrará o nome do domínio NIS e +-não o nome do domínio DNS. Use +-.BR dnsdomainname . +-.TP +-.I "\-F, \-\-file arquivo" +-Leia o nome da máquina a partir do arquivo especificado. Comentários (linhas +-começando com um `#') são ignorados. +-.TP +-.I "\-f, \-\-fqdn, \-\-long" +-Mostra o FQDN (Nome de Domínio Completamente Qualificado). Um FQDN consiste de +-um nome curto de máquina e do nome do domínio DNS. A menos que você esteja +-usando bind ou NIS para resolução de nomes você pode mudar o FQDN e o nome +-do domínio DNS (que é parte do FQDN) no arquivo \fI/etc/hosts\fR. +-.TP +-.I "\-h, \-\-help" +-Mostra uma mensagem sobre como utilizar o comando e termina. +-.TP +-.I "\-i, \-\-ip-address" +-Mostra o(s) endereço(s) IP da máquina. +-.TP +-.I "\-s, \-\-short" +-Mostra o nome curto da máquina. É o nome da máquina até o primeiro ponto. +-.TP +-.I "\-V, \-\-version" +-Mostra informação de versão na saída padrão e termina com sucesso. +-.TP +-.I "\-v, \-\-verbose" +-Mostra uma saída detalhada do que está acontecendo. +-.TP +-.I "\-y, \-\-yp, \-\-nis" +-Mostra o nome do domínio NIS. Se um parâmetro for especificado (ou +-.B \-\-file arquivo +-) então o root também pode configurar um novo domínio NIS. +-.SH ARQUIVOS +-.B /etc/hosts +-.SH AUTOR +-Peter Tobias, +-.BR +-Bernd Eckenfels, (NIS e página man). +-.BR +-Arnaldo Carvalho de Melo, Tradução para a língua +-portuguesa. +-.BR +-Jorge Luiz Godoy Filho, Revisão. +-.BR +diff --git a/man/pt_BR/nisdomainname.1 b/man/pt_BR/nisdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/pt_BR/nisdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +diff --git a/man/pt_BR/ypdomainname.1 b/man/pt_BR/ypdomainname.1 +deleted file mode 100644 +index 1f45128..0000000 +--- a/man/pt_BR/ypdomainname.1 ++++ /dev/null +@@ -1 +0,0 @@ +-.so man1/hostname.1 +-- +1.7.2.3 + diff --git a/network/net-tools/net-tools.conf b/network/net-tools/net-tools.conf index 32e140854..79c72e81e 100644 --- a/network/net-tools/net-tools.conf +++ b/network/net-tools/net-tools.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../net-tools/net-tools.conf -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2012 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -14,19 +14,7 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -if [ $target == "dietlibc" ]; then - hook_add premake 5 "cp $confdir/config.h.diet ./config.h" - hook_add premake 5 "$premake ; cp $confdir/config.status.diet ./config.status" -else - hook_add premake 5 "cp $confdir/config.h $confdir/config.status ." -fi +# hack to deal with the weird interactive config +hook_add premake 9 'yes "" | eval $MAKE $makeopt config.h' -var_append makeopt ' ' "LD='$CC' COPTS='$CFLAGS'" var_append makeinstopt ' ' "BASEDIR=$root" - -# add the wake-on-lan patch -p=`match_source_file -p ether-wake` -[ -z "$p" ] || var_insert patchfiles " " "$p" - -# remove hostname.1 -hook_add postpatch 5 'find man/ -name hostname.1 | xargs rm -vf' diff --git a/network/net-tools/net-tools.desc b/network/net-tools/net-tools.desc index 415384db7..c2ce71d0b 100644 --- a/network/net-tools/net-tools.desc +++ b/network/net-tools/net-tools.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../net-tools/net-tools.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -20,12 +20,10 @@ [T] The net-tools package contains a collection of programs that form the base [T] set of the NET-3 networking distribution for the Linux operating system. [T] It contains the important tools for controlling the network subsystem of the -[T] Linux kernel including arp, hostname, ifconfig, netstat, rarp and route. +[T] Linux kernel including arp, ifconfig, netstat, rarp and route. [T] Additionally it provides utilities relating to particular network hardware [T] types (plipconfig, slattach), nameif for naming network interfaces based on -[T] MAC addresses and ether-wake which generates and transmits Wake-On-LAN (WOL) -[T] "Magic Packets", used for restarting machines that have been soft-powered- -[T] down (ACPI D3-warm state). +[T] MAC addresses. [T] [T] Important: [T] For modern Linux systems most net-tools programs are obsolete now! @@ -45,8 +43,7 @@ [L] GPL [S] Stable -[V] 1.60 +[V] 1.60.20121017-git8217b88b [P] X -?---5---9 184.500 -[D] 1395528642 net-tools-1.60.tar.bz2 http://www.tazenda.demon.co.uk/phil/net-tools/ -[D] 3869631410 net-tools-1.60-ether-wake-1.patch http://linuxfromscratch.mirror.ac.uk/sites/www.linuxfromscratch.org/patches/downloads/net-tools/ +[D] 3647155460 net-tools-1.60.20121017-git8217b88b.tar.bz2 http://www.tazenda.demon.co.uk/phil/net-tools/ diff --git a/network/net-tools/no_hostname.patch b/network/net-tools/no_hostname.patch deleted file mode 100644 index aeae32296..000000000 --- a/network/net-tools/no_hostname.patch +++ /dev/null @@ -1,58 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../net-tools/no_hostname.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./Makefile.orig 2006-11-28 12:15:12.000000000 -0300 -+++ ./Makefile 2006-11-28 12:16:01.000000000 -0300 -@@ -76,7 +76,7 @@ - NET_LIB_PATH = lib - NET_LIB_NAME = net-tools - --PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif ether-wake -+PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif ether-wake - - -include config.make - ifeq ($(HAVE_IP_TOOLS),1) -@@ -227,7 +227,6 @@ - install -m 0755 -d ${BASEDIR}/sbin - install -m 0755 -d ${BASEDIR}/bin - install -m 0755 arp ${BASEDIR}/sbin -- install -m 0755 hostname ${BASEDIR}/bin - install -m 0755 ifconfig ${BASEDIR}/sbin - install -m 0755 nameif ${BASEDIR}/sbin - install -m 0755 netstat ${BASEDIR}/bin -@@ -243,21 +242,12 @@ - ifeq ($(HAVE_MII),1) - install -m 0755 mii-tool $(BASEDIR)/sbin - endif -- ln -fs hostname $(BASEDIR)/bin/dnsdomainname -- ln -fs hostname $(BASEDIR)/bin/ypdomainname -- ln -fs hostname $(BASEDIR)/bin/nisdomainname -- ln -fs hostname $(BASEDIR)/bin/domainname --ifeq ($(HAVE_AFDECnet),1) -- ln -fs hostname $(BASEDIR)/bin/nodename --endif - - savebin: - @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ - ${BASEDIR}/bin/netstat \ - ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \ -- ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \ -- ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \ -- ${BASEDIR}/bin/domainname ; do \ -+ ; do \ - [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved. - - installdata: diff --git a/network/net-tools/typo-basedir.patch b/network/net-tools/typo-basedir.patch deleted file mode 100644 index affcc7122..000000000 --- a/network/net-tools/typo-basedir.patch +++ /dev/null @@ -1,26 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../net-tools/typo-basedir.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- SDE-COPYRIGHT-NOTE-END --- ---- net-tools-1.60/Makefile~ 2004-06-29 14:03:00.252927896 +0200 -+++ net-tools-1.60/Makefile 2004-06-29 14:03:13.149967248 +0200 -@@ -235,7 +235,7 @@ - install -m 0755 rarp ${BASEDIR}/sbin - install -m 0755 route ${BASEDIR}/sbin - install -m 0755 slattach $(BASEDIR)/sbin -- install -m 0755 ether-wake $(BASE_DIR)/sbin -+ install -m 0755 ether-wake $(BASEDIR)/sbin - ifeq ($(HAVE_IP_TOOLS),1) - install -m 0755 ipmaddr $(BASEDIR)/sbin - install -m 0755 iptunnel $(BASEDIR)/sbin