Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 20 years ago
parent
commit
e8099444cd
8 changed files with 103 additions and 268 deletions
  1. +12
    -31
      package/base/net-tools/config.h
  2. +0
    -93
      package/base/net-tools/config.h.diet
  3. +35
    -0
      package/base/net-tools/config.make
  4. +13
    -30
      package/base/net-tools/config.status
  5. +0
    -108
      package/base/net-tools/config.status.diet
  6. +31
    -0
      package/base/net-tools/mii_hotfix.patch
  7. +1
    -6
      package/base/net-tools/net-tools.conf
  8. +11
    -0
      package/base/net-tools/x25_hotfix.patch

+ 12
- 31
package/base/net-tools/config.h

@ -1,27 +1,4 @@
/*
*
* --- 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/base/net-tools/config.h
* ROCK Linux is Copyright (C) 1998 - 2006 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
@ -34,15 +11,12 @@
/*
*
* 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!
* Internationalization
*
* (answer 'n' if you have no system with GNU gettext support)
* The net-tools package has currently been translated to French,
* German and Brazilian Portugese. Other translations are, of
* course, welcome. Answer `n' here if you have no support for
* internationalization on your system.
*
*/
#define I18N 0
@ -60,8 +34,10 @@
#define HAVE_AFAX25 1
#define HAVE_AFNETROM 1
#define HAVE_AFROSE 1
#define HAVE_AFX25 1
#define HAVE_AFECONET 1
#define HAVE_AFDECnet 0
#define HAVE_AFASH 1
/*
*
@ -73,16 +49,20 @@
#define HAVE_HWSLIP 1
#define HAVE_HWPPP 1
#define HAVE_HWTUNNEL 1
#define HAVE_HWSTRIP 1
#define HAVE_HWTR 1
#define HAVE_HWAX25 1
#define HAVE_HWROSE 1
#define HAVE_HWNETROM 1
#define HAVE_HWX25 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
#define HAVE_HWIRDA 1
#define HAVE_HWEC 1
/*
*
@ -91,3 +71,4 @@
*/
#define HAVE_FW_MASQUERADE 1
#define HAVE_IP_TOOLS 1
#define HAVE_MII 1

+ 0
- 93
package/base/net-tools/config.h.diet

@ -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/base/net-tools/config.h.diet
* ROCK Linux is Copyright (C) 1998 - 2006 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

+ 35
- 0
package/base/net-tools/config.make

@ -0,0 +1,35 @@
# I18N=0
HAVE_AFUNIX=1
HAVE_AFINET=1
HAVE_AFINET6=1
HAVE_AFIPX=1
HAVE_AFATALK=1
HAVE_AFAX25=1
HAVE_AFNETROM=1
HAVE_AFROSE=1
HAVE_AFX25=1
HAVE_AFECONET=1
# HAVE_AFDECnet=0
HAVE_AFASH=1
HAVE_HWETHER=1
HAVE_HWARC=1
HAVE_HWSLIP=1
HAVE_HWPPP=1
HAVE_HWTUNNEL=1
HAVE_HWSTRIP=1
HAVE_HWTR=1
HAVE_HWAX25=1
HAVE_HWROSE=1
HAVE_HWNETROM=1
HAVE_HWX25=1
HAVE_HWFR=1
HAVE_HWSIT=1
HAVE_HWFDDI=1
HAVE_HWHIPPI=1
HAVE_HWASH=1
HAVE_HWHDLCLAPB=1
HAVE_HWIRDA=1
HAVE_HWEC=1
HAVE_FW_MASQUERADE=1
HAVE_IP_TOOLS=1
HAVE_MII=1

+ 13
- 30
package/base/net-tools/config.status

@ -1,24 +1,3 @@
# --- 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/base/net-tools/config.status
# ROCK Linux is Copyright (C) 1998 - 2006 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.in Configure.sh source for the net-tools.
# This file contains the definition of what the support
@ -29,7 +8,7 @@
# NET-3 Networking Distribution for the LINUX operating
# system.
#
# Version: config.in 1.21 (98-06-30)
# Version: config.in 1.22 (99-04-19)
#
# Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
# Copyright 1988-1993 MicroWalt Corporation
@ -56,15 +35,12 @@
= */
*
*
* I18N
* Internationalization
*
* (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)
* The net-tools package has currently been translated to French,
* German and Brazilian Portugese. Other translations are, of
* course, welcome. Answer `n' here if you have no support for
* internationalization on your system.
*
bool 'Does your system support GNU gettext?' I18N n
*
@ -79,8 +55,10 @@ 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 'X.25 (CCITT) protocol family' HAVE_AFX25 y
bool 'Econet protocol family' HAVE_AFECONET y
bool 'DECnet protocol family' HAVE_AFDECnet n
bool 'Ash protocol family' HAVE_AFASH y
*
*
* Device Hardware types.
@ -90,19 +68,24 @@ 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 'STRIP (Metricom radio) support' HAVE_HWSTRIP 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 'X.25 (generic) support' HAVE_HWX25 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
bool 'IrDA support' HAVE_HWIRDA y
bool 'Econet hardware support' HAVE_HWEC y
*
*
* Other Features.
*
bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
bool 'Build mii-tool' HAVE_MII y

+ 0
- 108
package/base/net-tools/config.status.diet

@ -1,108 +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/base/net-tools/config.status.diet
# ROCK Linux is Copyright (C) 1998 - 2006 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.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, <waltje@uwalt.nl.mugnet.org>
# Copyright 1988-1993 MicroWalt Corporation
#
# Bernd 'eckes' Eckenfels <net-tools@lina.inka.de>
# Arnaldo Carvalho de Melo <acme@conectiva.com.br>
# 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

+ 31
- 0
package/base/net-tools/mii_hotfix.patch

@ -0,0 +1,31 @@
--- ./mii-tool.c.orig 2006-03-17 15:18:10.000000000 +0100
+++ ./mii-tool.c 2006-03-17 15:18:53.000000000 +0100
@@ -379,17 +379,17 @@
/*--------------------------------------------------------------------*/
const char *usage =
-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
- -V, --version display version information
- -v, --verbose more verbose output
- -R, --reset reset MII to poweron state
- -r, --restart restart autonegotiation
- -w, --watch monitor for link status changes
- -l, --log with -w, write events to syslog
- -A, --advertise=media,... advertise only specified media
- -F, --force=media force specified media technology
-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
- (to advertise both HD and FD) 100baseTx, 10baseT\n";
+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
+" -V, --version display version information\n"
+" -v, --verbose more verbose output\n"
+" -R, --reset reset MII to poweron state\n"
+" -r, --restart restart autonegotiation\n"
+" -w, --watch monitor for link status changes\n"
+" -l, --log with -w, write events to syslog\n"
+" -A, --advertise=media,... advertise only specified media\n"
+" -F, --force=media force specified media technology\n"
+"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
+" (to advertise both HD and FD) 100baseTx, 10baseT\n";
int main(int argc, char **argv)
{

+ 1
- 6
package/base/net-tools/net-tools.conf

@ -20,12 +20,7 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
if [ $target == "dietlibc" ]; then
premake="cp $confdir/config.h.diet ./config.h"
premake="$premake ; cp $confdir/config.status.diet ./config.status"
else
premake="cp $confdir/config.h $confdir/config.status ."
fi
premake="cp $confdir/config.h $confdir/config.status $confdir/config.make ."
makeopt="CC='$CC' LD='$CC' COPTS='-O2 -fomit-frame-pointer'"
makeinstopt="BASEDIR=$root install"

+ 11
- 0
package/base/net-tools/x25_hotfix.patch

@ -0,0 +1,11 @@
--- ./lib/x25_sr.c.orig 2006-03-17 15:05:41.000000000 +0100
+++ ./lib/x25_sr.c 2006-03-17 15:05:51.000000000 +0100
@@ -77,7 +77,7 @@
rt.sigdigits=sigdigits;
/* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
- memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
while (*args) {
if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {

Loading…
Cancel
Save