- disable metricom (obsolete in kernel); fix build

diff --git a/net-tools-Werror.patch b/net-tools-Werror.patch
new file mode 100644 (file)
index 0000000..1968edb
--- /dev/null
+++ b/net-tools-Werror.patch
@@ -0,0 +1,33 @@
+--- net-tools-1.60/rarp.c~     2001-04-08 19:05:05.000000000 +0200
++++ net-tools-1.60/rarp.c      2013-02-16 22:41:25.888096075 +0100
+@@ -225,7 +225,7 @@
+       case 'h':
+           usage();
+       case 'V':
+-          fprintf(stderr, version_string);
++          fprintf(stderr, "%s", version_string);
+           exit(E_VERSION);
+           break;
+       case 'v':
+--- net-tools-1.60/slattach.c~ 2000-10-28 12:59:41.000000000 +0200
++++ net-tools-1.60/slattach.c  2013-02-16 22:42:41.059884440 +0100
+@@ -565,7 +565,7 @@
+         "[-c cmd] [-s speed] [-p protocol] tty | -\n"
+         "       slattach -V | --version\n";
+ 
+-  fprintf(stderr, usage_msg);
++  fprintf(stderr, "%s", usage_msg);
+   exit(1);
+ }
+ 
+--- net-tools-1.60/mii-tool.c~ 2013-02-16 22:42:58.786976322 +0100
++++ net-tools-1.60/mii-tool.c  2013-02-16 22:43:17.657430178 +0100
+@@ -271,7 +271,7 @@
+ 
+     if (opt_watch) {
+       if (opt_log) {
+-          syslog(LOG_INFO, buf);
++          syslog(LOG_INFO, "%s", buf);
+       } else {
+           char s[20];
+           time_t t = time(NULL);

diff --git a/net-tools-config.patch b/net-tools-config.patch
index 414b065513195156aa76d7d0ccb9bf3da8602ca3..88e9b5f337ed6390d51af6b33d5a31f43f456595 100644 (file)
--- a/net-tools-config.patch
+++ b/net-tools-config.patch
@@ -53,7 +53,7 @@ diff -Nru net-tools-1.56/config.h net-tools-1.56.new/config.h
 +#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 0
@@ -98,7 +98,7 @@ diff -Nru net-tools-1.56/config.make net-tools-1.56.new/config.make
 +HAVE_HWSLIP=1
 +HAVE_HWPPP=1
 +HAVE_HWTUNNEL=1
-+HAVE_HWSTRIP=1
++
 +HAVE_HWTR=1
 +HAVE_HWAX25=1
 +# HAVE_HWROSE=0

diff --git a/net-tools-tr.patch b/net-tools-tr.patch
new file mode 100644 (file)
index 0000000..a165d4c
--- /dev/null
+++ b/net-tools-tr.patch
@@ -0,0 +1,24 @@
+--- net-tools-1.60/lib/tr.c~   2000-02-20 22:46:45.000000000 +0100
++++ net-tools-1.60/lib/tr.c    2013-02-16 22:38:06.260052375 +0100
+@@ -20,7 +20,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <net/if_arp.h>
+-#include <linux/if_tr.h>
++#include <linux/if_fddi.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+--- net-tools-1.60/lib/tr.c~   2013-02-16 22:39:03.864803754 +0100
++++ net-tools-1.60/lib/tr.c    2013-02-16 22:40:02.122803924 +0100
+@@ -31,6 +31,10 @@
+ #include "pathnames.h"
+ #include "intl.h"
+ 
++#ifndef TR_ALEN
++#define TR_ALEN FDDI_K_ALEN
++#endif
++
+ extern struct hwtype tr_hwtype;
+ 
+ static char *pr_tr(unsigned char *ptr)

diff --git a/net-tools.spec b/net-tools.spec
index f27a689f5cf3468b0c5f4001be25b95dcf5a3f6b..ca74ed861690fc4aa44c254b61c0f0d586d9df21 100644 (file)
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -38,6 +38,8 @@ Patch18:      %{name}-ifaceopt.patch
 Patch19:       %{name}-netstat-overflow.patch
 Patch20:       %{name}-netstat-netlink-diag.patch
 Patch21:       %{name}-statistics_buffer.patch
+Patch22:       %{name}-tr.patch
+Patch23:       %{name}-Werror.patch
 URL:           http://net-tools.berlios.de/
 BuildRequires: gettext-devel
 Requires:      hostname
@@ -152,6 +154,8 @@ maszyny połączonej poprzez PLIP.
 %patch19 -p1
 %patch20 -p0
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 mv po/et_EE.po po/et.po