From 3cc784e4178ebdf061f5c478d9df1348ba85db18 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Tue, 25 Jan 2011 12:52:08 +0800 Subject: 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 --- .../iputils/files/debian/CVE-2010-2529.diff | 22 ------ meta/recipes-extended/iputils/iputils_s20100418.bb | 87 ---------------------- meta/recipes-extended/iputils/iputils_s20101006.bb | 86 +++++++++++++++++++++ 3 files changed, 86 insertions(+), 109 deletions(-) delete mode 100644 meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff delete mode 100644 meta/recipes-extended/iputils/iputils_s20100418.bb create mode 100644 meta/recipes-extended/iputils/iputils_s20101006.bb (limited to 'meta/recipes-extended/iputils') 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 @@ -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_s20100418.bb deleted file mode 100644 index 2b2d76a515..0000000000 --- a/meta/recipes-extended/iputils/iputils_s20100418.bb +++ /dev/null @@ -1,87 +0,0 @@ -SUMMARY = "Network monitoring tools" -DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ -tracepath, tracepath6, ping, ping6 and arping." -HOMEPAGE = "http://www.skbuff.net/iputils" -SECTION = "console/network" - -LICENSE = "BSD & GPLv2+" - -LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f00766dd278d82 \ - file://tracepath.c;beginline=1;endline=10;md5=0ecea2bf60bff2f3d840096d87647f3d \ - file://arping.c;beginline=1;endline=10;md5=ada2a6d06acc90f943bddf40d15e0541 \ - file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 " - -DEPENDS = "sysfsutils openssl" - -PR = "r0" - -SRC_URI = "http://www.skbuff.net/iputils/${PN}-${PV}.tar.bz2 \ - file://debian/fix-dead-host-ping-stats.diff \ - file://debian/add-icmp-return-codes.diff \ - 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" - -# man is not compiled here, since it requires docbook-utils-native -# which is not available in poky - -do_compile () { - oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}" all -} - -do_install () { - install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8 - # SUID root programs - install -m 4555 ping ${D}${base_bindir}/ping.${PN} - install -m 4555 ping6 ${D}${base_bindir}/ping6.${PN} - install -m 4555 traceroute6 ${D}${base_bindir}/ - # Other programgs - for i in arping tracepath tracepath6; do - install -m 0755 $i ${D}${base_bindir}/ - done - # Manual pages for things we build packages for -# for i in tracepath.8 traceroute6.8 ping.8 arping.8; do -# install -m 0644 doc/$i ${D}${mandir}/man8/ || true -# done -} - -# Busybox also provides ping and ping6, so use update-alternatives -# Also fixup SUID bit for applications that need it -pkg_postinst_${PN}-ping () { - chmod 4555 ${base_bindir}/ping.${PN} - update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100 -} -pkg_prerm_${PN}-ping () { - update-alternatives --remove ping ping.${PN} -} - -pkg_postinst_${PN}-ping6 () { - chmod 4555 ${base_bindir}/ping6.${PN} - update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100 -} -pkg_prerm_${PN}-ping6 () { - update-alternatives --remove ping6 ping6.${PN} -} - -pkg_postinst_${PN}-traceroute6 () { - chmod 4555 ${base_bindir}/traceroute6 -} - -PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" - -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" - -FILES_${PN} = "" -FILES_${PN}-ping = "${base_bindir}/ping.${PN}" -FILES_${PN}-ping6 = "${base_bindir}/ping6.${PN}" -FILES_${PN}-arping = "${base_bindir}/arping" -FILES_${PN}-tracepath = "${base_bindir}/tracepath" -FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6" -FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" -FILES_${PN}-doc = "${mandir}/man8" diff --git a/meta/recipes-extended/iputils/iputils_s20101006.bb b/meta/recipes-extended/iputils/iputils_s20101006.bb new file mode 100644 index 0000000000..0a4201787c --- /dev/null +++ b/meta/recipes-extended/iputils/iputils_s20101006.bb @@ -0,0 +1,86 @@ +SUMMARY = "Network monitoring tools" +DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ +tracepath, tracepath6, ping, ping6 and arping." +HOMEPAGE = "http://www.skbuff.net/iputils" +SECTION = "console/network" + +LICENSE = "BSD & GPLv2+" + +LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f00766dd278d82 \ + file://tracepath.c;beginline=1;endline=10;md5=0ecea2bf60bff2f3d840096d87647f3d \ + file://arping.c;beginline=1;endline=10;md5=ada2a6d06acc90f943bddf40d15e0541 \ + file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 " + +DEPENDS = "sysfsutils openssl" + +PR = "r0" + +SRC_URI = "http://www.skbuff.net/iputils/${PN}-${PV}.tar.bz2 \ + file://debian/fix-dead-host-ping-stats.diff \ + file://debian/add-icmp-return-codes.diff \ + file://debian/use_gethostbyname2.diff \ + file://debian/targets.diff \ + file://debian/fix-arping-timeouts.diff \ + " + +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 + +do_compile () { + oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}" all +} + +do_install () { + install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8 + # SUID root programs + install -m 4555 ping ${D}${base_bindir}/ping.${PN} + install -m 4555 ping6 ${D}${base_bindir}/ping6.${PN} + install -m 4555 traceroute6 ${D}${base_bindir}/ + # Other programgs + for i in arping tracepath tracepath6; do + install -m 0755 $i ${D}${base_bindir}/ + done + # Manual pages for things we build packages for +# for i in tracepath.8 traceroute6.8 ping.8 arping.8; do +# install -m 0644 doc/$i ${D}${mandir}/man8/ || true +# done +} + +# Busybox also provides ping and ping6, so use update-alternatives +# Also fixup SUID bit for applications that need it +pkg_postinst_${PN}-ping () { + chmod 4555 ${base_bindir}/ping.${PN} + update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100 +} +pkg_prerm_${PN}-ping () { + update-alternatives --remove ping ping.${PN} +} + +pkg_postinst_${PN}-ping6 () { + chmod 4555 ${base_bindir}/ping6.${PN} + update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100 +} +pkg_prerm_${PN}-ping6 () { + update-alternatives --remove ping6 ping6.${PN} +} + +pkg_postinst_${PN}-traceroute6 () { + chmod 4555 ${base_bindir}/traceroute6 +} + +PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" + +ALLOW_EMPTY_${PN} = "1" +RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" + +FILES_${PN} = "" +FILES_${PN}-ping = "${base_bindir}/ping.${PN}" +FILES_${PN}-ping6 = "${base_bindir}/ping6.${PN}" +FILES_${PN}-arping = "${base_bindir}/arping" +FILES_${PN}-tracepath = "${base_bindir}/tracepath" +FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6" +FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" +FILES_${PN}-doc = "${mandir}/man8" -- cgit v1.2.3-54-g00ecf