Update to pfstat-2.3. Added a patch to make it compile on NetBSD 3.1 (no pf+ALTQ). (No changelog found)diff -r1.9 -r1.10 pkgsrc/sysutils/pfstat/Makefile
(peter)
@@ -1,23 +1,35 @@ | @@ -1,23 +1,35 @@ | |||
1 | # $NetBSD: Makefile,v 1.9 2007/05/18 10:03:32 peter Exp $ | 1 | # $NetBSD: Makefile,v 1.10 2008/06/22 13:36:59 peter Exp $ | |
2 | 2 | |||
3 | DISTNAME= pfstat-1.7 | 3 | DISTNAME= pfstat-2.3 | |
4 | PKGREVISION= 2 | |||
5 | CATEGORIES= sysutils net | 4 | CATEGORIES= sysutils net | |
6 | MASTER_SITES= http://www.benzedrine.cx/ | 5 | MASTER_SITES= http://www.benzedrine.cx/ | |
7 | 6 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= peter@NetBSD.org | |
9 | HOMEPAGE= http://www.benzedrine.cx/pfstat.html | 8 | HOMEPAGE= http://www.benzedrine.cx/pfstat.html | |
10 | COMMENT= Utility to render graphical statistics for PF | 9 | COMMENT= Utility to render graphical statistics for PF | |
11 | 10 | |||
12 | NO_CONFIGURE= yes | 11 | NO_CONFIGURE= yes | |
12 | MAKE_ENV+= PF_VERSION=${PF_VERSION:S/.//} NOGCCERROR=yes | |||
13 | 13 | |||
14 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 | 14 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/examples/pfstat | |
15 | ||||
16 | SUBST_CLASSES+= conf | |||
17 | SUBST_STAGE.conf= post-patch | |||
18 | SUBST_FILES.conf= pfstat.8 pfstat.c pfstat.conf.example | |||
19 | SUBST_SED.conf= -e "s|/etc/pfstat.conf|${PREFIX}/etc/pfstat.conf|g" | |||
20 | SUBST_MESSAGE.conf= Fixing configuration file paths. | |||
21 | ||||
22 | do-build: | |||
23 | cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} | |||
24 | cd ${WRKSRC}/pfstatd && ${SETENV} ${MAKE_ENV} ${MAKE} | |||
15 | 25 | |||
16 | do-install: | 26 | do-install: | |
17 | ${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin | 27 | ${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin | |
18 | ${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/${PKGMANDIR}/man8 | 28 | ${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/${PKGMANDIR}/man8 | |
29 | ${INSTALL_DATA} ${WRKSRC}/pfstat.conf.example ${PREFIX}/share/examples/pfstat | |||
30 | ${INSTALL_PROGRAM} ${WRKSRC}/pfstatd/pfstatd ${PREFIX}/bin | |||
31 | ${INSTALL_MAN} ${WRKSRC}/pfstatd/pfstatd.8 ${PREFIX}/${PKGMANDIR}/man8 | |||
19 | 32 | |||
20 | .include "../../graphics/gd/buildlink3.mk" | 33 | .include "../../graphics/gd/buildlink3.mk" | |
21 | .include "../../graphics/freetype-lib/buildlink3.mk" | |||
22 | .include "../../security/pflkm/buildlink3.mk" | 34 | .include "../../security/pflkm/buildlink3.mk" | |
23 | .include "../../mk/bsd.pkg.mk" | 35 | .include "../../mk/bsd.pkg.mk" |
@@ -1,3 +1,7 @@ | @@ -1,3 +1,7 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1.1.1 2004/11/05 15:07:15 peter Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2008/06/22 13:36:59 peter Exp $ | |
2 | bin/pfstat | 2 | bin/pfstat | |
3 | bin/pfstatd | |||
3 | man/man8/pfstat.8 | 4 | man/man8/pfstat.8 | |
5 | man/man8/pfstatd.8 | |||
6 | share/examples/pfstat/pfstat.conf.example | |||
7 | @dirrm share/examples/pfstat |
@@ -1,6 +1,8 @@ | @@ -1,6 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2006/03/06 23:02:07 peter Exp $ | 1 | $NetBSD: distinfo,v 1.4 2008/06/22 13:36:59 peter Exp $ | |
2 | 2 | |||
3 | SHA1 (pfstat-1.7.tar.gz) = 7bd125039c130a56a4dda3040d309d0f445d88b5 | 3 | SHA1 (pfstat-2.3.tar.gz) = 83be99fd5a7c997fc89c0858d27d471f7f9126c7 | |
4 | RMD160 (pfstat-1.7.tar.gz) = d15ebd14a42ddbdacf326b4ad59c2fcf4f7d8b07 | 4 | RMD160 (pfstat-2.3.tar.gz) = 0048005aa114d49a8e1adefc8789c7aeb704f7ad | |
5 | Size (pfstat-1.7.tar.gz) = 9610 bytes | 5 | Size (pfstat-2.3.tar.gz) = 18332 bytes | |
6 | SHA1 (patch-aa) = b1d244d9788cfaf33f3665108a419dc40ff68fea | 6 | SHA1 (patch-aa) = 72bf1f5806846833b20cacaec368744f25899e94 | |
7 | SHA1 (patch-ab) = 24ab0271e0302e03f3b00feb9e4b20f97f932435 | |||
8 | SHA1 (patch-ac) = 451e8a66d108dab39277f7d8d93150150f822879 |
@@ -1,59 +1,12 @@ | @@ -1,59 +1,12 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2006/03/06 23:02:07 peter Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2008/06/22 13:36:59 peter Exp $ | |
2 | 2 | |||
3 | --- pfstat.c.orig 2003-09-10 19:45:27.000000000 +0200 | 3 | --- graph.c.old 2008-06-21 17:30:04.000000000 +0200 | |
4 | +++ pfstat.c 2006-03-06 23:50:43.000000000 +0100 | 4 | +++ graph.c 2008-06-22 00:27:15.000000000 +0200 | |
5 | @@ -37,7 +37,12 @@ | 5 | @@ -37,7 +37,6 @@ | |
6 | #include <sys/socket.h> | 6 | #include <sys/socket.h> | |
7 | #include <netinet/in.h> | 7 | #include <netinet/in.h> | |
8 | #include <net/if.h> | 8 | #include <net/if.h> | |
9 | +#ifdef __DragonFly__ | 9 | -#include <net/pfvar.h> | |
10 | +#include <net/pf/pfvar.h> | |||
11 | +#else | |||
12 | #include <net/pfvar.h> | |||
13 | +#endif | |||
14 | + | |||
15 | #include <err.h> | 10 | #include <err.h> | |
11 | #include <errno.h> | |||
16 | #include <fcntl.h> | 12 | #include <fcntl.h> | |
17 | #include <stdio.h> | |||
18 | @@ -167,26 +172,26 @@ | |||
19 | } | |||
20 | close(dev); | |||
21 | if (s.running) { | |||
22 | - printf("%u %u", time(NULL), s.since); | |||
23 | + printf("%u %u", (unsigned int)time(NULL), s.since); | |||
24 | printf(" %llu %llu %llu %llu", | |||
25 | - s.bcounters[0][0], | |||
26 | - s.bcounters[0][1], | |||
27 | - s.bcounters[1][0], | |||
28 | - s.bcounters[1][1]); | |||
29 | + (unsigned long long)s.bcounters[0][0], | |||
30 | + (unsigned long long)s.bcounters[0][1], | |||
31 | + (unsigned long long)s.bcounters[1][0], | |||
32 | + (unsigned long long)s.bcounters[1][1]); | |||
33 | printf(" %llu %llu %llu %llu %llu %llu %llu %llu", | |||
34 | - s.pcounters[0][0][PF_PASS], | |||
35 | - s.pcounters[0][0][PF_DROP], | |||
36 | - s.pcounters[0][1][PF_PASS], | |||
37 | - s.pcounters[0][1][PF_DROP], | |||
38 | - s.pcounters[1][0][PF_PASS], | |||
39 | - s.pcounters[1][0][PF_DROP], | |||
40 | - s.pcounters[1][1][PF_PASS], | |||
41 | - s.pcounters[1][1][PF_DROP]); | |||
42 | + (unsigned long long)s.pcounters[0][0][PF_PASS], | |||
43 | + (unsigned long long)s.pcounters[0][0][PF_DROP], | |||
44 | + (unsigned long long)s.pcounters[0][1][PF_PASS], | |||
45 | + (unsigned long long)s.pcounters[0][1][PF_DROP], | |||
46 | + (unsigned long long)s.pcounters[1][0][PF_PASS], | |||
47 | + (unsigned long long)s.pcounters[1][0][PF_DROP], | |||
48 | + (unsigned long long)s.pcounters[1][1][PF_PASS], | |||
49 | + (unsigned long long)s.pcounters[1][1][PF_DROP]); | |||
50 | printf(" %u", s.states); | |||
51 | for (i = 0; i < FCNT_MAX; ++i) | |||
52 | - printf(" %lld", s.fcounters[i]); | |||
53 | + printf(" %lld", (long long)s.fcounters[i]); | |||
54 | for (i = 0; i < PFRES_MAX; ++i) | |||
55 | - printf(" %lld", s.counters[i]); | |||
56 | + printf(" %lld", (long long)s.counters[i]); | |||
57 | printf("\n"); | |||
58 | } | |||
59 | return (0); |
$NetBSD: patch-ab,v 1.1 2008/06/22 13:36:59 peter Exp $
--- pf.c.old 2008-06-22 00:26:15.000000000 +0200
+++ pf.c 2008-06-22 15:10:13.000000000 +0200
@@ -37,11 +37,17 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <net/if.h>
+#ifdef __DragonFly__
+#include <net/pf/pfvar.h>
+#else
#include <net/pfvar.h>
+#endif /* !__DragonFly__ */
+#ifdef HAVE_ALTQ
#include <altq/altq.h>
#include <altq/altq_cbq.h>
#include <altq/altq_priq.h>
#include <altq/altq_hfsc.h>
+#endif /* HAVE_ALTQ */
#include <arpa/inet.h>
#include <err.h>
#include <errno.h>
@@ -53,6 +59,7 @@
#include "pf.h"
+#ifdef HAVE_ALTQ
union altq_stats {
class_stats_t cbq;
struct priq_classstats priq;
@@ -138,6 +145,7 @@
}
return (0);
}
+#endif /* HAVE_ALTQ */
static int
query_ifaces(int fd, void (*cb)(int, const char *, int, double))
@@ -195,9 +203,11 @@
fprintf(stderr, "pf_query: query_ifaces() failed\n");
return (1);
}
+#ifdef HAVE_ALTQ
if (query_queues(fd, cb)) {
fprintf(stderr, "pf_query: query_queues() failed\n");
return (1);
}
+#endif /* HAVE_ALTQ */
return (0);
}
$NetBSD: patch-ac,v 1.1 2008/06/22 13:36:59 peter Exp $
--- pf.h.old 2008-06-22 00:40:22.000000000 +0200
+++ pf.h 2008-06-22 00:49:15.000000000 +0200
@@ -33,6 +33,18 @@
#ifndef _PF_H_
#define _PF_H_
+#ifdef NetBSD
+#if PF_VERSION > 36
+/* NetBSD has pf+ALTQ since 4.0 (shipped with pf version 3.7) */
+#define HAVE_ALTQ
+#endif /* PF_VERSION > 36 */
+#else
+/* Assume pf+ALTQ for non-NetBSD OS if pf version is at least 3.3 */
+#if PF_VERSION > 32
+#define HAVE_ALTQ
+#endif /* PF_VERSION > 32 */
+#endif /* !__NetBSD__ */
+
#define COL_TYPE_SINCE -1
#define COL_TYPE_GLOBAL 0
#define COL_TYPE_IFACE 1