Import of pkgsrc-2013Q2

sysutils/pfstat/DESCR

@@ -0,0 +1,2 @@
+Pfstat is a small utility that collects statistics for the OpenBSD
+Packer Filter and produces graphs like mrtg, rrdtool or alike.

sysutils/pfstat/Makefile

@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.24 2013/06/04 22:17:08 tron Exp $
+
+DISTNAME=	pfstat-2.5
+PKGREVISION=	5
+CATEGORIES=	sysutils net
+MASTER_SITES=	http://www.benzedrine.cx/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.benzedrine.cx/pfstat.html
+COMMENT=	Utility to render graphical statistics for PF
+LICENSE=	2-clause-bsd
+
+USE_BSD_MAKEFILE=	yes
+USE_TOOLS+=		yacc
+
+MAKE_ENV+=	PF_VERSION=${PF_VERSION:S/.//} NOGCCERROR=yes
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 share/examples/pfstat
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	post-patch
+SUBST_FILES.conf=	pfstat.8 pfstat.c pfstat.conf.example
+SUBST_SED.conf=		-e "s|/etc/pfstat.conf|${PKG_SYSCONFDIR}/pfstat.conf|g"
+SUBST_MESSAGE.conf=	Fixing configuration file paths.
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/pfstat.conf.example ${DESTDIR}${PREFIX}/share/examples/pfstat
+
+.include "../../graphics/gd/buildlink3.mk"
+.include "../../mk/pf.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

sysutils/pfstat/PLIST

@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.4 2011/04/15 11:27:04 obache Exp $
+bin/pfstat
+bin/pfstatd
+man/cat8/pfstat.0
+man/cat8/pfstatd.0
+man/man8/pfstat.8
+man/man8/pfstatd.8
+share/examples/pfstat/pfstat.conf.example

sysutils/pfstat/distinfo

@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.7 2012/05/27 20:46:14 dholland Exp $
+
+SHA1 (pfstat-2.5.tar.gz) = fdc6acae98ac2c102dedd2c82104c66d1c0af3ee
+RMD160 (pfstat-2.5.tar.gz) = bba652d4f27b41554422410e924a421a1a0fe2a0
+Size (pfstat-2.5.tar.gz) = 19166 bytes
+SHA1 (patch-Makefile) = 9852c2af6f0891a7696bb81c0c284725cb653595
+SHA1 (patch-aa) = 72bf1f5806846833b20cacaec368744f25899e94
+SHA1 (patch-ab) = 24ab0271e0302e03f3b00feb9e4b20f97f932435
+SHA1 (patch-ac) = 451e8a66d108dab39277f7d8d93150150f822879
+SHA1 (patch-ad) = 35350590919a13e4cb1cb44f1d5b2f6846699c56
+SHA1 (patch-ae) = 7a538480b79752b763c0c72945ff80bdbdb00a31
+SHA1 (patch-pfstatd_Makefile) = bbcb7738a83e93cfb7053bf5cd09a3da0af5e1ea

sysutils/pfstat/patches/patch-Makefile

@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile,v 1.1 2011/04/15 11:27:04 obache Exp $
+
+* match to mk-files from pkgsrc.
+
+--- Makefile.orig	2007-08-21 10:17:36.000000000 +0000
++++ Makefile
+@@ -9,4 +9,5 @@ CFLAGS+=	-I${LOCALBASE}/include -I${.CUR
+ LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+ LDFLAGS+=	-lgd -lm -lpng -lz -ljpeg
+ 
++.include <bsd.subdir.mk>
+ .include <bsd.prog.mk>

sysutils/pfstat/patches/patch-aa

@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2008/06/22 13:36:59 peter Exp $
+
+--- graph.c.old	2008-06-21 17:30:04.000000000 +0200
++++ graph.c	2008-06-22 00:27:15.000000000 +0200
+@@ -37,7 +37,6 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
+-#include <net/pfvar.h>
+ #include <err.h>
+ #include <errno.h>
+ #include <fcntl.h>

sysutils/pfstat/patches/patch-ab

@@ -0,0 +1,50 @@
+$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);
+ }

sysutils/pfstat/patches/patch-ac

@@ -0,0 +1,23 @@
+$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

sysutils/pfstat/patches/patch-ad

@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 14:55:45 wiz Exp $
+
+--- pfstat.8.orig	2010-06-13 14:49:25.000000000 +0000
++++ pfstat.8
+@@ -155,6 +155,7 @@ instead of 1000.
+ .It Fl d Ar database
+ Database file.
+ Default is /var/db/pfstat.db.
++.El
+ .Sh EXAMPLES
+ .Bd -literal
+ collect 1 = interface "sis0" pass bytes in ipv4 diff

sysutils/pfstat/patches/patch-ae

@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2010/06/13 14:55:45 wiz Exp $
+
+--- pfstatd/pfstatd.8.orig	2007-01-11 16:01:58.000000000 +0000
++++ pfstatd/pfstatd.8
+@@ -64,6 +64,7 @@ after opening the device special file
+ .Pa /dev/pf .
+ Default is
+ .Sq nobody .
++.El
+ .Sh SECURITY CONSIDERATIONS
+ Clients are not authenticated and output is not encrypted.
+ The daemon does not read input from clients and immediately

sysutils/pfstat/patches/patch-pfstatd_Makefile

@@ -0,0 +1,21 @@
+$NetBSD: patch-pfstatd_Makefile,v 1.1 2012/05/27 20:46:14 dholland Exp $
+
+Don't use .PATH: ${.CURDIR}/.. as it causes erratic behavior.
+(For example, because ../pfstatd exists, make may latch onto that
+as the path for "pfstatd" instead of the pfstatd executable.)
+
+--- pfstatd/Makefile~	2007-01-11 16:01:58.000000000 +0000
++++ pfstatd/Makefile
+@@ -3,8 +3,11 @@
+ PROG=	pfstatd
+ SRCS=	pfstatd.c pf.c
+ MAN=	pfstatd.8
+-.PATH: ${.CURDIR}/..
++#.PATH: ${.CURDIR}/..
+ CFLAGS+=	-Wall
+ CFLAGS+=	-I${.CURDIR}/..
+ 
+ .include <bsd.prog.mk>
++
++pf.c: ../pf.c
++	cp ../pf.c pf.c