the_paya    09/01/27 12:50:33

  Added:                pftop-0.7-strnvis_fix.patch pftop-0.7-dead.patch
                        pftop-0.7-pcap.patch pftop-0.7-queue.patch.bz2
                        pftop-0.7-pr123670.patch
  Log:
  New version.
  (Portage version: 2.2_rc23/cvs/FreeBSD i386)

Revision  Changes    Path
1.1                  net-firewall/pftop/files/pftop-0.7-strnvis_fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/pftop/files/pftop-0.7-strnvis_fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/pftop/files/pftop-0.7-strnvis_fix.patch?rev=1.1&content-type=text/plain

Index: pftop-0.7-strnvis_fix.patch
===================================================================
Fix from FreeBSD ports.

--- sf-scanner.l.orig
+++ sf-scanner.l
@@ -233,7 +233,7 @@
 			size_t len = strlen(yytext) * 4 + 1;
 			char *v = malloc(len);
 			if (v != NULL)
-				strnvis(v, yytext, len, 0);
+				strvis(v, yytext, 0);
 			sf_error("illegal token: %s", v);
 			free(v);
 			}



1.1                  net-firewall/pftop/files/pftop-0.7-dead.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/pftop/files/pftop-0.7-dead.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/pftop/files/pftop-0.7-dead.patch?rev=1.1&content-type=text/plain

Index: pftop-0.7-dead.patch
===================================================================
Patch from FreeBSD ports.

--- pftop-0.7.orig/sf-gencode.c
+++ pftop-0.7/sf-gencode.c
@@ -32,7 +32,7 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <net/if_pflog.h>
+/* #include <net/if_pflog.h> */
 #include <net/pfvar.h>
 
 #include <netdb.h>
@@ -60,7 +60,7 @@
 static char sf_errbuf[PFTOP_ERRBUF_SIZE];
 
 /* VARARGS */
-__dead void
+__dead2 void
 sf_error(const char *fmt, ...)
 {
 	va_list ap;
--- pftop-0.7.orig/sf-gencode.h
+++ pftop-0.7/sf-gencode.h
@@ -169,7 +169,7 @@
 struct arth  *gen_loadexpire(void);
 
 void bpf_optimize(struct block **);
-__dead void bpf_error(const char *, ...)
+__dead2 void bpf_error(const char *, ...)
     __attribute__((volatile, __format__ (printf, 1, 2)));
 
 void finish_parse(struct block *);
@@ -184,7 +184,7 @@
 #define JT(b)  ((b)->et.succ)
 #define JF(b)  ((b)->ef.succ)
 
-__dead void sf_error(const char *fmt, ...);
+__dead2 void sf_error(const char *fmt, ...);
 const char *sf_get_error(void);
 int sf_compile(struct bpf_program *, char *, int, bpf_u_int32);
 void sf_freecode(struct bpf_program *);



1.1                  net-firewall/pftop/files/pftop-0.7-pcap.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/pftop/files/pftop-0.7-pcap.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/pftop/files/pftop-0.7-pcap.patch?rev=1.1&content-type=text/plain

Index: pftop-0.7-pcap.patch
===================================================================
Fix compilation against libpcap-1.0.0.

--- pftop-0.7.orig/bpf_dump.c
+++ pftop-0.7/bpf_dump.c
@@ -33,10 +33,10 @@
 #include <stdio.h>
 
 
-extern void bpf_dump(struct bpf_program *, int);
+extern void bpf_dump(const struct bpf_program *, int);
 
 void
-bpf_dump(struct bpf_program *p, int option)
+bpf_dump(const struct bpf_program *p, int option)
 {
 	struct bpf_insn *insn;
 	int i;
--- pftop-0.7.orig/bpf_filter.c
+++ pftop-0.7/bpf_filter.c
@@ -134,7 +134,7 @@
 }
 #endif
 
-#include <net/bpf.h>
+//#include <net/bpf.h>
 
 /*
  * Execute the filter program starting at pc on the packet p
@@ -143,8 +143,8 @@
  */
 u_int
 bpf_filter(pc, p, wirelen, buflen)
-	struct bpf_insn *pc;
-	u_char *p;
+	const struct bpf_insn *pc;
+	const u_char *p;
 	u_int wirelen;
 	u_int buflen;
 {
--- pftop-0.7.orig/bpf_image.c
+++ pftop-0.7/bpf_image.c
@@ -36,7 +36,7 @@
 
 char *
 bpf_image(p, n)
-	struct bpf_insn *p;
+	const struct bpf_insn *p;
 	int n;
 {
 	int v;
--- pftop-0.7.orig/sf-gencode.h
+++ pftop-0.7/sf-gencode.h
@@ -188,7 +188,7 @@
 const char *sf_get_error(void);
 int sf_compile(struct bpf_program *, char *, int, bpf_u_int32);
 void sf_freecode(struct bpf_program *);
-void bpf_dump(struct bpf_program *, int);
+void bpf_dump(const struct bpf_program *, int);
 
 extern int no_optimize;
 



1.1                  net-firewall/pftop/files/pftop-0.7-queue.patch.bz2

	<<Binary file>>


1.1                  net-firewall/pftop/files/pftop-0.7-pr123670.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/pftop/files/pftop-0.7-pr123670.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/pftop/files/pftop-0.7-pr123670.patch?rev=1.1&content-type=text/plain

Index: pftop-0.7-pr123670.patch
===================================================================
--- pftop.c.orig	2007-11-07 01:36:46.000000000 -0500
+++ pftop.c	2008-05-16 15:57:12.000000000 -0400
@@ -1486,7 +1486,13 @@
 	print_fld_size(FLD_BYTES, pr->bytes);
 #endif
 	print_fld_uint(FLD_RULE, pr->nr);
-	print_fld_str(FLD_DIR, pr->direction == PF_OUT ? "Out" : "In");
+	if (pr->direction == PF_IN)
+		print_fld_str(FLD_DIR, "In");
+	else if (pr->direction == PF_OUT)
+		print_fld_str(FLD_DIR, "Out");
+	else
+		print_fld_str(FLD_DIR, "Any");
+
 	if (pr->quick)
 		print_fld_str(FLD_QUICK, "Quick");
 
@@ -1570,10 +1576,10 @@
 #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);
+		        "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) {
@@ -1765,7 +1771,12 @@
 				  strerror(errno));
 			return (-1);
 		}
+#ifdef PFALTQ_FLAG_IF_REMOVED
+		if (pa.altq.qid > 0 &&
+		    !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
+#else
 		if (pa.altq.qid > 0) {
+#endif
 			pq.nr = nr;
 			pq.ticket = pa.ticket;
 			pq.buf = &qstats;