From e06cd7c84bf8bce335d7a195c504dd78423e3fb5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 23 Apr 2009 08:34:55 +0200 Subject: [PATCH] iputils: add 20071127 --- .../files/debian/add-icmp-return-codes.diff | 41 +++++++++ .../debian/cleanup-docbook-formatting.diff | 20 +++++ .../files/debian/fix-arping-timeouts.diff | 24 ++++++ .../files/debian/fix-cmsghdr-offset-bug.diff | 19 +++++ .../debian/fix-dead-host-ping-stats.diff | 17 ++++ .../files/debian/fix-tracepath-docs.diff | 23 +++++ recipes/iputils/files/debian/targets.diff | 27 ++++++ .../files/debian/use_gethostbyname2.diff | 29 +++++++ .../iputils/files/iputils_20071127-1.diff.gz | Bin 0 -> 8924 bytes recipes/iputils/iputils_20071127.bb | 79 ++++++++++++++++++ 10 files changed, 279 insertions(+) create mode 100644 recipes/iputils/files/debian/add-icmp-return-codes.diff create mode 100644 recipes/iputils/files/debian/cleanup-docbook-formatting.diff create mode 100644 recipes/iputils/files/debian/fix-arping-timeouts.diff create mode 100644 recipes/iputils/files/debian/fix-cmsghdr-offset-bug.diff create mode 100644 recipes/iputils/files/debian/fix-dead-host-ping-stats.diff create mode 100644 recipes/iputils/files/debian/fix-tracepath-docs.diff create mode 100644 recipes/iputils/files/debian/targets.diff create mode 100644 recipes/iputils/files/debian/use_gethostbyname2.diff create mode 100644 recipes/iputils/files/iputils_20071127-1.diff.gz create mode 100644 recipes/iputils/iputils_20071127.bb diff --git a/recipes/iputils/files/debian/add-icmp-return-codes.diff b/recipes/iputils/files/debian/add-icmp-return-codes.diff new file mode 100644 index 0000000000..29bd7d1df3 --- /dev/null +++ b/recipes/iputils/files/debian/add-icmp-return-codes.diff @@ -0,0 +1,41 @@ +Index: iputils/ping.c +=================================================================== +--- iputils.orig/ping.c 2007-12-09 20:32:35.000000000 -0500 ++++ iputils/ping.c 2007-12-09 20:32:59.000000000 -0500 +@@ -865,9 +865,36 @@ + case ICMP_SR_FAILED: + printf("Source Route Failed\n"); + break; ++ case ICMP_NET_UNKNOWN: ++ printf("Destination Net Unknown\n"); ++ break; ++ case ICMP_HOST_UNKNOWN: ++ printf("Destination Host Unknown\n"); ++ break; ++ case ICMP_HOST_ISOLATED: ++ printf("Source Host Isolated\n"); ++ break; ++ case ICMP_NET_ANO: ++ printf("Destination Net Prohibited\n"); ++ break; ++ case ICMP_HOST_ANO: ++ printf("Destination Host Prohibited\n"); ++ break; ++ case ICMP_NET_UNR_TOS: ++ printf("Destination Net Unreachable for Type of Service\n"); ++ break; ++ case ICMP_HOST_UNR_TOS: ++ printf("Destination Host Unreachable for Type of Service\n"); ++ break; + case ICMP_PKT_FILTERED: + printf("Packet filtered\n"); + break; ++ case ICMP_PREC_VIOLATION: ++ printf("Precedence Violation\n"); ++ break; ++ case ICMP_PREC_CUTOFF: ++ printf("Precedence Cutoff\n"); ++ break; + default: + printf("Dest Unreachable, Bad Code: %d\n", code); + break; diff --git a/recipes/iputils/files/debian/cleanup-docbook-formatting.diff b/recipes/iputils/files/debian/cleanup-docbook-formatting.diff new file mode 100644 index 0000000000..65b43cbbf0 --- /dev/null +++ b/recipes/iputils/files/debian/cleanup-docbook-formatting.diff @@ -0,0 +1,20 @@ +--- iputils-upstream/doc/docbook2man-spec.pl 2007-10-28 12:24:10.000000000 -0400 ++++ iputils/doc/docbook2man-spec.pl 2007-10-28 12:19:17.000000000 -0400 +@@ -428,7 +428,7 @@ + output ' '; + + if($_[0]->attribute('CHOICE')->value =~ /opt/i) { +- output '[ '; ++ output '['; + } + bold_on(); + } +@@ -441,7 +441,7 @@ + font_off(); + } + if($_[0]->attribute('CHOICE')->value =~ /opt/i) { +- output '] '; ++ output ']'; + } + } + diff --git a/recipes/iputils/files/debian/fix-arping-timeouts.diff b/recipes/iputils/files/debian/fix-arping-timeouts.diff new file mode 100644 index 0000000000..b3d2505987 --- /dev/null +++ b/recipes/iputils/files/debian/fix-arping-timeouts.diff @@ -0,0 +1,24 @@ +--- iputils-upstream/arping.c 2007-10-28 12:24:10.000000000 -0400 ++++ iputils/arping.c 2007-10-28 12:19:17.000000000 -0400 +@@ -168,12 +168,17 @@ + if (start.tv_sec==0) + start = tv; + +- if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)) +- finish(); ++ if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500) ++ finish(); + +- if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { ++ if ((!timeout) && (count == 0)) ++ finish(); ++ ++ if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) { + send_pack(s, src, dst, &me, &he); +- if (count == 0 && unsolicited) ++ if (count >= 0) ++ count--; ++ if (count==0 && unsolicited) + finish(); + } + alarm(1); diff --git a/recipes/iputils/files/debian/fix-cmsghdr-offset-bug.diff b/recipes/iputils/files/debian/fix-cmsghdr-offset-bug.diff new file mode 100644 index 0000000000..7ae92df468 --- /dev/null +++ b/recipes/iputils/files/debian/fix-cmsghdr-offset-bug.diff @@ -0,0 +1,19 @@ +--- iputils-upstream/ping6.c 2007-10-28 12:24:10.000000000 -0400 ++++ iputils/ping6.c 2007-10-28 12:19:18.000000000 -0400 +@@ -414,7 +414,7 @@ + fprintf(stderr, "ping: unknown iface %s\n", device); + exit(2); + } +- cmsg = (struct cmsghdr*)cmsgbuf; ++ cmsg = (struct cmsghdr*)(cmsgbuf+cmsglen); + cmsglen += CMSG_SPACE(sizeof(*ipi)); + cmsg->cmsg_len = CMSG_LEN(sizeof(*ipi)); + cmsg->cmsg_level = SOL_IPV6; +@@ -486,7 +486,6 @@ + /* + * select icmp echo reply as icmp type to receive + */ +- + ICMP6_FILTER_SETBLOCKALL(&filter); + + if (!working_recverr) { diff --git a/recipes/iputils/files/debian/fix-dead-host-ping-stats.diff b/recipes/iputils/files/debian/fix-dead-host-ping-stats.diff new file mode 100644 index 0000000000..3b0fb83655 --- /dev/null +++ b/recipes/iputils/files/debian/fix-dead-host-ping-stats.diff @@ -0,0 +1,17 @@ +--- iputils-s20070202/ping_common.c 2007-02-02 07:55:46.000000000 -0500 ++++ iputils/ping_common.c 2007-10-28 12:19:17.000000000 -0400 +@@ -818,7 +820,8 @@ + } + if (pipesize > 1) + printf(", pipe %d", pipesize); +- if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { ++ if (ntransmitted > 1 && nreceived && ++ (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { + int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1); + printf(", ipg/ewma %d.%03d/%d.%03d ms", + ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000); +@@ -852,4 +855,3 @@ + } + fprintf(stderr, "\n"); + } +- diff --git a/recipes/iputils/files/debian/fix-tracepath-docs.diff b/recipes/iputils/files/debian/fix-tracepath-docs.diff new file mode 100644 index 0000000000..5f001078df --- /dev/null +++ b/recipes/iputils/files/debian/fix-tracepath-docs.diff @@ -0,0 +1,23 @@ +Index: iputils/doc/Makefile +=================================================================== +--- iputils.orig/doc/Makefile 2007-10-28 17:27:31.000000000 -0400 ++++ iputils/doc/Makefile 2007-12-09 21:01:24.000000000 -0500 +@@ -6,7 +6,7 @@ + + html: $(HTMLFILES) iputils.html + +-man: $(MANFILES) ++man: $(MANFILES) fix_sgml2man + + # docbook scripts are incredibly dirty in the sense that they leak + # lots of some strange temporary junk directories and files. +@@ -33,6 +33,9 @@ + @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. + @-rm -rf tmp.db2man + ++fix_sgml2man: ++ @sed -i -e 's!\\fB\\fIdestination\\fB\\fR \[\\fB/\\fIport\\fB\\fR\]!\\fB\\fIdestination\\fB\\fR[\\fB/\\fIport\\fB\\fR]!g' tracepath.8 ++ + clean: + @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man + diff --git a/recipes/iputils/files/debian/targets.diff b/recipes/iputils/files/debian/targets.diff new file mode 100644 index 0000000000..87fe27d6fd --- /dev/null +++ b/recipes/iputils/files/debian/targets.diff @@ -0,0 +1,27 @@ +--- iputils-upstream/Makefile 2007-10-28 12:24:10.000000000 -0400 ++++ iputils/Makefile 2007-10-28 12:19:18.000000000 -0400 +@@ -16,7 +16,7 @@ + CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g + CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) + +-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd ++IPV4_TARGETS=tracepath ping arping + IPV6_TARGETS=tracepath6 traceroute6 ping6 + TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) + +@@ -25,7 +25,6 @@ + + all: $(TARGETS) + +- + tftpd: tftpd.o tftpsubs.o + ping: ping.o ping_common.o + ping6: ping6.o ping_common.o +@@ -37,7 +36,6 @@ + rdisc_srv.o: rdisc.c + $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c + +- + check-kernel: + ifeq ($(KERNEL_INCLUDE),) + @echo "Please, set correct KERNEL_INCLUDE"; false diff --git a/recipes/iputils/files/debian/use_gethostbyname2.diff b/recipes/iputils/files/debian/use_gethostbyname2.diff new file mode 100644 index 0000000000..5a1ea3b583 --- /dev/null +++ b/recipes/iputils/files/debian/use_gethostbyname2.diff @@ -0,0 +1,29 @@ +Index: iputils/tracepath.c +=================================================================== +--- iputils.orig/tracepath.c 2007-12-09 20:32:32.000000000 -0500 ++++ iputils/tracepath.c 2007-12-09 20:33:20.000000000 -0500 +@@ -318,9 +318,9 @@ + base_port = atoi(p+1); + } else + base_port = 44444; +- he = gethostbyname(argv[0]); ++ he = gethostbyname2(argv[0], AF_INET); + if (he == NULL) { +- herror("gethostbyname"); ++ herror("gethostbyname2"); + exit(1); + } + memcpy(&target.sin_addr, he->h_addr, 4); +Index: iputils/ping.c +=================================================================== +--- iputils.orig/ping.c 2007-12-09 20:32:59.000000000 -0500 ++++ iputils/ping.c 2007-12-09 20:33:20.000000000 -0500 +@@ -249,7 +249,7 @@ + if (argc == 1) + options |= F_NUMERIC; + } else { +- hp = gethostbyname(target); ++ hp = gethostbyname2(target, AF_INET); + if (!hp) { + fprintf(stderr, "ping: unknown host %s\n", target); + exit(2); diff --git a/recipes/iputils/files/iputils_20071127-1.diff.gz b/recipes/iputils/files/iputils_20071127-1.diff.gz new file mode 100644 index 0000000000000000000000000000000000000000..9784641490e1c0aef356f1855238af7920a934db GIT binary patch literal 8924 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 literal 0 HcmV?d00001 diff --git a/recipes/iputils/iputils_20071127.bb b/recipes/iputils/iputils_20071127.bb new file mode 100644 index 0000000000..9235a65c52 --- /dev/null +++ b/recipes/iputils/iputils_20071127.bb @@ -0,0 +1,79 @@ +SECTION = "console/network" +DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ +tracepath, tracepath6, ping, ping6 and arping." +SECTION = "console/network" +LICENSE ="BSD" + +#Need more testing +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://ftp.de.debian.org/debian/pool/main/i/iputils/iputils_${PV}.orig.tar.gz \ + file://debian/fix-dead-host-ping-stats.diff;patch=1 \ + file://debian/add-icmp-return-codes.diff;patch=1 \ + file://debian/use_gethostbyname2.diff;patch=1 \ + file://debian/fix-cmsghdr-offset-bug.diff;patch=1 \ + file://debian/cleanup-docbook-formatting.diff;patch=1 \ + file://debian/targets.diff;patch=1 \ + file://debian/fix-tracepath-docs.diff;patch=1 \ + file://debian/fix-arping-timeouts.diff;patch=1 \ +" + +S = "${WORKDIR}/iputils_20071127.orig" + +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 = "${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}" +} + +do_install () { + install -m 0755 -d ${D}${base_bindir} ${D}${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}${bindir}/ + # Other programgs + for i in arping tracepath tracepath6; do + install -m 0755 $i ${D}${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/ + 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 ${bindir}/traceroute6 +} -- 2.39.5