From ec2e3a1f8f6730d849f41cdfcd13e703ea8feec7 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Mon, 7 Sep 2015 18:24:38 +0000 Subject: [PATCH] Update to 3.9.7. --- net/mrouted/Makefile | 16 +++---- net/mrouted/distinfo | 4 +- net/mrouted/files/mrouted.in | 9 ++-- net/mrouted/files/patch-Makefile | 80 +++++++++++++++++++++++++++++--- net/mrouted/files/patch-mtrace.c | 4 +- net/mrouted/files/patch-route.c | 15 ------ net/mrouted/files/patch-vif.c | 21 --------- 7 files changed, 89 insertions(+), 60 deletions(-) delete mode 100644 net/mrouted/files/patch-route.c delete mode 100644 net/mrouted/files/patch-vif.c diff --git a/net/mrouted/Makefile b/net/mrouted/Makefile index 529e2fb1474d..c12ed6338bd3 100644 --- a/net/mrouted/Makefile +++ b/net/mrouted/Makefile @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= mrouted -PORTVERSION= 3.9.6 -PORTREVISION= 1 +PORTVERSION= 3.9.7 CATEGORIES= net -MASTER_SITES= GHC MAINTAINER= hrs@FreeBSD.org COMMENT= Multicast routing daemon providing DVMRP for IPv4 @@ -13,19 +11,19 @@ COMMENT= Multicast routing daemon providing DVMRP for IPv4 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USE_RC_SUBR= mrouted -USES= gmake tar:bzip2 +USES= tar:bzip2 USE_GITHUB= yes +USE_RC_SUBR= mrouted GH_ACCOUNT= troglobit -MAKE_ARGS= sysconfdir=${PREFIX}/etc \ - mandir=${MAN8PREFIX}/man/man8 +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 +DOCS_MAKE_ARGS= datadir="${DOCSDIR}" doc=yes .include diff --git a/net/mrouted/distinfo b/net/mrouted/distinfo index b60b049c9d99..08ea17321a99 100644 --- a/net/mrouted/distinfo +++ b/net/mrouted/distinfo @@ -1,2 +1,2 @@ -SHA256 (mrouted-3.9.6.tar.bz2) = 8f6bdbd6eec1da3f6b0ca651a0484d7bdf7d7ead6c5d47abbaef0dfed949eccf -SIZE (mrouted-3.9.6.tar.bz2) = 112713 +SHA256 (troglobit-mrouted-3.9.7_GH0.tar.bz2) = 181908f7025c5a2dee2e50d86888780469eaa9e1bd42d3eca9dfed8274aecd3d +SIZE (troglobit-mrouted-3.9.7_GH0.tar.bz2) = 142560 diff --git a/net/mrouted/files/mrouted.in b/net/mrouted/files/mrouted.in index b32953082d97..f2a60790549d 100644 --- a/net/mrouted/files/mrouted.in +++ b/net/mrouted/files/mrouted.in @@ -1,8 +1,6 @@ #!/bin/sh # -# $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ # $FreeBSD$ -# # PROVIDE: mrouted # REQUIRE: netif routing cleanvar @@ -11,11 +9,12 @@ . /etc/rc.subr name="mrouted" -rcvar=mrouted_enable -command=%%PREFIX%%/sbin/${name} +rcvar="${name}_enable" +command="%%PREFIX%%/sbin/$name" pidfile="/var/run/${name}.pid" -required_files=%%PREFIX%%/etc/${name}.conf +required_files="%%PREFIX%%/etc/${name}.conf" extra_commands="reload" +: ${mrouted_enable-"NO"} load_rc_config $name run_rc_command "$1" diff --git a/net/mrouted/files/patch-Makefile b/net/mrouted/files/patch-Makefile index 17a99e1a2c67..944fe567a3cc 100644 --- a/net/mrouted/files/patch-Makefile +++ b/net/mrouted/files/patch-Makefile @@ -1,15 +1,49 @@ ---- Makefile.orig 2011-10-23 17:03:36.000000000 +0900 -+++ Makefile 2013-10-17 12:59:19.000000000 +0900 -@@ -51,7 +51,7 @@ +--- Makefile.orig 2014-12-28 14:23:52 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 += -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)) +-MANS = $(addsuffix .8,$(EXECS)) -DISTFILES = README AUTHORS LICENSE ChangeLog ++MANS = ${EXECS:S/$/.8/} +DISTFILES = README AUTHORS ChangeLog LINT = splint LINTFLAGS = $(MCAST_INCLUDE) $(filter-out -W -Wall -Werror, $(CFLAGS)) -posix-lib -weak -skipposixheaders -@@ -70,13 +70,13 @@ +@@ -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) @@ -17,7 +51,8 @@ + @[ -z "${doc}" ] || install -d $(DESTDIR)$(datadir) @install -d $(DESTDIR)$(mandir) @for file in $(EXECS); do \ - install -m 0755 $$file $(DESTDIR)$(prefix)/sbin/$$file; \ +- 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 \ @@ -25,3 +60,36 @@ 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 diff --git a/net/mrouted/files/patch-mtrace.c b/net/mrouted/files/patch-mtrace.c index 44d503e02dde..0dd7e2d78b1c 100644 --- a/net/mrouted/files/patch-mtrace.c +++ b/net/mrouted/files/patch-mtrace.c @@ -1,5 +1,5 @@ ---- mtrace.c.orig 2011-10-23 10:03:36.000000000 +0200 -+++ mtrace.c 2014-12-20 20:31:14.000000000 +0100 +--- mtrace.c.orig 2014-12-28 14:23:52 UTC ++++ mtrace.c @@ -903,6 +903,12 @@ void stat_line(struct tr_resp *r, struct } } diff --git a/net/mrouted/files/patch-route.c b/net/mrouted/files/patch-route.c deleted file mode 100644 index dcdb802bfce4..000000000000 --- a/net/mrouted/files/patch-route.c +++ /dev/null @@ -1,15 +0,0 @@ ---- route.c.orig 2011-07-25 21:42:18.000000000 +0200 -+++ route.c 2011-07-25 21:42:46.000000000 +0200 -@@ -1399,8 +1399,10 @@ void dump_routes(FILE *fp) - inet_fmts(r->rt_origin, r->rt_originmask, s1, sizeof(s1)), - (r->rt_gateway == 0) ? "" : inet_fmt(r->rt_gateway, s2, sizeof(s2))); - -- fprintf(fp, (r->rt_metric == UNREACHABLE) ? " NR " : "%4u ", -- r->rt_metric); -+ if (r->rt_metric == UNREACHABLE) -+ fprintf(fp, " NR "); -+ else -+ fprintf(fp, "%4u ", r->rt_metric); - - fprintf(fp, " %3u %c%c %3u ", r->rt_timer, - (r->rt_flags & RTF_CHANGED) ? 'C' : '.', diff --git a/net/mrouted/files/patch-vif.c b/net/mrouted/files/patch-vif.c deleted file mode 100644 index f83caebbc09a..000000000000 --- a/net/mrouted/files/patch-vif.c +++ /dev/null @@ -1,21 +0,0 @@ ---- vif.c.orig 2012-11-30 23:59:58.000000000 +0900 -+++ vif.c 2012-12-01 00:02:20.000000000 +0900 -@@ -1051,6 +1051,7 @@ - static int info_version(u_char *p) - { - int len; -+ size_t lenv; - - *p++ = DVMRP_INFO_VERSION; - p++; /* skip over length */ -@@ -1062,7 +1063,9 @@ - * as long as 100 bytes, but it's better to limit the amount - * of data copied to send_buf since we do not want to risk - * sending MAX size frames. */ -- len = strlcpy((char *)p, versionstring, sizeof(versionstring)); -+ /* XXX: use lenv to make clang happy. */ -+ lenv = sizeof(versionstring); -+ len = strlcpy((char *)p, versionstring, lenv); - - return ((len + 3) / 4); - }