Module Name: src
Committed By: spz
Date: Wed Aug 22 06:45:17 UTC 2012
Modified Files:
src/distrib/sets/lists/base: mi
src/etc/mtree: NetBSD.dist.base
src/share/examples: Makefile
src/share/examples/npf: host-npf.conf
Added Files:
src/share/examples/npf: Makefile hashtablefile treetablefile
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.1002 -r1.1003 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.103 -r1.104 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.20 -r1.21 src/share/examples/Makefile
cvs rdiff -u -r0 -r1.1 src/share/examples/npf/Makefile \
src/share/examples/npf/hashtablefile src/share/examples/npf/treetablefile
cvs rdiff -u -r1.1 -r1.2 src/share/examples/npf/host-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1002 src/distrib/sets/lists/base/mi:1.1003
--- src/distrib/sets/lists/base/mi:1.1002 Sun Aug 19 08:22:59 2012
+++ src/distrib/sets/lists/base/mi Wed Aug 22 06:45:15 2012
@@ -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
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.103 src/etc/mtree/NetBSD.dist.base:1.104
--- src/etc/mtree/NetBSD.dist.base:1.103 Thu Jun 21 04:30:04 2012
+++ src/etc/mtree/NetBSD.dist.base Wed Aug 22 06:45:16 2012
@@ -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
Index: src/share/examples/Makefile
diff -u src/share/examples/Makefile:1.20 src/share/examples/Makefile:1.21
--- src/share/examples/Makefile:1.20 Sat Nov 12 01:18:40 2011
+++ src/share/examples/Makefile Wed Aug 22 06:45:16 2012
@@ -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>
Index: src/share/examples/npf/host-npf.conf
diff -u src/share/examples/npf/host-npf.conf:1.1 src/share/examples/npf/host-npf.conf:1.2
--- src/share/examples/npf/host-npf.conf:1.1 Mon Aug 20 21:09:49 2012
+++ src/share/examples/npf/host-npf.conf Wed Aug 22 06:45:17 2012
@@ -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
#
Added files:
Index: src/share/examples/npf/Makefile
diff -u /dev/null src/share/examples/npf/Makefile:1.1
--- /dev/null Wed Aug 22 06:45:18 2012
+++ src/share/examples/npf/Makefile Wed Aug 22 06:45:16 2012
@@ -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>
Index: src/share/examples/npf/hashtablefile
diff -u /dev/null src/share/examples/npf/hashtablefile:1.1
--- /dev/null Wed Aug 22 06:45:18 2012
+++ src/share/examples/npf/hashtablefile Wed Aug 22 06:45:17 2012
@@ -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
Index: src/share/examples/npf/treetablefile
diff -u /dev/null src/share/examples/npf/treetablefile:1.1
--- /dev/null Wed Aug 22 06:45:18 2012
+++ src/share/examples/npf/treetablefile Wed Aug 22 06:45:17 2012
@@ -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
