diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-01-25 12:52:08 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 21:52:58 +0000 |
| commit | 3cc784e4178ebdf061f5c478d9df1348ba85db18 (patch) | |
| tree | 02260428ce252de9cc2c85f9c8b2e86f4f933604 /meta/recipes-extended/iputils | |
| parent | deec6fa8d0748297eb40eb4fe98e4fec8fb201f4 (diff) | |
| download | openembedded-core-3cc784e4178ebdf061f5c478d9df1348ba85db18.tar.gz openembedded-core-3cc784e4178ebdf061f5c478d9df1348ba85db18.tar.bz2 openembedded-core-3cc784e4178ebdf061f5c478d9df1348ba85db18.tar.xz openembedded-core-3cc784e4178ebdf061f5c478d9df1348ba85db18.zip | |
iputils: upgrade to s20101006
- change the src_uri md5/sha256 checksum
- remove the CVE patch, since it is already in upstream
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta/recipes-extended/iputils')
| -rw-r--r-- | meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff | 22 | ||||
| -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 98aae0d45..000000000 --- a/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: trunk/ping.c -=================================================================== ---- trunk.orig/ping.c 2010-07-23 21:26:53.000000000 -0700 -+++ trunk/ping.c 2010-07-23 21:28:27.000000000 -0700 -@@ -1059,7 +1059,7 @@ - i = j; - i -= IPOPT_MINOFF; - if (i <= 0) -- continue; -+ break; - if (i == old_rrlen - && !strncmp((char *)cp, old_rr, i) - && !(options & F_FLOOD)) { -@@ -1096,7 +1096,7 @@ - i = j; - i -= 5; - if (i <= 0) -- continue; -+ break; - flags = *++cp; - printf("\nTS: "); - cp++; diff --git a/meta/recipes-extended/iputils/iputils_s20100418.bb b/meta/recipes-extended/iputils/iputils_s20101006.bb index 2b2d76a51..0a4201787 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 \ file://debian/use_gethostbyname2.diff \ file://debian/targets.diff \ file://debian/fix-arping-timeouts.diff \ - file://debian/CVE-2010-2529.diff \ " -SRC_URI[md5sum] = "df6b0062118cdc5c62e3c810f831e976" -SRC_URI[sha256sum] = "d0e8cbe6ce6a484ffb81697425b3b933746882f6f1521ac71c5c88971cee7684" +SRC_URI[md5sum] = "a36c25e9ec17e48be514dc0485e7376c" +SRC_URI[sha256sum] = "fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7" # man is not compiled here, since it requires docbook-utils-native # which is not available in poky |