Attachment #93364 for bug #131259

View | Details | Raw Unified | Return to bug 131259
Collapse All | Expand All





PORTNAME=	aggregate
PORTVERSION=	1.6
PORTREVISION=	1
CATEGORIES=	net-mgmt
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

PLIST_FILES=	bin/aggregate bin/aggregate-ios
MAN1=		aggregate.1 aggregate-ios.1

.include <bsd.port.mk>

Removed Link Here

(-)pkg-plist (-2 lines)
1	bin/aggregate
2	bin/aggregate-ios




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++;

Return to bug 131259

Lines 7-21 Link Here

(-)Makefile (-3 / +5 lines)
7		7
8	PORTNAME= aggregate	8	PORTNAME= aggregate
9	PORTVERSION= 1.6	9	PORTVERSION= 1.6
		10	PORTREVISION= 1
10	CATEGORIES= net-mgmt	11	CATEGORIES= net-mgmt
11	MASTER_SITES= ftp://ftp.isc.org/isc/aggregate/ \	12	MASTER_SITES= ${MASTER_SITE_ISC}
12	http://software.automagic.org/aggregate/	13	MASTER_SITE_SUBDIR= aggregate
13		14
14	MAINTAINER= jabley@automagic.org	15	MAINTAINER= jabley@automagic.org
15	COMMENT= Optimise a list of route prefixes to help make nice short filters	16	COMMENT= Optimise a list of route prefixes to help make nice short filters
16		17
17	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
18		19
19	MAN1= aggregate.1 aggregate-ios.1	20	PLIST_FILES= bin/aggregate bin/aggregate-ios
		21	MAN1= aggregate.1 aggregate-ios.1
20		22
21	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Added Link Here

(-)files/patch-aggregate.c (+24 lines)
1	Index: aggregate.c
2	===================================================================
3	--- aggregate.c (revision 919)
4	+++ aggregate.c (working copy)
5	@@ -261,8 +261,18 @@
6	moanf(0, "[line %d] line too long; ignoring line", line);
7	continue;
8	}
9	+ if (buf[i] == '/') {
10	+ masklen = atoi(buf + i + 1);
11	+ if (masklen < 1 \|\| masklen > max_prefix_length)
12	+ {
13	+ if (!quiet)
14	+ moanf(0, "[line %d] mask length %d out of range; ignoring line", \
15	+ line, masklen);
16	+ continue;
17	+ }
18	+ } else
19	+ masklen = default_prefix_length;
20	buf[i] = 0;
21	- masklen = default_prefix_length;
22	} else {
23	i = 0;
24	while (buf[i] != '/' && i < MAX_buf) i++;