Index: head/net/mrouted/Makefile =================================================================== --- head/net/mrouted/Makefile (revision 430357) +++ head/net/mrouted/Makefile (revision 430358) @@ -1,29 +1,29 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= mrouted -PORTVERSION= 3.9.7 -PORTREVISION= 1 +PORTVERSION= 3.9.8 CATEGORIES= net MAINTAINER= hrs@FreeBSD.org COMMENT= Multicast routing daemon providing DVMRP for IPv4 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" PORTDOCS= README AUTHORS ChangeLog 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 .include Index: head/net/mrouted/distinfo =================================================================== --- head/net/mrouted/distinfo (revision 430357) +++ head/net/mrouted/distinfo (revision 430358) @@ -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 Index: head/net/mrouted/files/patch-mtrace.c =================================================================== --- head/net/mrouted/files/patch-mtrace.c (revision 430357) +++ head/net/mrouted/files/patch-mtrace.c (nonexistent) @@ -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; Property changes on: head/net/mrouted/files/patch-mtrace.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/mrouted/files/patch-Makefile =================================================================== --- head/net/mrouted/files/patch-Makefile (revision 430357) +++ head/net/mrouted/files/patch-Makefile (revision 430358) @@ -1,95 +1,95 @@ ---- 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 prefix ?= /usr/local sysconfdir ?= /etc -datadir = $(prefix)/share/doc/mrouted -mandir = $(prefix)/share/man/man8 +datadir ?= $(prefix)/share/doc/mrouted +mandir ?= $(prefix)/share/man/man8 # This magic trick looks like a comment, but works on BSD PMake #include @@ -36,15 +36,15 @@ MTRACE_OBJS = mtrace.o $(EXTRA_OBJS) ## 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 OBJS = $(IGMP_OBJS) $(ROUTER_OBJS) $(MAPPER_OBJS) $(MRINFO_OBJS) \ $(MTRACE_OBJS) $(MSTAT_OBJS) 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 LINTFLAGS = $(MCAST_INCLUDE) $(filter-out -W -Wall -Werror, $(CFLAGS)) -posix-lib -weak -skipposixheaders @@ -52,24 +52,22 @@ LINTFLAGS = $(MCAST_INCLUDE) $(filte all: $(EXECS) $(MSTAT) .y.c: - @printf " YACC $@\n" - @$(YACC) $< + $(YACC) $< -@mv y.tab.c $@ || mv $(<:.y=.tab.c) $@ .c.o: - @printf " CC $@\n" - @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< install: $(EXECS) @install -d $(DESTDIR)$(prefix)/sbin @install -d $(DESTDIR)$(sysconfdir) - @install -d $(DESTDIR)$(datadir) + @[ -z "${doc}" ] || install -d $(DESTDIR)$(datadir) @install -d $(DESTDIR)$(mandir) @for file in $(EXECS); do \ - install -m 0755 $$file $(DESTDIR)$(prefix)/sbin/$$file; \ + install -s -m 0755 $$file $(DESTDIR)$(prefix)/sbin/$$file; \ done @install -b -m 0644 $(CONFIG) $(DESTDIR)$(sysconfdir)/$(CONFIG) - @for file in $(DISTFILES); do \ + @[ -z "${doc}" ] || for file in $(DISTFILES); do \ install -m 0644 $$file $(DESTDIR)$(datadir)/$$file; \ done @for file in $(MANS); do \ @@ -87,27 +85,22 @@ uninstall: done mrouted: $(IGMP_OBJS) $(ROUTER_OBJS) $(CMULIBS) - @printf " LINK $@\n" - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS) vers.c: Makefile @echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c map-mbone: $(IGMP_OBJS) $(MAPPER_OBJS) - @printf " LINK $@\n" - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS) mrinfo: $(IGMP_OBJS) $(MRINFO_OBJS) - @printf " LINK $@\n" - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS) mtrace: $(IGMP_OBJS) $(MTRACE_OBJS) - @printf " LINK $@\n" - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS) mstat: $(MSTAT_OBJS) $(CMULIBS) - @printf " LINK $@\n" - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS) # Runs Clang scan-build on the whole tree check: clean