summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff22
-rw-r--r--meta/recipes-extended/iputils/iputils_s20101006.bb (renamed from meta/recipes-extended/iputils/iputils_s20100418.bb)5
2 files changed, 2 insertions, 25 deletions
diff --git a/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff b/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff
deleted file mode 100644
index 98aae0d457..0000000000
--- a/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: trunk/ping.c
2===================================================================
3--- trunk.orig/ping.c 2010-07-23 21:26:53.000000000 -0700
4+++ trunk/ping.c 2010-07-23 21:28:27.000000000 -0700
5@@ -1059,7 +1059,7 @@
6 i = j;
7 i -= IPOPT_MINOFF;
8 if (i <= 0)
9- continue;
10+ break;
11 if (i == old_rrlen
12 && !strncmp((char *)cp, old_rr, i)
13 && !(options & F_FLOOD)) {
14@@ -1096,7 +1096,7 @@
15 i = j;
16 i -= 5;
17 if (i <= 0)
18- continue;
19+ break;
20 flags = *++cp;
21 printf("\nTS: ");
22 cp++;
diff --git a/meta/recipes-extended/iputils/iputils_s20100418.bb b/meta/recipes-extended/iputils/iputils_s20101006.bb
index 2b2d76a515..0a4201787c 100644
--- a/meta/recipes-extended/iputils/iputils_s20100418.bb
+++ b/meta/recipes-extended/iputils/iputils_s20101006.bb
@@ -21,11 +21,10 @@ SRC_URI = "http://www.skbuff.net/iputils/${PN}-${PV}.tar.bz2 \
21 file://debian/use_gethostbyname2.diff \ 21 file://debian/use_gethostbyname2.diff \
22 file://debian/targets.diff \ 22 file://debian/targets.diff \
23 file://debian/fix-arping-timeouts.diff \ 23 file://debian/fix-arping-timeouts.diff \
24 file://debian/CVE-2010-2529.diff \
25 " 24 "
26 25
27SRC_URI[md5sum] = "df6b0062118cdc5c62e3c810f831e976" 26SRC_URI[md5sum] = "a36c25e9ec17e48be514dc0485e7376c"
28SRC_URI[sha256sum] = "d0e8cbe6ce6a484ffb81697425b3b933746882f6f1521ac71c5c88971cee7684" 27SRC_URI[sha256sum] = "fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7"
29 28
30# man is not compiled here, since it requires docbook-utils-native 29# man is not compiled here, since it requires docbook-utils-native
31# which is not available in poky 30# which is not available in poky