public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net-tools: Update to 1.60_p20120127084908

Browse Source 
Apparently token ring support is gone in the kernel.

http://hydra.nixos.org/build/3081969
This commit is contained in:
Eelco Dolstra 2012-10-16 14:29:31 -04:00
parent 6c75d07e65
commit ca298b5fe6
3 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/net-tools/config.h
View File

@ -38,6 +38,7 @@
#define HAVE_AFECONET 0 #define HAVE_AFECONET 0
#define HAVE_AFDECnet 0 #define HAVE_AFDECnet 0
#define HAVE_AFASH 0 #define HAVE_AFASH 0
#define HAVE_AFBLUETOOTH 0
/* /*
* *
@ -50,19 +51,22 @@
#define HAVE_HWPPP 1 #define HAVE_HWPPP 1
#define HAVE_HWTUNNEL 1 #define HAVE_HWTUNNEL 1
#define HAVE_HWSTRIP 1 #define HAVE_HWSTRIP 1
#define HAVE_HWTR 1 #define HAVE_HWTR 0
#define HAVE_HWAX25 0 #define HAVE_HWAX25 0
#define HAVE_HWROSE 0 #define HAVE_HWROSE 0
#define HAVE_HWNETROM 1 #define HAVE_HWNETROM 1
#define HAVE_HWX25 0 #define HAVE_HWX25 0
#define HAVE_HWFR 1 #define HAVE_HWFR 1
#define HAVE_HWSIT 0 #define HAVE_HWSIT 1
#define HAVE_HWFDDI 0 #define HAVE_HWFDDI 0
#define HAVE_HWHIPPI 0 #define HAVE_HWHIPPI 0
#define HAVE_HWASH 0 #define HAVE_HWASH 0
#define HAVE_HWHDLCLAPB 0 #define HAVE_HWHDLCLAPB 0
#define HAVE_HWIRDA 1 #define HAVE_HWIRDA 1
#define HAVE_HWEC 0 #define HAVE_HWEC 0
#define HAVE_HWEC 0
#define HAVE_HWEUI64 1
#define HAVE_HWIB 1
/* /*
* *
@ -72,3 +76,4 @@
#define HAVE_FW_MASQUERADE 0 #define HAVE_FW_MASQUERADE 0
#define HAVE_IP_TOOLS 0 #define HAVE_IP_TOOLS 0
#define HAVE_MII 0 #define HAVE_MII 0
#define HAVE_SELINUX 0

10
pkgs/os-specific/linux/net-tools/default.nix
View File

@ -1,15 +1,13 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "net-tools-1.60"; name = "net-tools-1.60_p20120127084908";
src = fetchurl { src = fetchurl {
url = http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2; url = "mirror://gentoo/distfiles/${name}.tar.xz";
md5 = "888774accab40217dde927e21979c165"; sha256 = "408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94";
}; };
patches = [ ./net-tools-labels.patch ];
preBuild = preBuild =
'' ''
cp ${./config.h} config.h cp ${./config.h} config.h

38
pkgs/os-specific/linux/net-tools/net-tools-labels.patch
View File

@ -1,38 +0,0 @@
diff -ruN net-tools-1.60/hostname.c net-tools-1.60-new/hostname.c
--- net-tools-1.60/hostname.c 2001-04-08 19:04:23.000000000 +0200
+++ net-tools-1.60-new/hostname.c 2004-12-17 14:48:15.624174382 +0100
@@ -98,6 +98,7 @@
fprintf(stderr, _("%s: name too long\n"), program_name);
break;
default:
+ break;
}
exit(1);
};
@@ -117,6 +118,7 @@
fprintf(stderr, _("%s: name too long\n"), program_name);
break;
default:
+ break;
}
exit(1);
};
@@ -174,6 +176,7 @@
printf("%s\n", hp->h_name);
break;
default:
+ break;
}
}
diff -ruN net-tools-1.60/lib/inet_sr.c net-tools-1.60-new/lib/inet_sr.c
--- net-tools-1.60/lib/inet_sr.c 2000-02-20 22:46:45.000000000 +0100
+++ net-tools-1.60-new/lib/inet_sr.c 2004-12-17 14:37:15.416349441 +0100
@@ -105,6 +105,7 @@
case 2:
isnet = 0; break;
default:
+ break;
}
/* Fill in the other fields. */