summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2019-02-04 23:59:58 +0100
committerLeo Famulari <leo@famulari.name>2019-02-05 00:19:49 +0100
commit1d1b0b1fb18689b4b5b78f30c1ccae31e1b91cb7 (patch)
tree876d16606a5ad6defbd64333959290521f1658e2 /gnu
parent035542e93ae1bde8fbe1ca99acee77b8241d86fa (diff)
downloadguix-1d1b0b1fb18689b4b5b78f30c1ccae31e1b91cb7.tar.gz
gnu: Remove unused patch 'net-tools-bitrot.patch'.
This is a followup to commit b5f610620b65eabd671a5f68d6e6155194101efa.

* gnu/packages/patches/net-tools-bitrot.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/net-tools-bitrot.patch108
2 files changed, 0 insertions, 109 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 1ea4914440..c1a2436609 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1061,7 +1061,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch    \
   %D%/packages/patches/mutt-store-references.patch		\
   %D%/packages/patches/m4-gnulib-libio.patch			\
-  %D%/packages/patches/net-tools-bitrot.patch			\
   %D%/packages/patches/netcdf-date-time.patch			\
   %D%/packages/patches/netcdf-tst_h_par.patch			\
   %D%/packages/patches/netsurf-message-timestamp.patch		\
diff --git a/gnu/packages/patches/net-tools-bitrot.patch b/gnu/packages/patches/net-tools-bitrot.patch
deleted file mode 100644
index 89ab6f19eb..0000000000
--- a/gnu/packages/patches/net-tools-bitrot.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Starting with libc 2.20, this file would fail to build with "NULL undeclared".
-Include the fine header to solve that.
-
---- net-tools-1.60/lib/ec_hw.c	1999-11-20 22:02:53.000000000 +0100
-+++ net-tools-1.60/lib/ec_hw.c	2014-10-06 22:48:43.811027768 +0200
-@@ -16,6 +16,7 @@
- 
- #if HAVE_HWEC
- 
-+#include <stddef.h>
- #include <net/if_arp.h>
- #include "net-support.h"
-
-
-Avoid "label at end of compound statement" errors.
-
---- net-tools-1.60/lib/inet_sr.c	2000-02-20 22:46:45.000000000 +0100
-+++ net-tools-1.60/lib/inet_sr.c	2014-10-06 22:51:22.575023126 +0200
-@@ -104,7 +104,6 @@ static int INET_setroute(int action, int
-        isnet = 1; break;
-     case 2:
-        isnet = 0; break;
--    default:
-     }
- 
-     /* Fill in the other fields. */
-
---- net-tools-1.60/hostname.c	2001-04-08 19:04:23.000000000 +0200
-+++ net-tools-1.60/hostname.c	2014-10-06 23:01:04.235006119 +0200
-@@ -77,7 +77,6 @@ static void setnname(char *nname)
-         case EINVAL:
-             fprintf(stderr, _("%s: name too long\n"), program_name);
-             break;
--        default:
-         }
- 	exit(1);
-     }
-@@ -97,7 +96,6 @@ static void sethname(char *hname)
- 	case EINVAL:
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
--	default:
- 	}
- 	exit(1);
-     };
-@@ -116,7 +114,6 @@ static void setdname(char *dname)
- 	case EINVAL:
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
--	default:
- 	}
- 	exit(1);
-     };
-@@ -173,7 +170,6 @@ static void showhname(char *hname, int c
- 	    *p = '\0';
- 	printf("%s\n", hp->h_name);
- 	break;
--    default:
-     }
- }
-
-
-Work around the assumption that an 'x25_address' typedef exists.
-
---- net-tools-1.60/lib/x25_sr.c	2000-05-20 15:38:10.000000000 +0200
-+++ net-tools-1.60/lib/x25_sr.c	2014-10-06 22:59:35.787008705 +0200
-@@ -77,7 +77,7 @@ static int X25_setroute(int action, int
-   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")) {
-
-
-Fix the multi-line string literal syntax.
-
---- net-tools-1.60/mii-tool.c	2000-05-21 16:31:17.000000000 +0200
-+++ net-tools-1.60/mii-tool.c	2014-10-06 23:07:42.002994489 +0200
-@@ -379,16 +379,16 @@ static void watch_one_xcvr(int skfd, cha
- /*--------------------------------------------------------------------*/
- 
- 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,
-+"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)