cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 3.9.8.

Browse Source
This commit is contained in:
Hiroki Sato 2017-01-02 14:53:15 +00:00
parent 98326bff8d
commit 839b63083c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=430358
4 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/mrouted/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mrouted
PORTVERSION= 3.9.7
PORTREVISION= 1
PORTVERSION= 3.9.8
CATEGORIES= net
MAINTAINER= hrs@FreeBSD.org
@ -13,8 +12,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
USE_RC_SUBR= mrouted
GH_ACCOUNT= troglobit
USE_RC_SUBR= mrouted
HAS_CONFIGURE= yes
MAKE_ARGS= sysconfdir="${PREFIX}/etc" \
mandir="${MAN8PREFIX}/man/man8"
@ -23,6 +22,7 @@ PLIST_FILES= sbin/map-mbone sbin/mrouted sbin/mrinfo sbin/mtrace \
etc/mrouted.conf man/man8/map-mbone.8.gz \
man/man8/mrinfo.8.gz man/man8/mrouted.8.gz \
man/man8/mtrace.8.gz
OPTIONS_DEFINE= DOCS
DOCS_MAKE_ARGS= datadir="${DOCSDIR}" doc=yes

5
net/mrouted/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (troglobit-mrouted-3.9.7_GH0.tar.gz) = 181908f7025c5a2dee2e50d86888780469eaa9e1bd42d3eca9dfed8274aecd3d
SIZE (troglobit-mrouted-3.9.7_GH0.tar.gz) = 142560
TIMESTAMP = 1483368179
SHA256 (troglobit-mrouted-3.9.8_GH0.tar.gz) = 179636d211a82d0140a3488c6b65e634b4838da23e50d8cdee15ef03fe9b46af
SIZE (troglobit-mrouted-3.9.8_GH0.tar.gz) = 143529

8
net/mrouted/files/patch-Makefile
View File

@ -1,4 +1,4 @@
--- Makefile.orig 2014-12-28 14:23:52 UTC
--- Makefile.orig 2017-01-01 19:28:19 UTC
+++ Makefile
@@ -16,8 +16,8 @@ CC ?= $(CROSS)gcc
@ -15,8 +15,8 @@
## Common
CFLAGS += $(MCAST_INCLUDE) $(INCLUDES) $(DEFS) $(USERCOMPILE)
-CFLAGS += -O2 -W -Wall -Werror
+#CFLAGS += -O2 -W -Wall -Werror
-CFLAGS += -O2 -W -Wall -Wextra
+#CFLAGS += -O2 -W -Wall -Wextra
#CFLAGS += -O -g
LDLIBS = $(EXTRA_LIBS)
LDFLAGS += -Wl,-Map,$@.map
@ -25,7 +25,7 @@
SRCS = $(OBJS:.o=.c)
-MANS = $(addsuffix .8,$(EXECS))
-DISTFILES = README AUTHORS LICENSE ChangeLog
+MANS = ${EXECS:S/$/.8/}
+MANS = $(EXECS:S/$/.8/)
+DISTFILES = README AUTHORS ChangeLog
LINT = splint

24
net/mrouted/files/patch-mtrace.c
View File

@ -1,24 +0,0 @@
--- mtrace.c.orig 2014-12-28 14:23:52 UTC
+++ mtrace.c
@@ -903,6 +903,12 @@ void stat_line(struct tr_resp *r, struct
}
}
+static uint32_t
+udiff(uint32_t u, uint32_t v)
+{
+ return (u >= v ? u - v : v - u);
+}
+
/*
* A fixup to check if any pktcnt has been reset, and to fix the
* byteorder bugs in mrouted 3.6 on little-endian machines.
@@ -920,7 +926,7 @@ void fixup_stats(struct resp_buf *base,
/* Check for byte-swappers */
while (--rno >= 0) {
--n; --p; --b; --s;
- if (*s || abs(ntohl(n->tr_vifout) - ntohl(p->tr_vifout)) > 100000) {
+ if (*s || udiff(ntohl(n->tr_vifout), ntohl(p->tr_vifout)) > 100000) {
/* This host sends byteswapped reports; swap 'em */
if (!*s) {
*s = 1;