<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/17a017e6953872e817baee6a6ce0dc032fdc456c">https://github.com/macports/macports-ports/commit/17a017e6953872e817baee6a6ce0dc032fdc456c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 17a017e mtr: update to version 0.92, set mtr-packet suid
</span>17a017e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 17a017e6953872e817baee6a6ce0dc032fdc456c
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Oct 2 19:20:13 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> mtr: update to version 0.92, set mtr-packet suid
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54977
</span>---
net/mtr/Portfile | 13 +++--
net/mtr/files/HAS_SCTP.patch | 128 -------------------------------------------
2 files changed, 7 insertions(+), 134 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mtr/Portfile b/net/mtr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b34cb9..a578a23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/mtr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/mtr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name mtr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.87
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.92
</span> categories net
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,8 @@ depends_build port:pkgconfig
</span> depends_lib port:ncurses
master_sites ftp://ftp.bitwizard.nl/mtr/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9cc760ec31113462f9aeff94b3ba1af1cb4ed994 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 193947c61d23b154c8dc03677e90e8fd912f8f18567ab76ce619b7856c4af19f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles HAS_SCTP.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7a697e13abfb12e50af43c6d493098dc0a7fe803 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382
</span>
configure.args --without-gtk
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +38,10 @@ pre-configure {
</span> file mtime ${worksrcpath}/config.h.in [file mtime ${worksrcpath}/aclocal.m4]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${destroot}${prefix}/sbin/mtr-packet -permissions +s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
livecheck.regex "[quotemeta ${name}]-(\\d(\\.\\d+)*)[quotemeta ${extract.suffix}]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mtr/files/HAS_SCTP.patch b/net/mtr/files/HAS_SCTP.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fd0678f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/mtr/files/HAS_SCTP.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,128 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 480fcd3c33bee378c8fead164059dad287b20dc7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Rogier Wolff <R.E.Wolff@BitWizard.nl>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 21 Aug 2016 12:28:57 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] fixed #141 compile without SCTP if not available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mtr.c | 6 ++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- net.c | 15 ++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- net.h | 6 ++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 26 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mtr.c b/mtr.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 201b311..914c2b4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/mtr.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/mtr.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -524,6 +524,7 @@ void parse_arg (int argc, char **argv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mtrtype = IPPROTO_TCP;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 'S':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAS_SCTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mtrtype != IPPROTO_ICMP) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "-u , -T and -S are mutually exclusive.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -532,6 +533,11 @@ void parse_arg (int argc, char **argv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- remoteport = 80;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mtrtype = IPPROTO_SCTP;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf (stderr, "No SCTP support found at compiletime\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit (EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 'b':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- show_ips = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/net.c b/net.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c591acc..c94abb4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/net.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/net.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,12 +70,17 @@ struct TCPHeader {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint32 seq;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// This ifdef is unnecessary. But it should trigger errors if I forget
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// an ifdef HAS_SCTP further down. (Success! I forgot one and the compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// told me the line number!)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAS_SCTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Structure of an SCTP header */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct SCTPHeader {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint16 srcport;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint16 dstport;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint32 veri_tag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Structure of an IPv4 UDP pseudoheader. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct UDPv4PHeader {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -438,6 +443,7 @@ void net_send_tcp(int index)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(s, (struct sockaddr *) &remote, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAS_SCTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Attempt to connect to a SCTP port with a TTL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void net_send_sctp(int index)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -556,6 +562,7 @@ void net_send_sctp(int index)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(s, (struct sockaddr *) &remote, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Attempt to find the host at a particular number of hops away */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void net_send_query(int index)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -565,10 +572,12 @@ void net_send_query(int index)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAS_SCTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mtrtype == IPPROTO_SCTP) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- net_send_sctp(index);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*ok char packet[sizeof(struct IPHeader) + sizeof(struct ICMPHeader)];*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char packet[MAXPACKET];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -885,7 +894,9 @@ void net_process_return(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ICMPHeader *header = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct UDPHeader *udpheader = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct TCPHeader *tcpheader = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAS_SCTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct SCTPHeader *sctpheader = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timeval now;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ip_t * fromaddress = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int echoreplytype = 0, timeexceededtype = 0, unreachabletype = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1065,7 +1076,8 @@ void net_process_return(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- seq_num = ntohs(tcpheader->srcport);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAS_SCTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case IPPROTO_SCTP:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (header->type == timeexceededtype || header->type == unreachabletype) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch ( af ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1102,6 +1114,7 @@ void net_process_return(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- seq_num = ntohs(sctpheader->srcport);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (seq_num)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- net_process_ping (seq_num, mpls, (void *) fromaddress, now);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/net.h b/net.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 23183c1..0350a4a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/net.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/net.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -134,3 +134,9 @@ struct mplslen {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void decodempls(int, char *, struct mplslen *, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef IPPROTO_SCTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define HAS_SCTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span></pre><pre style='margin:0'>
</pre>