iputils: apply patch from #463

* this will need patching to work with glibc 2.4 due to the ipv6 changes

1 files changed, 49 insertions, 17 deletions

diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 8ec7f54e2b..ac3c3d31a8 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -1,30 +1,62 @@
-SECTION = "console/utils"
-BROKEN = "1"
-DEPENDS = "docbook-utils-native"
-DESCRIPTION = "Utilities for the IP protocol."
+SECTION = "console/network"
+DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
+tracepath, tracepath6, ping, ping6 and arping."
 LICENSE ="BSD"
-SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz"
+PRIORITY = "optional"
+PR = "r2"
+
+SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz \
+	    file://debian-fixes.patch;patch=1 \
+	    file://makefile.patch;patch=1 \
+	    file://standard-header-types.patch;patch=1 \
+	    file://tracepath6-mtu-opt.patch;patch=1 \
+	    file://remove-glibc-headers.patch;patch=1 \
+	    file://iputils-retvals.patch;patch=1"
 S = "${WORKDIR}/iputils"
 
-EXTRA_OEMAKE = ""
+PACKAGES = "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-doc"
+FILES_${PN}		= ""
+FILES_${PN}-ping	= "${base_bindir}/ping.${PN}"
+FILES_${PN}-ping6	= "${base_bindir}/ping6.${PN}"
+FILES_${PN}-arping	= "${bindir}/arping"
+FILES_${PN}-tracepath	= "${bindir}/tracepath"
+FILES_${PN}-tracepath6	= "${bindir}/tracepath6"
+FILES_${PN}-traceroute6	= "${bindir}/traceroute6"
+FILES_${PN}-doc		= "${mandir}/man8"
 
 do_compile () {
 	oe_runmake 'CC=${CC}' \
 		   KERNEL_INCLUDE="${STAGING_INCDIR}" \
 		   LIBC_INCLUDE="${STAGING_INCDIR}"
-	oe_runmake -C doc 'CC=${CC}' \
-		   KERNEL_INCLUDE="${STAGING_INCDIR}" \
-		   LIBC_INCLUDE="${STAGING_INCDIR}"
 }
 
 do_install () {
-	install -d ${D}${base_bindir} ${D}${sbindir} \
-		   ${D}${mandir}/man8 ${D}${docdir}/${P}
-	install -m 0755 ping ${D}${base_bindir}/
-	for f in ipg tracepath clockdiff rdisc arping \
-		tftpd rarpd tracepath6 traceroute6 ping6; do
-		install -m 0755 $f ${D}${sbindir}/
+	install -m 0755 -d ${D}${base_bindir} ${D}${bindir} ${D}${mandir}/man8
+	# SUID root programs
+	install -m 4755 ping ${D}${base_bindir}/ping.${PN}
+	install -m 4755 ping6 ${D}${base_bindir}/ping6.${PN}
+	install -m 4755 traceroute6 ${D}${bindir}/
+	# Other programgs
+	for i in arping tracepath tracepath6; do
+	  install -m 0755 $i ${D}${bindir}/
 	done
-	install -m 0644 doc/*.8 ${D}${mandir}/man8/
-	install -m 0644 doc/*.html ${D}${docdir}/${P}/
+	# 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/
+	done
+}
+
+# Busybox also provides ping and ping6, so use update-alternatives
+pkg_postinst_${PN}-ping () {
+	update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100
+}
+pkg_prerm_${PN}-ping () {
+	update-alternatives --remove ping ping.${PN}
+}
+
+pkg_postinst_${PN}-ping6 () {
+	update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100
+}
+pkg_prerm_${PN}-ping6 () {
+	update-alternatives --remove ping6 ping6.${PN}
 }