kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update net/dpinger to 0.0.1.20151129 (commit c0adc9e57f)

Browse source 
- Remove patches already applied upstream
- Fix build on FreeBSD 9
This commit is contained in:
Renato Botelho 2015-11-30 11:45:36 +00:00
parent ca82f38edb
commit 38b416a729
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=402664
4 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/dpinger/Makefile
View file

@ -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

4
net/dpinger/distinfo
View file

@ -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

11
net/dpinger/files/patch-Makefile
View file

@ -1,11 +0,0 @@
--- Makefile.orig 2015-11-25 04:21:35 UTC
+++ Makefile
@@ -4,7 +4,7 @@ MAN=
BINDIR= ${PREFIX}/bin
WARNS= 6
-CFLAGS= -g
+#CFLAGS= -g
LDADD= -lpthread
.include <bsd.prog.mk>

45
net/dpinger/files/patch-dpinger.c
View file

@ -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);
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);
}
}
sum = (sum >> 16) + (sum & 0xFFFF);