net-tools-CVS_20101030-remove_dups-1.patch 15 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521
  1. Submitted By: Bruce Dubbs (bdubbs at liinuxfromscratch dot com)
  2. Date: 2014-03-01
  3. Initial Package Version: CVS_20101030
  4. Origin: Self
  5. Tanım: Removes ifconfig and hostname from the build
  6. due to duplication in inetutils
  7. diff -Naur a/Makefile b/Makefile
  8. --- a/Makefile 2009-12-31 14:38:02.000000000 -0600
  9. +++ b/Makefile 2014-02-28 23:19:11.000000000 -0600
  10. @@ -228,8 +228,8 @@
  11. install -m 0755 -d ${BASEDIR}/sbin
  12. install -m 0755 -d ${BASEDIR}/bin
  13. install -m 0755 arp ${BASEDIR}/sbin
  14. - install -m 0755 hostname ${BASEDIR}/bin
  15. - install -m 0755 ifconfig ${BASEDIR}/sbin
  16. +# install -m 0755 hostname ${BASEDIR}/bin
  17. +# install -m 0755 ifconfig ${BASEDIR}/sbin
  18. install -m 0755 nameif ${BASEDIR}/sbin
  19. install -m 0755 netstat ${BASEDIR}/bin
  20. install -m 0755 plipconfig $(BASEDIR)/sbin
  21. @@ -243,14 +243,6 @@
  22. ifeq ($(HAVE_MII),1)
  23. install -m 0755 mii-tool $(BASEDIR)/sbin
  24. endif
  25. - ln -fs hostname $(BASEDIR)/bin/dnsdomainname
  26. - ln -fs hostname $(BASEDIR)/bin/ypdomainname
  27. - ln -fs hostname $(BASEDIR)/bin/nisdomainname
  28. - ln -fs hostname $(BASEDIR)/bin/domainname
  29. -ifeq ($(HAVE_AFDECnet),1)
  30. - ln -fs hostname $(BASEDIR)/bin/nodename
  31. -endif
  32. -
  33. savebin:
  34. @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
  35. ${BASEDIR}/bin/netstat \
  36. diff -Naur a/config.in b/config.in
  37. --- a/config.in 2008-10-02 21:09:57.000000000 -0500
  38. +++ b/config.in 2014-02-28 23:18:31.000000000 -0600
  39. @@ -68,8 +68,8 @@
  40. bool 'SLIP (serial line) support' HAVE_HWSLIP y
  41. bool 'PPP (serial line) support' HAVE_HWPPP y
  42. bool 'IPIP Tunnel support' HAVE_HWTUNNEL y
  43. -bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y
  44. -bool 'Token ring (generic) support' HAVE_HWTR y
  45. +bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP n
  46. +bool 'Token ring (generic) support' HAVE_HWTR n
  47. bool 'AX25 (packet radio) support' HAVE_HWAX25 y
  48. bool 'Rose (packet radio) support' HAVE_HWROSE y
  49. bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
  50. diff -Naur a/man/en_US/dnsdomainname.1 b/man/en_US/dnsdomainname.1
  51. --- a/man/en_US/dnsdomainname.1 1998-08-10 15:51:04.000000000 -0500
  52. +++ b/man/en_US/dnsdomainname.1 1969-12-31 18:00:00.000000000 -0600
  53. @@ -1 +0,0 @@
  54. -.so man1/hostname.1
  55. diff -Naur a/man/en_US/domainname.1 b/man/en_US/domainname.1
  56. --- a/man/en_US/domainname.1 1998-08-10 15:51:05.000000000 -0500
  57. +++ b/man/en_US/domainname.1 1969-12-31 18:00:00.000000000 -0600
  58. @@ -1 +0,0 @@
  59. -.so man1/hostname.1
  60. diff -Naur a/man/en_US/hostname.1 b/man/en_US/hostname.1
  61. --- a/man/en_US/hostname.1 2008-10-02 18:16:59.000000000 -0500
  62. +++ b/man/en_US/hostname.1 1969-12-31 18:00:00.000000000 -0600
  63. @@ -1,213 +0,0 @@
  64. -.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
  65. -
  66. -.SH NAME
  67. -hostname \- show or set the system's host name
  68. -.br
  69. -domainname \- show or set the system's NIS/YP domain name
  70. -.br
  71. -dnsdomainname \- show the system's DNS domain name
  72. -.br
  73. -nisdomainname \- show or set system's NIS/YP domain name
  74. -.br
  75. -ypdomainname \- show or set the system's NIS/YP domain name
  76. -.br
  77. -nodename \- show or set the system's DECnet node name
  78. -
  79. -.SH SYNOPSIS
  80. -.B hostname
  81. -.RB [ \-v ]
  82. -.RB [ \-a ]
  83. -.RB [ \-\-alias ]
  84. -.RB [ \-d ]
  85. -.RB [ \-\-domain ]
  86. -.RB [ \-f ]
  87. -.RB [ \-\-fqdn ]
  88. -.RB [ \-i ]
  89. -.RB [ \-\-ip\-address ]
  90. -.RB [ \-\-long ]
  91. -.RB [ \-s ]
  92. -.RB [ \-\-short ]
  93. -.RB [ \-y ]
  94. -.RB [ \-\-yp ]
  95. -.RB [ \-\-nis ]
  96. -.RB [ \-n ]
  97. -.RB [ \-\-node ]
  98. -
  99. -.PP
  100. -.B hostname
  101. -.RB [ \-v ]
  102. -.RB [ \-F\ filename ]
  103. -.RB [ \-\-file\ filename ]
  104. -.RB [ hostname ]
  105. -
  106. -.PP
  107. -.B domainname
  108. -.RB [ \-v ]
  109. -.RB [ \-F\ filename ]
  110. -.RB [ \-\-file\ filename ]
  111. -.RB [ name ]
  112. -
  113. -.PP
  114. -.B nodename
  115. -.RB [ \-v ]
  116. -.RB [ \-F\ filename ]
  117. -.RB [ \-\-file\ filename ]
  118. -.RB [ name ]
  119. -
  120. -.PP
  121. -.B hostname
  122. -.RB [ \-v ]
  123. -.RB [ \-h ]
  124. -.RB [ \-\-help ]
  125. -.RB [ \-V ]
  126. -.RB [ \-\-version ]
  127. -
  128. -.PP
  129. -.B dnsdomainname
  130. -.RB [ \-v ]
  131. -.br
  132. -.B nisdomainname
  133. -.RB [ \-v ]
  134. -.br
  135. -.B ypdomainname
  136. -.RB [ \-v ]
  137. -
  138. -.SH DESCRIPTION
  139. -.B Hostname
  140. -is the program that is used to either set or display
  141. -the current host, domain or node name of the system. These names are used
  142. -by many of the networking programs to identify the machine. The domain
  143. -name is also used by NIS/YP.
  144. -
  145. -.SS "GET NAME"
  146. -When called without any arguments, the program displays the current
  147. -names:
  148. -
  149. -.LP
  150. -.B hostname
  151. -will print the name of the system as returned by the
  152. -.BR gethostname (2)
  153. -function.
  154. -
  155. -.LP
  156. -.B "domainname, nisdomainname, ypdomainname"
  157. -will print the name of the system as returned by the
  158. -.BR getdomainname (2)
  159. -function. This is also known as the YP/NIS domain name of the system.
  160. -
  161. -.LP
  162. -.B nodename
  163. -will print the DECnet node name of the system as returned by the
  164. -.BR getnodename (2)
  165. -function.
  166. -
  167. -.LP
  168. -.B dnsdomainname
  169. -will print the domain part of the FQDN (Fully Qualified Domain Name). The
  170. -complete FQDN of the system is returned with
  171. -.BR "hostname \-\-fqdn" .
  172. -
  173. -.SS "SET NAME"
  174. -When called with one argument or with the
  175. -.B \-\-file
  176. -option, the commands set the host name, the NIS/YP domain name or
  177. -the node name.
  178. -
  179. -.LP
  180. -Note, that only the super-user can change the names.
  181. -
  182. -.LP
  183. -It is not possible to set the FQDN or the DNS domain name with the
  184. -.B dnsdomainname
  185. -command (see
  186. -.B "THE FQDN"
  187. -below).
  188. -
  189. -.LP
  190. -The host name is usually set once at system startup in
  191. -.I /etc/rc.d/rc.inet1
  192. -or
  193. -.I /etc/init.d/boot
  194. -(normally by reading the contents of a file which contains
  195. -the host name, e.g.
  196. -.IR /etc/hostname ).
  197. -
  198. -.SS THE FQDN
  199. -You can't change the FQDN (as returned by
  200. -.BR "hostname \-\-fqdn" )
  201. -or the DNS domain name (as returned by
  202. -.BR "dnsdomainname" )
  203. -with this command. The FQDN of the system is the name that the
  204. -.BR resolver (3)
  205. -returns for the host name.
  206. -
  207. -.LP
  208. -Technically: The FQDN is the name
  209. -.BR gethostbyname (2)
  210. -returns for the host name returned by
  211. -.BR gethostname (2).
  212. -The DNS domain name is the part after the first dot.
  213. -.LP
  214. -Therefore it depends on the configuration (usually in
  215. -.IR /etc/host.conf )
  216. -how you can change it. Usually (if the hosts file is parsed before DNS or
  217. -NIS) you can change it in
  218. -.IR /etc/hosts .
  219. -
  220. -
  221. -.SH OPTIONS
  222. -.TP
  223. -.I "\-a, \-\-alias"
  224. -Display the alias name of the host (if used).
  225. -.TP
  226. -.I "\-d, \-\-domain"
  227. -Display the name of the DNS domain. Don't use the command
  228. -.B domainname
  229. -to get the DNS domain name because it will show the NIS domain name and
  230. -not the DNS domain name. Use
  231. -.B dnsdomainname
  232. -instead.
  233. -.TP
  234. -.I "\-F, \-\-file filename"
  235. -Read the host name from the specified file. Comments (lines starting with
  236. -a `#') are ignored.
  237. -.TP
  238. -.I "\-f, \-\-fqdn, \-\-long"
  239. -Display the FQDN (Fully Qualified Domain Name). A FQDN consists of a
  240. -short host name and the DNS domain name. Unless you are using bind or NIS
  241. -for host lookups you can change the FQDN and the DNS domain name (which is
  242. -part of the FQDN) in the \fI/etc/hosts\fR file.
  243. -.TP
  244. -.I "\-h, \-\-help"
  245. -Print a usage message and exit.
  246. -.TP
  247. -.I "\-i, \-\-ip\-address"
  248. -Display the IP address(es) of the host.
  249. -.TP
  250. -.I "\-n, \-\-node"
  251. -Display the DECnet node name. If a parameter is given (or
  252. -.B \-\-file name
  253. -) the root can also set a new node name.
  254. -.TP
  255. -.I "\-s, \-\-short"
  256. -Display the short host name. This is the host name cut at the first dot.
  257. -.TP
  258. -.I "\-V, \-\-version"
  259. -Print version information on standard output and exit successfully.
  260. -.TP
  261. -.I "\-v, \-\-verbose"
  262. -Be verbose and tell what's going on.
  263. -.TP
  264. -.I "\-y, \-\-yp, \-\-nis"
  265. -Display the NIS domain name. If a parameter is given (or
  266. -.B \-\-file name
  267. -) then root can also set a new NIS domain.
  268. -.SH FILES
  269. -.B /etc/hosts
  270. -.SH AUTHOR
  271. -Peter Tobias, <tobias@et\-inf.fho\-emden.de>
  272. -.br
  273. -Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage).
  274. -.br
  275. -Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
  276. -
  277. diff -Naur a/man/en_US/ifconfig.8 b/man/en_US/ifconfig.8
  278. --- a/man/en_US/ifconfig.8 2008-10-02 18:16:59.000000000 -0500
  279. +++ b/man/en_US/ifconfig.8 1969-12-31 18:00:00.000000000 -0600
  280. @@ -1,229 +0,0 @@
  281. -.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
  282. -.SH NAME
  283. -ifconfig \- configure a network interface
  284. -.SH SYNOPSIS
  285. -.B "ifconfig [-v] [-a] [-s] [interface]"
  286. -.br
  287. -.B "ifconfig [-v] interface [aftype] options | address ..."
  288. -.SH DESCRIPTION
  289. -.B Ifconfig
  290. -is used to configure the kernel-resident network interfaces. It is
  291. -used at boot time to set up interfaces as necessary. After that, it
  292. -is usually only needed when debugging or when system tuning is needed.
  293. -.LP
  294. -If no arguments are given,
  295. -.B ifconfig
  296. -displays the status of the currently active interfaces. If
  297. -a single
  298. -.B interface
  299. -argument is given, it displays the status of the given interface
  300. -only; if a single
  301. -.B \-a
  302. -argument is given, it displays the status of all interfaces, even
  303. -those that are down. Otherwise, it configures an interface.
  304. -
  305. -.SH Address Families
  306. -If the first argument after the interface name is recognized as
  307. -the name of a supported address family, that address family is
  308. -used for decoding and displaying all protocol addresses. Currently
  309. -supported address families include
  310. -.B inet
  311. -(TCP/IP, default),
  312. -.B inet6
  313. -(IPv6),
  314. -.B ax25
  315. -(AMPR Packet Radio),
  316. -.B ddp
  317. -(Appletalk Phase 2),
  318. -.B ipx
  319. -(Novell IPX) and
  320. -.B netrom
  321. -(AMPR Packet radio).
  322. -.SH OPTIONS
  323. -.TP
  324. -.B -a
  325. -display all interfaces which are currently available, even if down
  326. -.TP
  327. -.B -s
  328. -display a short list (like netstat -i)
  329. -.TP
  330. -.B -v
  331. -be more verbose for some error conditions
  332. -.TP
  333. -.B interface
  334. -The name of the interface. This is usually a driver name followed by
  335. -a unit number, for example
  336. -.B eth0
  337. -for the first Ethernet interface. If your kernel supports alias interfaces,
  338. -you can specify them with
  339. -.B eth0:0
  340. -for the first alias of eth0. You can use them to assign a second address. To
  341. -delete an alias interface use
  342. -.BR "ifconfig eth0:0 down" .
  343. -Note: for every scope (i.e. same net with address/netmask combination) all
  344. -aliases are deleted, if you delete the first (primary).
  345. -.TP
  346. -.B up
  347. -This flag causes the interface to be activated. It is implicitly
  348. -specified if an address is assigned to the interface.
  349. -.TP
  350. -.B down
  351. -This flag causes the driver for this interface to be shut down.
  352. -.TP
  353. -.B "[\-]arp"
  354. -Enable or disable the use of the ARP protocol on this interface.
  355. -.TP
  356. -.B "[\-]promisc"
  357. -Enable or disable the
  358. -.B promiscuous
  359. -mode of the interface. If selected, all packets on the network will
  360. -be received by the interface.
  361. -.TP
  362. -.B "[\-]allmulti"
  363. -Enable or disable
  364. -.B all-multicast
  365. -mode. If selected, all multicast packets on the network will be
  366. -received by the interface.
  367. -.TP
  368. -.B "metric N"
  369. -This parameter sets the interface metric.
  370. -.TP
  371. -.B "mtu N"
  372. -This parameter sets the Maximum Transfer Unit (MTU) of an interface.
  373. -.TP
  374. -.B "dstaddr addr"
  375. -Set the remote IP address for a point-to-point link (such as
  376. -PPP). This keyword is now obsolete; use the
  377. -.B pointopoint
  378. -keyword instead.
  379. -.TP
  380. -.B "netmask addr"
  381. -Set the IP network mask for this interface. This value defaults to the
  382. -usual class A, B or C network mask (as derived from the interface IP
  383. -address), but it can be set to any value.
  384. -.TP
  385. -.B "add addr/prefixlen"
  386. -Add an IPv6 address to an interface.
  387. -.TP
  388. -.B "del addr/prefixlen"
  389. -Remove an IPv6 address from an interface.
  390. -.TP
  391. -.B "tunnel aa.bb.cc.dd"
  392. -Create a new SIT (IPv6-in-IPv4) device, tunnelling to the given destination.
  393. -.TP
  394. -.B "irq addr"
  395. -Set the interrupt line used by this device. Not all devices can
  396. -dynamically change their IRQ setting.
  397. -.TP
  398. -.B "io_addr addr"
  399. -Set the start address in I/O space for this device.
  400. -.TP
  401. -.B "mem_start addr"
  402. -Set the start address for shared memory used by this device. Only a
  403. -few devices need this.
  404. -.TP
  405. -.B "media type"
  406. -Set the physical port or medium type to be used by the device. Not
  407. -all devices can change this setting, and those that can vary in what
  408. -values they support. Typical values for
  409. -.B type
  410. -are
  411. -.B 10base2
  412. -(thin Ethernet),
  413. -.B 10baseT
  414. -(twisted-pair 10Mbps Ethernet),
  415. -.B AUI
  416. -(external transceiver) and so on. The special medium type of
  417. -.B auto
  418. -can be used to tell the driver to auto-sense the media. Again, not
  419. -all drivers can do this.
  420. -.TP
  421. -.B "[\-]broadcast [addr]"
  422. -If the address argument is given, set the protocol broadcast
  423. -address for this interface. Otherwise, set (or clear) the
  424. -.B IFF_BROADCAST
  425. -flag for the interface.
  426. -.TP
  427. -.B "[\-]pointopoint [addr]"
  428. -This keyword enables the
  429. -.B point-to-point
  430. -mode of an interface, meaning that it is a direct link between two
  431. -machines with nobody else listening on it.
  432. -.br
  433. -If the address argument is also given, set the protocol address of
  434. -the other side of the link, just like the obsolete
  435. -.B dstaddr
  436. -keyword does. Otherwise, set or clear the
  437. -.B IFF_POINTOPOINT
  438. -flag for the interface.
  439. -.TP
  440. -.B hw class address
  441. -Set the hardware address of this interface, if the device driver
  442. -supports this operation. The keyword must be followed by the
  443. -name of the hardware class and the printable ASCII equivalent of
  444. -the hardware address. Hardware classes currently supported include
  445. -.B ether
  446. -(Ethernet),
  447. -.B ax25
  448. -(AMPR AX.25),
  449. -.B ARCnet
  450. -and
  451. -.B netrom
  452. -(AMPR NET/ROM).
  453. -.TP
  454. -.B multicast
  455. -Set the multicast flag on the interface. This should not normally be needed
  456. -as the drivers set the flag correctly themselves.
  457. -.TP
  458. -.B address
  459. -The IP address to be assigned to this interface.
  460. -.TP
  461. -.B txqueuelen length
  462. -Set the length of the transmit queue of the device. It is useful to set this
  463. -to small values for slower devices with a high latency (modem links, ISDN)
  464. -to prevent fast bulk transfers from disturbing interactive traffic like
  465. -telnet too much.
  466. -.SH NOTES
  467. -Since kernel release 2.2 there are no explicit interface statistics for
  468. -alias interfaces anymore. The statistics printed for the original address
  469. -are shared with all alias addresses on the same device. If you want per-address
  470. -statistics you should add explicit accounting
  471. -rules for the address using the
  472. -.BR ipchains (8)
  473. -or
  474. -.BR iptables (8)
  475. -command.
  476. -.LP
  477. -Since net\-tools 1.60\-4 ifconfig is printing byte counters and human readable
  478. -counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers
  479. -are truncated to one decimal (which can by quite a large error if you
  480. -consider 0.1 PiB is 112.589.990.684.262 bytes :)
  481. -.LP
  482. -Interrupt problems with Ethernet device drivers fail with EAGAIN
  483. -.I (SIOCSIIFLAGS: Resource temporarily unavailable)
  484. -it is most likely a interrupt conflict. See
  485. -.I http://www.scyld.com/expert/irq\-conflict.html
  486. -for more information.
  487. -.SH FILES
  488. -.I /proc/net/socket
  489. -.br
  490. -.I /proc/net/dev
  491. -.br
  492. -.I /proc/net/if_inet6
  493. -.SH BUGS
  494. -While appletalk DDP and IPX addresses will be displayed they cannot be
  495. -altered by this command.
  496. -.SH SEE ALSO
  497. -route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
  498. -.br
  499. -http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
  500. -.SH AUTHORS
  501. -Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  502. -.br
  503. -Alan Cox, <Alan.Cox@linux.org>
  504. -.br
  505. -Phil Blundell, <Philip.Blundell@pobox.com>
  506. -.br
  507. -Andi Kleen
  508. -.br
  509. -Bernd Eckenfels, <net\-tools@lina.inka.de>
  510. diff -Naur a/man/en_US/nisdomainname.1 b/man/en_US/nisdomainname.1
  511. --- a/man/en_US/nisdomainname.1 1998-08-10 15:51:12.000000000 -0500
  512. +++ b/man/en_US/nisdomainname.1 1969-12-31 18:00:00.000000000 -0600
  513. @@ -1 +0,0 @@
  514. -.so man1/hostname.1
  515. diff -Naur a/man/en_US/ypdomainname.1 b/man/en_US/ypdomainname.1
  516. --- a/man/en_US/ypdomainname.1 1998-08-10 15:51:16.000000000 -0500
  517. +++ b/man/en_US/ypdomainname.1 1969-12-31 18:00:00.000000000 -0600
  518. @@ -1 +0,0 @@
  519. -.so man1/hostname.1