Date: Sun, 1 Feb 2009 19:14:24 +0300 (MSK) From: Dmitry Morozovsky <marck@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/131259: [patch] net-mgmt/aggregate to fix simultaneous -p and -t options usage Message-ID: <200902011614.n11GEOuA037655@woozle.rinet.ru> Resent-Message-ID: <200902011630.n11GU3ZU089042@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 131259 >Category: ports >Synopsis: [patch] net-mgmt/aggregate to fix simultaneous -p and -t options usage >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Feb 01 16:30:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dmitry Morozovsky >Release: FreeBSD 7.1-STABLE i386 >Organization: Cronyx Plus LLC (RiNet ISP) >Environment: System: FreeBSD revamp.wpub.woozle.net 7.1-STABLE FreeBSD 7.1-STABLE #0: Sat Jan 10 14:41:52 MSK 2009 marck@revamp.wpub.woozle.net:/usr/obj/usr/src/sys/REVAMP i386 >Description: When using -t option together with -p (default prefix legth), prefix length actually given on input stream is ignored. While I'm here, make portlint -C happy, asnd remove stale mastersite (HTTP 404). >How-To-Repeat: me> (echo 127.0.0.1; echo 169.254.0.0/16) | aggregate -t -p 32 aggregate: maximum prefix length permitted will be 32 aggregate: prefix length of 32 bits will be used where none specified 127.0.0.1/32 169.254.0.0/32 >Fix: (pkg-plist should be cvs rm'd) Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-mgmt/aggregate/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 23 Feb 2004 04:41:55 -0000 1.11 +++ Makefile 1 Feb 2009 15:02:59 -0000 @@ -7,15 +7,17 @@ PORTNAME= aggregate PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= net-mgmt -MASTER_SITES= ftp://ftp.isc.org/isc/aggregate/ \ - http://software.automagic.org/aggregate/ +MASTER_SITES= ${MASTER_SITE_ISC} +MASTER_SITE_SUBDIR= aggregate MAINTAINER= jabley@automagic.org COMMENT= Optimise a list of route prefixes to help make nice short filters GNU_CONFIGURE= yes -MAN1= aggregate.1 aggregate-ios.1 +PLIST_FILES= bin/aggregate bin/aggregate-ios +MAN1= aggregate.1 aggregate-ios.1 .include <bsd.port.mk> Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- pkg-plist 4 Mar 2001 15:48:50 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -bin/aggregate -bin/aggregate-ios Index: files/patch-aggregate.c =================================================================== RCS file: files/patch-aggregate.c diff -N files/patch-aggregate.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-aggregate.c 1 Feb 2009 14:55:42 -0000 @@ -0,0 +1,24 @@ +Index: aggregate.c +=================================================================== +--- aggregate.c (revision 919) ++++ aggregate.c (working copy) +@@ -261,8 +261,18 @@ + moanf(0, "[line %d] line too long; ignoring line", line); + continue; + } ++ if (buf[i] == '/') { ++ masklen = atoi(buf + i + 1); ++ if (masklen < 1 || masklen > max_prefix_length) ++ { ++ if (!quiet) ++ moanf(0, "[line %d] mask length %d out of range; ignoring line", \ ++ line, masklen); ++ continue; ++ } ++ } else ++ masklen = default_prefix_length; + buf[i] = 0; +- masklen = default_prefix_length; + } else { + i = 0; + while (buf[i] != '/' && i < MAX_buf) i++; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902011614.n11GEOuA037655>