Date: Mon, 30 Nov 2015 11:45:37 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402664 - in head/net/dpinger: . files Message-ID: <201511301145.tAUBjbi9090919@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Mon Nov 30 11:45:36 2015 New Revision: 402664 URL: https://svnweb.freebsd.org/changeset/ports/402664 Log: - Update net/dpinger to 0.0.1.20151129 (commit c0adc9e57f) - Remove patches already applied upstream - Fix build on FreeBSD 9 Deleted: head/net/dpinger/files/patch-Makefile Modified: head/net/dpinger/Makefile head/net/dpinger/distinfo head/net/dpinger/files/patch-dpinger.c Modified: head/net/dpinger/Makefile ============================================================================== --- head/net/dpinger/Makefile Mon Nov 30 11:43:13 2015 (r402663) +++ head/net/dpinger/Makefile Mon Nov 30 11:45:36 2015 (r402664) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= dpinger -PORTVERSION= 0.0.1.20151125 +PORTVERSION= 0.0.1.20151129 CATEGORIES= net MAINTAINER= garga@FreeBSD.org @@ -13,7 +13,7 @@ USES= uidfix USE_GITHUB= yes GH_ACCOUNT= dennypage GH_PROJECT= dpinger -GH_TAGNAME= 21942bac3a +GH_TAGNAME= c0adc9e57f PLIST_FILES= bin/dpinger Modified: head/net/dpinger/distinfo ============================================================================== --- head/net/dpinger/distinfo Mon Nov 30 11:43:13 2015 (r402663) +++ head/net/dpinger/distinfo Mon Nov 30 11:45:36 2015 (r402664) @@ -1,2 +1,2 @@ -SHA256 (dennypage-dpinger-0.0.1.20151125-21942bac3a_GH0.tar.gz) = 6b4f1911dfc38d35f103df61cd776f74def536ebc260b6b00832f5724c754701 -SIZE (dennypage-dpinger-0.0.1.20151125-21942bac3a_GH0.tar.gz) = 6073 +SHA256 (dennypage-dpinger-0.0.1.20151129-c0adc9e57f_GH0.tar.gz) = b7108784ff2170bdbf4bd1cb677248a7f12098a7aa2292e3df9f76965214ccac +SIZE (dennypage-dpinger-0.0.1.20151129-c0adc9e57f_GH0.tar.gz) = 7372 Modified: head/net/dpinger/files/patch-dpinger.c ============================================================================== --- head/net/dpinger/files/patch-dpinger.c Mon Nov 30 11:43:13 2015 (r402663) +++ head/net/dpinger/files/patch-dpinger.c Mon Nov 30 11:45:36 2015 (r402664) @@ -1,11 +1,40 @@ ---- dpinger.c.orig 2015-11-25 04:21:35 UTC +--- dpinger.c.orig 2015-11-30 00:12:21 UTC +++ dpinger.c -@@ -164,7 +164,7 @@ cksum( +@@ -497,7 +497,7 @@ alert_thread( + unsigned int latency_alarm_decay = 0; + unsigned int loss_alarm_decay = 0; + unsigned int alert = 0; +- unsigned int alarm; ++ unsigned int alarm_on; + int r; - if (len == 1) - { -- sum += (uint16_t) *((uint8_t *) p); -+ sum += (uint16_t) *((const uint8_t *) p); - } + // Set up the timespec for nanosleep +@@ -599,12 +599,12 @@ alert_thread( + { + alert = 0; + +- alarm = latency_alarm_decay || loss_alarm_decay; +- logger("%s: latency %luus loss %lus\n", alarm ? "Alarm" : "Clear", average_latency, average_loss); ++ alarm_on = latency_alarm_decay || loss_alarm_decay; ++ logger("%s: latency %luus loss %lus\n", alarm_on ? "Alarm" : "Clear", average_latency, average_loss); - sum = (sum >> 16) + (sum & 0xFFFF); + if (alert_cmd) + { +- r = snprintf(alert_cmd + alert_cmd_offset, ALERT_CMD_OUTPUT_MAX, " %u %lu %lu", alarm, average_latency, average_loss); ++ r = snprintf(alert_cmd + alert_cmd_offset, ALERT_CMD_OUTPUT_MAX, " %u %lu %lu", alarm_on, average_latency, average_loss); + if (r < 0 || r >= (int) ALERT_CMD_OUTPUT_MAX) + { + logger("error formatting alert command\n"); +@@ -891,9 +891,9 @@ parse_args( + fatal("Invalid bind IP address %s\n", bind_arg); + } + +- struct sockaddr_in * bind = (struct sockaddr_in *) &bind_addr; +- bind->sin_family = AF_INET; +- bind->sin_addr = addr; ++ struct sockaddr_in * bind4 = (struct sockaddr_in *) &bind_addr; ++ bind4->sin_family = AF_INET; ++ bind4->sin_addr = addr; + bind_addr_len = sizeof(struct sockaddr_in); + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511301145.tAUBjbi9090919>