pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/tcptraceroute6 Update net/tcptraceroute6 to 1.0.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/d9ed78521414
branches: trunk
changeset: 347054:d9ed78521414
user: kim <kim%pkgsrc.org@localhost>
date: Tue Jan 07 11:08:14 2020 +0000
description:
Update net/tcptraceroute6 to 1.0.4
Notable changes:
- Portability fixes.
- A C11 compiler is now necessary (instead of GNU extensions).
diffstat:
net/tcptraceroute6/Makefile | 6 +-
net/tcptraceroute6/distinfo | 15 +--
net/tcptraceroute6/patches/patch-rdnssd_rdnssd.h | 6 +-
net/tcptraceroute6/patches/patch-src_trace-icmp.c | 34 ----------
net/tcptraceroute6/patches/patch-src_trace-tcp.c | 76 -----------------------
net/tcptraceroute6/patches/patch-src_trace-udp.c | 40 ------------
6 files changed, 12 insertions(+), 165 deletions(-)
diffs (223 lines):
diff -r 20dadb9c99eb -r d9ed78521414 net/tcptraceroute6/Makefile
--- a/net/tcptraceroute6/Makefile Tue Jan 07 10:37:04 2020 +0000
+++ b/net/tcptraceroute6/Makefile Tue Jan 07 11:08:14 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2017/09/04 18:08:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/07 11:08:14 kim Exp $
#
DISTNAME= ndisc6-${VERSION}
PKGNAME= tcptraceroute6-${VERSION}
-VERSION= 1.0.3
+VERSION= 1.0.4
CATEGORIES= net
MASTER_SITES= http://www.remlab.net/files/ndisc6/
EXTRACT_SUFX= .tar.bz2
@@ -31,7 +31,7 @@
do-install:
for p in ${INSTALL_PROGS}; do \
- ${INSTALL_PROGRAM} ${WRKSRC}/src/$$p \
+ ${INSTALL_PROGRAM} ${WRKSRC}/$$p \
${DESTDIR}${PREFIX}/sbin; \
done
for m in ${INSTALL_MANS}; do \
diff -r 20dadb9c99eb -r d9ed78521414 net/tcptraceroute6/distinfo
--- a/net/tcptraceroute6/distinfo Tue Jan 07 10:37:04 2020 +0000
+++ b/net/tcptraceroute6/distinfo Tue Jan 07 11:08:14 2020 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/06 20:36:01 joerg Exp $
+$NetBSD: distinfo,v 1.4 2020/01/07 11:08:14 kim Exp $
-SHA1 (ndisc6-1.0.3.tar.bz2) = 7e7e8c9e23c66c0327bd71625f62cb64ec4ffd41
-RMD160 (ndisc6-1.0.3.tar.bz2) = 35dedcd7d8d12af7e39b82502fa8f7d2124b64f6
-SHA512 (ndisc6-1.0.3.tar.bz2) = 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54
-Size (ndisc6-1.0.3.tar.bz2) = 260294 bytes
-SHA1 (patch-rdnssd_rdnssd.h) = 6f07d7cd2077a5b051cc6f7a15c0ee443a2a5fa1
+SHA1 (ndisc6-1.0.4.tar.bz2) = 08704f1bbcc12e21826abf9185fbf9f6186a9668
+RMD160 (ndisc6-1.0.4.tar.bz2) = 57b92e4085ca5b1ff2a050c33081b8770de6b68a
+SHA512 (ndisc6-1.0.4.tar.bz2) = 6f6cd939fb7079518db5c1bcd11353c722237d7735d229f9fd20d03e9f16b1ddf07c7c78c91364886148f2a82d6805eafe7e27da6b4e7c99b111603ec5fab842
+Size (ndisc6-1.0.4.tar.bz2) = 264071 bytes
+SHA1 (patch-rdnssd_rdnssd.h) = 344dd06a3405cd4480c056e47985fd51335ed6f1
SHA1 (patch-src_addrinfo.c) = a8882a8b7180039c4dfe97c4907fcf800b69d6e7
-SHA1 (patch-src_trace-icmp.c) = 37d57538a418c5f4ff93a4c4eda13d8dc0a78eed
-SHA1 (patch-src_trace-tcp.c) = bd7f1e5dad69bbc7b5f3feb866cea56cda07af88
-SHA1 (patch-src_trace-udp.c) = 141e5c86512c9ab1a28903f5bd58ceb502b11540
diff -r 20dadb9c99eb -r d9ed78521414 net/tcptraceroute6/patches/patch-rdnssd_rdnssd.h
--- a/net/tcptraceroute6/patches/patch-rdnssd_rdnssd.h Tue Jan 07 10:37:04 2020 +0000
+++ b/net/tcptraceroute6/patches/patch-rdnssd_rdnssd.h Tue Jan 07 11:08:14 2020 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-rdnssd_rdnssd.h,v 1.1 2015/10/23 09:52:35 he Exp $
+$NetBSD: patch-rdnssd_rdnssd.h,v 1.2 2020/01/07 11:08:14 kim Exp $
Don't define nd_opt_rdnss on NetBSD.
---- rdnssd/rdnssd.h.orig 2011-10-17 15:35:11.000000000 +0000
-+++ rdnssd/rdnssd.h
+--- rdnss/rdnssd.h.orig 2011-10-17 15:35:11.000000000 +0000
++++ rdnss/rdnssd.h
@@ -32,6 +32,7 @@ extern const rdnss_src_t rdnss_netlink,
#define ND_OPT_RDNSS 25
#define ND_OPT_DNSSL 31
diff -r 20dadb9c99eb -r d9ed78521414 net/tcptraceroute6/patches/patch-src_trace-icmp.c
--- a/net/tcptraceroute6/patches/patch-src_trace-icmp.c Tue Jan 07 10:37:04 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_trace-icmp.c,v 1.1 2015/11/06 20:36:01 joerg Exp $
-
---- src/trace-icmp.c.orig 2015-11-06 15:58:04.000000000 +0000
-+++ src/trace-icmp.c
-@@ -40,19 +40,18 @@ send_echo_probe (int fd, unsigned ttl, u
- if (plen < sizeof (struct icmp6_hdr))
- plen = sizeof (struct icmp6_hdr);
-
-- struct
-- {
-- struct icmp6_hdr ih;
-- uint8_t payload[plen - sizeof (struct icmp6_hdr)];
-- } packet;
-- memset (&packet, 0, plen);
--
-- packet.ih.icmp6_type = ICMP6_ECHO_REQUEST;
-- packet.ih.icmp6_id = htons (getpid ());
-- packet.ih.icmp6_seq = htons ((ttl << 8) | (n & 0xff));
-+ uint8_t buffer[plen];
-+ struct icmp6_hdr ih;
-+ memset (buffer, 0, plen);
-+ memset (&ih, 0, sizeof(ih));
-+
-+ ih.icmp6_type = ICMP6_ECHO_REQUEST;
-+ ih.icmp6_id = htons (getpid ());
-+ ih.icmp6_seq = htons ((ttl << 8) | (n & 0xff));
- (void)port;
-+ memcpy(buffer, &ih, sizeof(ih));
-
-- return send_payload (fd, &packet.ih, plen, ttl);
-+ return send_payload (fd, buffer, plen, ttl);
- }
-
-
diff -r 20dadb9c99eb -r d9ed78521414 net/tcptraceroute6/patches/patch-src_trace-tcp.c
--- a/net/tcptraceroute6/patches/patch-src_trace-tcp.c Tue Jan 07 10:37:04 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-$NetBSD: patch-src_trace-tcp.c,v 1.1 2015/11/06 20:36:01 joerg Exp $
-
---- src/trace-tcp.c.orig 2015-11-06 15:53:03.000000000 +0000
-+++ src/trace-tcp.c
-@@ -51,21 +51,21 @@ send_syn_probe (int fd, unsigned ttl, un
- if (plen < sizeof (struct tcphdr))
- plen = sizeof (struct tcphdr);
-
-- struct
-- {
-- struct tcphdr th;
-- uint8_t payload[plen - sizeof (struct tcphdr)];
-- } packet;
--
-- memset (&packet, 0, sizeof (packet));
-- packet.th.th_sport = sport;
-- packet.th.th_dport = port;
-- packet.th.th_seq = htonl ((ttl << 24) | (n << 16) | getpid ());
-- packet.th.th_off = sizeof (packet.th) / 4;
-- packet.th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0);
-- packet.th.th_win = htons (TCP_WINDOW);
-+ uint8_t buffer[plen];
-
-- return send_payload (fd, &packet, plen, ttl);
-+ struct tcphdr th;
-+
-+ memset(&th, 0, sizeof (th));
-+ memset(buffer, 0, plen);
-+ th.th_sport = sport;
-+ th.th_dport = port;
-+ th.th_seq = htonl ((ttl << 24) | (n << 16) | getpid ());
-+ th.th_off = sizeof (th) / 4;
-+ th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0);
-+ th.th_win = htons (TCP_WINDOW);
-+ memcpy(buffer, &th, sizeof(th));
-+
-+ return send_payload (fd, buffer, plen, ttl);
- }
-
-
-@@ -128,21 +128,21 @@ send_ack_probe (int fd, unsigned ttl, un
- if (plen < sizeof (struct tcphdr))
- plen = sizeof (struct tcphdr);
-
-- struct
-- {
-- struct tcphdr th;
-- uint8_t payload[plen - sizeof (struct tcphdr)];
-- } packet;
--
-- memset (&packet, 0, sizeof (packet));
-- packet.th.th_sport = sport;
-- packet.th.th_dport = port;
-- packet.th.th_ack = htonl ((ttl << 24) | (n << 16) | getpid ());
-- packet.th.th_off = sizeof (packet.th) / 4;
-- packet.th.th_flags = TH_ACK;
-- packet.th.th_win = htons (TCP_WINDOW);
-+ uint8_t buffer[plen];
-+
-+ struct tcphdr th;
-+
-+ memset(&th, 0, sizeof (th));
-+ memset(buffer, 0, plen);
-+ th.th_sport = sport;
-+ th.th_dport = port;
-+ th.th_ack = htonl ((ttl << 24) | (n << 16) | getpid ());
-+ th.th_off = sizeof (th) / 4;
-+ th.th_flags = TH_ACK;
-+ th.th_win = htons (TCP_WINDOW);
-+ memcpy(buffer, &th, sizeof(th));
-
-- return send_payload (fd, &packet, plen, ttl);
-+ return send_payload (fd, buffer, plen, ttl);
- }
-
-
diff -r 20dadb9c99eb -r d9ed78521414 net/tcptraceroute6/patches/patch-src_trace-udp.c
--- a/net/tcptraceroute6/patches/patch-src_trace-udp.c Tue Jan 07 10:37:04 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-src_trace-udp.c,v 1.1 2015/11/06 20:36:01 joerg Exp $
-
---- src/trace-udp.c.orig 2015-11-06 15:56:21.000000000 +0000
-+++ src/trace-udp.c
-@@ -43,25 +43,25 @@ send_udp_probe (int fd, unsigned ttl, un
- if (plen < sizeof (struct udphdr))
- plen = sizeof (struct udphdr);
-
-- struct
-- {
-- struct udphdr uh;
-- uint8_t payload[plen - sizeof (struct udphdr)];
-- } packet;
-- memset (&packet, 0, plen);
-+ uint8_t buffer[plen];
-+ struct udphdr uh;
-+
-+ memset (&uh, 0, sizeof(uh));
-+ memset (buffer, 0, plen);
-
- (void)n;
-- packet.uh.uh_sport = sport;
-- packet.uh.uh_dport = htons (ntohs (port) + ttl);
-+ uh.uh_sport = sport;
-+ uh.uh_dport = htons (ntohs (port) + ttl);
- /* For UDP-Lite we have full checksum coverage, if only because the
- * IPV6_CHECKSUM setsockopt only supports full coverage. Hence
- * we can set coverage to the length of the packet, even though zero
- * would be more idiosyncrasic. */
-- packet.uh.uh_ulen = htons (plen);
-+ uh.uh_ulen = htons (plen);
- /*if (plen > sizeof (struct udphdr))
- packet.payload[0] = (uint8_t)ttl;*/
-+ memcpy(buffer, &uh, sizeof(uh));
-
-- return send_payload (fd, &packet, plen, ttl);
-+ return send_payload (fd, buffer, plen, ttl);
- }
-
-
Home |
Main Index |
Thread Index |
Old Index