Attachment #61455 for bug #92094

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

Lines 6-13 Link Here

(-)/usr/home/trn/pftop/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= pftop	8	PORTNAME= pftop
9	PORTVERSION= 0.4	9	PORTVERSION= 0.5
10	PORTREVISION= 2	10	#PORTREVISION= 2
11	CATEGORIES= sysutils net	11	CATEGORIES= sysutils net
12	MASTER_SITES= http://www.eee.metu.edu.tr/~canacar/	12	MASTER_SITES= http://www.eee.metu.edu.tr/~canacar/
13	DISTNAME= ${PORTNAME}-${PORTVERSION}	13	DISTNAME= ${PORTNAME}-${PORTVERSION}
Lines 22-28 Link Here
22	.include <bsd.port.pre.mk>	22	.include <bsd.port.pre.mk>
23		23
24	.if ${OSVERSION} < 502106	24	.if ${OSVERSION} < 502106
25	IGNORE= Only for 5.3 and above	25	IGNORE= only for 5.3 and above
26	.endif	26	.endif
27		27
28	.if ${OSVERSION} < 502116	28	.if ${OSVERSION} < 502116

Lines 1-2 Link Here

(-)/usr/home/trn/pftop/distinfo (-2 / +2 lines)
1	MD5 (pftop-0.4.tar.gz) = d33b3a30152bac7d50d019a78bc58c72	1	MD5 (pftop-0.5.tar.gz) = d4bdb5dfa7722f76ed3027c1d0be1653
2	SIZE (pftop-0.4.tar.gz) = 23631	2	SHA256 (pftop-0.5.tar.gz) = e5d0fd0d84285a52fd0d1944908d4c3e4f545ec0f0e11e9f9c29ce1536a9d0b7




*** config.h.orig	Sat Jan 21 04:39:55 2006
--- config.h	Sat Jan 21 04:40:15 2006
***************
*** 23,31 ****
  
  #if OS_LEVEL > 32
  #define HAVE_ADDR_MASK
  #define HAVE_ADDR_TYPE
! #define HAVE_ALTQ
  #define HAVE_RULE_TOS
  #define HAVE_OP_RRG
  #endif
  
--- 23,31 ----
  
  #if OS_LEVEL > 32
  #define HAVE_ADDR_MASK
  #define HAVE_ADDR_TYPE
! /* #define HAVE_ALTQ */
  #define HAVE_RULE_TOS
  #define HAVE_OP_RRG
  #endif
  




*** pftop.c.orig	Tue Jan 10 21:06:14 2006
--- pftop.c	Sat Jan 21 04:47:06 2006
***************
*** 2215,2226 ****
  	tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto);
  #ifdef HAVE_RULE_UGID
  	if (pr->uid.op)
  		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
! 		        "user", UID_MAX);
  	if (pr->gid.op)
  		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
! 		        "group", GID_MAX);
  #endif
  
  	if (pr->flags || pr->flagset) {
  		tbprintf(" flags ");
--- 2215,2226 ----
  	tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto);
  #ifdef HAVE_RULE_UGID
  	if (pr->uid.op)
  		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
! 		        "user", UINT_MAX);
  	if (pr->gid.op)
  		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
! 		        "group", UINT_MAX);
  #endif
  
  	if (pr->flags || pr->flagset) {
  		tbprintf(" flags ");
 		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
-		        "user", UID_MAX);
+		        "user", UINT_MAX);
 	if (pr->gid.op)
 		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
-		        "group", GID_MAX);
+		        "group", UINT_MAX);
 #endif
 
 	if (pr->flags || pr->flagset) {

Return to bug 92094

Lines 1-13 Link Here

(-)/usr/home/trn/pftop/files/patch-aa (-13 / +23 lines)
1	--- config.h.orig Tue Aug 5 03:19:58 2003	1	*** config.h.orig Sat Jan 21 04:39:55 2006
2	+++ config.h Wed May 4 18:36:37 2005	2	--- config.h Sat Jan 21 04:40:15 2006
3	@@ -24,8 +24,8 @@	3	***************
4	#if OS_LEVEL > 32	4	* 23,31 **
5	#define HAVE_ADDR_MASK	5
6	#define HAVE_ADDR_TYPE	6	#if OS_LEVEL > 32
7	-#define HAVE_ALTQ	7	#define HAVE_ADDR_MASK
8	-#define HAVE_RULE_ANCHOR	8	#define HAVE_ADDR_TYPE
9	+/* #define HAVE_ALTQ */	9	! #define HAVE_ALTQ
10	+/* #define HAVE_RULE_ANCHOR */	10	#define HAVE_RULE_TOS
11	#define HAVE_RULE_TOS	11	#define HAVE_OP_RRG
12	#endif	12	#endif
13		13
		14	--- 23,31 ----
		15
		16	#if OS_LEVEL > 32
		17	#define HAVE_ADDR_MASK
		18	#define HAVE_ADDR_TYPE
		19	! /* #define HAVE_ALTQ */
		20	#define HAVE_RULE_TOS
		21	#define HAVE_OP_RRG
		22	#endif
		23

Lines 1-39 Link Here

(-)/usr/home/trn/pftop/files/patch-ab (-39 / +29 lines)
1	--- pftop.c.orig Tue Aug 5 03:20:39 2003	1	*** pftop.c.orig Tue Jan 10 21:06:14 2006
2	+++ pftop.c Wed May 4 18:41:13 2005	2	--- pftop.c Sat Jan 21 04:47:06 2006
3	@@ -1802,7 +1802,11 @@	3	***************
4	PF_AZERO(PT_MASK(src), AF_INET6))	4	* 2215,2226 **
5	tbprintf("any ");	5	tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto);
6	else {	6	#ifdef HAVE_RULE_UGID
7	+#if OS_LEVEL > 35	7	if (pr->uid.op)
8	+ if (src->neg)	8	tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
9	+#else	9	! "user", UID_MAX);
10	if (src->not)	10	if (pr->gid.op)
11	+#endif	11	tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
12	tbprintf("! ");	12	! "group", GID_MAX);
13	#ifdef HAVE_ADDR_WRAP	13	#endif
14	tb_print_addrw(&src->addr, PT_MASK(src), af);	14
15	@@ -1823,7 +1827,11 @@	15	if (pr->flags \|\| pr->flagset) {
16	PF_AZERO(PT_MASK(dst), AF_INET6))	16	tbprintf(" flags ");
17	tbprintf("any ");	17	--- 2215,2226 ----
18	else {	18	tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto);
19	+#if OS_LEVEL > 35	19	#ifdef HAVE_RULE_UGID
20	+ if (dst->neg)	20	if (pr->uid.op)
21	+#else	21	tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
22	if (dst->not)	22	! "user", UINT_MAX);
23	+#endif	23	if (pr->gid.op)
24	tbprintf("! ");	24	tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
25	#ifdef HAVE_ADDR_WRAP	25	! "group", UINT_MAX);
26	tb_print_addrw(&dst->addr, PT_MASK(dst), af);	26	#endif
27	@@ -1983,10 +1991,10 @@	27
28	#ifdef HAVE_RULE_UGID	28	if (pr->flags \|\| pr->flagset) {
29	if (pr->uid.op)	29	tbprintf(" flags ");
30	tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
31	- "user", UID_MAX);
32	+ "user", UINT_MAX);
33	if (pr->gid.op)
34	tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
35	- "group", GID_MAX);
36	+ "group", UINT_MAX);
37	#endif
38
39	if (pr->flags \|\| pr->flagset) {