From 127dbb9e3871679b10feba3ea9163c018cf03ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 12 Sep 2007 11:07:36 +0000 Subject: [PATCH] Remove unused patches. --- iproute2-2.4.7-initvar.patch | 12 ------- iproute2-2.6.9-owl-nstat-bound.patch | 54 ---------------------------- iproute2-2.6.9-ss.patch | 11 ------ iproute2-ss050901-host_len.patch | 18 ---------- iproute2-ss050901-opt_flags.patch | 11 ------ 5 files changed, 106 deletions(-) delete mode 100644 iproute2-2.4.7-initvar.patch delete mode 100644 iproute2-2.6.9-owl-nstat-bound.patch delete mode 100644 iproute2-2.6.9-ss.patch delete mode 100644 iproute2-ss050901-host_len.patch delete mode 100644 iproute2-ss050901-opt_flags.patch diff --git a/iproute2-2.4.7-initvar.patch b/iproute2-2.4.7-initvar.patch deleted file mode 100644 index 09adc4a..0000000 --- a/iproute2-2.4.7-initvar.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- iproute2/ip/iproute.c.initvar 2004-04-21 16:57:59.307562694 +0200 -+++ iproute2/ip/iproute.c 2004-04-21 16:58:35.353103364 +0200 -@@ -620,6 +620,9 @@ - } - memset(rtnh, 0, sizeof(*rtnh)); - rtnh->rtnh_len = sizeof(*rtnh); -+ rtnh->rtnh_ifindex = 0; -+ rtnh->rtnh_flags = 0; -+ rtnh->rtnh_hops = 0; - rta->rta_len += rtnh->rtnh_len; - parse_one_nh(rta, rtnh, &argc, &argv); - rtnh = RTNH_NEXT(rtnh); diff --git a/iproute2-2.6.9-owl-nstat-bound.patch b/iproute2-2.6.9-owl-nstat-bound.patch deleted file mode 100644 index 60b3b5b..0000000 --- a/iproute2-2.6.9-owl-nstat-bound.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- iproute2-2.6.9/misc/nstat.c.bound 2004-08-31 14:32:14.000000000 -0400 -+++ iproute2-2.6.9/misc/nstat.c 2004-09-05 10:32:26.000000000 -0400 -@@ -121,14 +121,16 @@ - int nr; - unsigned long long val; - double rate; -- char idbuf[256]; -+ char idbuf[sizeof(buf)]; - if (buf[0] == '#') { - buf[strlen(buf)-1] = 0; - if (info_source[0] && strcmp(info_source, buf+1)) - source_mismatch = 1; -- strncpy(info_source, buf+1, sizeof(info_source)-1); -+ info_source[0] = 0; -+ strncat(info_source, buf+1, sizeof(info_source)-1); - continue; - } -+ /* idbuf is as big as buf, so this is safe */ - nr = sscanf(buf, "%s%llu%lg", idbuf, &val, &rate); - if (nr < 2) - abort(); -@@ -162,7 +164,7 @@ - struct nstat_ent *n; - - while (fgets(buf, sizeof(buf), fp) != NULL) { -- char idbuf[256]; -+ char idbuf[sizeof(buf)]; - int off; - char *p; - -@@ -170,8 +172,9 @@ - if (!p) - abort(); - *p = 0; -- strcpy(idbuf, buf); -- off = strlen(idbuf); -+ idbuf[0] = 0; -+ strncat(idbuf, buf, sizeof(idbuf) -1); -+ off = p - buf; - p += 2; - - while (*p) { -@@ -180,7 +183,10 @@ - *next++ = 0; - else if ((next = strchr(p, '\n')) != NULL) - *next++ = 0; -- strcpy(idbuf+off, p); -+ if (off < sizeof(idbuf)) { -+ idbuf[off] = 0; -+ strncat(idbuf, p, sizeof(idbuf) - off - 1); -+ } - n = malloc(sizeof(*n)); - if (!n) - abort(); diff --git a/iproute2-2.6.9-ss.patch b/iproute2-2.6.9-ss.patch deleted file mode 100644 index 79ff596..0000000 --- a/iproute2-2.6.9-ss.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-2.6.9/misc/ss.c.ss 2004-08-31 20:32:14.000000000 +0200 -+++ iproute2-2.6.9/misc/ss.c 2004-09-01 13:02:54.574367176 +0200 -@@ -34,7 +34,7 @@ - #include "SNAPSHOT.h" - - #include --#include -+#include - #include - - int resolve_hosts = 0; diff --git a/iproute2-ss050901-host_len.patch b/iproute2-ss050901-host_len.patch deleted file mode 100644 index 9567fe4..0000000 --- a/iproute2-ss050901-host_len.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- iproute2-ss050901/ip/iproute.c~ 2005-09-01 14:21:50.000000000 -0500 -+++ iproute2-ss050901/ip/iproute.c 2005-10-06 21:30:36.000000000 -0500 -@@ -216,13 +216,13 @@ int print_route(const struct sockaddr_nl - memset(&via, 0, sizeof(via)); - via.family = r->rtm_family; - if (tb[RTA_GATEWAY]) -- memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]), host_len); -+ memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]), host_len/8); - } - if (filter.rprefsrc.bitlen>0) { - memset(&prefsrc, 0, sizeof(prefsrc)); - prefsrc.family = r->rtm_family; - if (tb[RTA_PREFSRC]) -- memcpy(&prefsrc.data, RTA_DATA(tb[RTA_PREFSRC]), host_len); -+ memcpy(&prefsrc.data, RTA_DATA(tb[RTA_PREFSRC]), host_len/8); - } - - if (filter.rdst.family && inet_addr_match(&dst, &filter.rdst, filter.rdst.bitlen)) diff --git a/iproute2-ss050901-opt_flags.patch b/iproute2-ss050901-opt_flags.patch deleted file mode 100644 index e665410..0000000 --- a/iproute2-ss050901-opt_flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-ss050901/Makefile.opt_flags 2005-09-23 11:49:01.000000000 +0200 -+++ iproute2-ss050901/Makefile 2005-09-23 11:49:31.000000000 +0200 -@@ -22,7 +22,7 @@ - - CC = gcc - HOSTCC = gcc --CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -+CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall $(RPM_OPT_FLAGS) - CFLAGS = $(CCOPTS) -I../include $(DEFINES) - YACCFLAGS = -d -t -v -