From 66ea9ba4e7717e84714cb1c89d62b10e7d042fd9 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 17 Dec 2004 13:49:04 +0000
Subject: patch net-tools to make it work nicely with gcc-3.4

svn path=/nixpkgs/branches/nixos-pkgs/; revision=1898
---
 pkgs/os-specific/linux/net-tools/builder.sh        |  1 +
 pkgs/os-specific/linux/net-tools/default.nix       |  1 +
 .../linux/net-tools/net-tools-labels.patch         | 38 ++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/os-specific/linux/net-tools/net-tools-labels.patch

(limited to 'pkgs/os-specific/linux/net-tools')

diff --git a/pkgs/os-specific/linux/net-tools/builder.sh b/pkgs/os-specific/linux/net-tools/builder.sh
index 17dea5297f6..c7f9975866a 100644
--- a/pkgs/os-specific/linux/net-tools/builder.sh
+++ b/pkgs/os-specific/linux/net-tools/builder.sh
@@ -6,6 +6,7 @@ cd net-tools-*
 cp $config config.h
 sed "s^/usr/share/man^/share^"  < man/Makefile > tmp
 mv tmp man/Makefile
+patch -p1 < $patch
 make
 mkdir $out
 make BASEDIR=$out install
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index d93870c1b25..d8764f391d6 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -8,4 +8,5 @@ stdenv.mkDerivation {
     md5 = "888774accab40217dde927e21979c165";
   };
   config = ./config.h;
+  patch = ./net-tools-labels.patch;
 }
diff --git a/pkgs/os-specific/linux/net-tools/net-tools-labels.patch b/pkgs/os-specific/linux/net-tools/net-tools-labels.patch
new file mode 100644
index 00000000000..82c3a27d9c6
--- /dev/null
+++ b/pkgs/os-specific/linux/net-tools/net-tools-labels.patch
@@ -0,0 +1,38 @@
+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. */
-- 
cgit 1.4.1