actually install the new npf examples

add examples for a hash table file and a tree table file
add an ID string to host-npf.conf
This commit is contained in:
spz 2012-08-22 06:45:15 +00:00
parent 6c6b2a936f
commit c60c5ec2d8
7 changed files with 41 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.1002 2012/08/19 08:22:59 mrg Exp $
# $NetBSD: mi,v 1.1003 2012/08/22 06:45:15 spz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@ -1669,6 +1669,11 @@
./usr/share/examples/lua/sqlite.lua base-sys-examples share
./usr/share/examples/mount_portal base-miscfs-examples
./usr/share/examples/named base-obsolete obsolete
./usr/share/examples/npf base-netutil-examples
./usr/share/examples/npf/host-npf.conf base-netutil-examples
./usr/share/examples/npf/soho_gw-npf.conf base-netutil-examples
./usr/share/examples/npf/hashtablefile base-netutil-examples
./usr/share/examples/npf/treetablefile base-netutil-examples
./usr/share/examples/openssl base-crypto-examples
./usr/share/examples/pf base-netutil-examples
./usr/share/examples/postfix base-postfix-examples

View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist.base,v 1.103 2012/06/21 04:30:04 pgoyette Exp $
# $NetBSD: NetBSD.dist.base,v 1.104 2012/08/22 06:45:16 spz Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@ -344,6 +344,7 @@
./usr/share/examples/libsaslc/mech
./usr/share/examples/lua
./usr/share/examples/mount_portal
./usr/share/examples/npf
./usr/share/examples/openssl
./usr/share/examples/pf
./usr/share/examples/pppd

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.20 2011/11/12 01:18:40 jmmv Exp $
# $NetBSD: Makefile,v 1.21 2012/08/22 06:45:16 spz Exp $
SUBDIR= amd apm asm disktab emul fstab ftpd getdate hostapd isdn lua pppd \
racoon supfiles syslogd wsmoused
SUBDIR= amd apm asm disktab emul fstab ftpd getdate hostapd \
isdn lua npf pppd racoon supfiles syslogd wsmoused
.include <bsd.subdir.mk>

View File

@ -0,0 +1,12 @@
# $NetBSD: Makefile,v 1.1 2012/08/22 06:45:16 spz Exp $
NOOBJ= # defined
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
FILES= host-npf.conf soho_gw-npf.conf hashtablefile treetablefile
FILESDIR= /usr/share/examples/npf
.endif
.include <bsd.prog.mk>

View File

@ -0,0 +1,8 @@
# $NetBSD: hashtablefile,v 1.1 2012/08/22 06:45:17 spz Exp $
#
# hash tables can only have single IP addresses
#
# entry comment 1 (optional)
192.0.2.7
# entry comment 2 (optional)
198.51.100.48

View File

@ -1,3 +1,5 @@
# $NetBSD: host-npf.conf,v 1.2 2012/08/22 06:45:17 spz Exp $
#
# this is an example of NPF rules for a host (i.e., not routing) with
# two network interfaces, wired and wifi
#

View File

@ -0,0 +1,8 @@
# $NetBSD: treetablefile,v 1.1 2012/08/22 06:45:17 spz Exp $
#
# tree tables can have address blocks
#
# entry comment 1 (optional)
198.51.100.40/30
# entry comment 2 (optional)
192.0.2.7