Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Install pf(4) examples. Reviewed by yamt@.



details:   https://anonhg.NetBSD.org/src/rev/1028955793a5
branches:  trunk
changeset: 574853:1028955793a5
user:      peter <peter%NetBSD.org@localhost>
date:      Tue Mar 15 16:05:03 2005 +0000

description:
Install pf(4) examples. Reviewed by yamt@.
Thanks to hubertf@ for the reminder.

diffstat:

 dist/pf/etc/pf.conf              |   4 ++--
 dist/pf/share/man/man5/pf.conf.5 |   4 ++--
 distrib/sets/lists/base/mi       |   3 ++-
 distrib/sets/lists/misc/mi       |  11 ++++++++++-
 etc/mtree/NetBSD.dist            |   3 ++-
 usr.sbin/pf/Makefile             |   6 +++++-
 usr.sbin/pf/examples/Makefile    |  11 +++++++++++
 7 files changed, 34 insertions(+), 8 deletions(-)

diffs (125 lines):

diff -r 998d7aad339b -r 1028955793a5 dist/pf/etc/pf.conf
--- a/dist/pf/etc/pf.conf       Tue Mar 15 15:57:58 2005 +0000
+++ b/dist/pf/etc/pf.conf       Tue Mar 15 16:05:03 2005 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: pf.conf,v 1.2 2004/11/14 11:26:47 yamt Exp $
+#      $NetBSD: pf.conf,v 1.3 2005/03/15 16:05:03 peter Exp $
 #      $OpenBSD: pf.conf,v 1.28 2004/04/29 21:03:09 frantzen Exp $
 #
-# See pf.conf(5) and /usr/share/pf for syntax and examples.
+# See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
 # Remember to set net.inet.ip.forwarding=1 and/or net.inet6.ip6.forwarding=1
 # in /etc/sysctl.conf if packets are to be forwarded between interfaces.
 
diff -r 998d7aad339b -r 1028955793a5 dist/pf/share/man/man5/pf.conf.5
--- a/dist/pf/share/man/man5/pf.conf.5  Tue Mar 15 15:57:58 2005 +0000
+++ b/dist/pf/share/man/man5/pf.conf.5  Tue Mar 15 16:05:03 2005 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pf.conf.5,v 1.2 2004/11/14 11:26:48 yamt Exp $
+.\"    $NetBSD: pf.conf.5,v 1.3 2005/03/15 16:05:03 peter Exp $
 .\"    $OpenBSD: pf.conf.5,v 1.300 2004/09/10 12:40:49 jaredy Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
@@ -2704,7 +2704,7 @@
 Protocol name database.
 .It Pa /etc/services
 Service name database.
-.It Pa /usr/share/pf
+.It Pa /usr/share/examples/pf
 Example rulesets.
 .El
 .Sh SEE ALSO
diff -r 998d7aad339b -r 1028955793a5 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Tue Mar 15 15:57:58 2005 +0000
+++ b/distrib/sets/lists/base/mi        Tue Mar 15 16:05:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.531 2005/03/09 05:24:38 atatat Exp $
+# $NetBSD: mi,v 1.532 2005/03/15 16:05:03 peter Exp $
 .                                              base-sys-root
 ./altroot                                      base-sys-root
 ./bin                                          base-sys-root
@@ -1296,6 +1296,7 @@
 ./usr/share/examples/mount_portal              base-miscfs-examples
 ./usr/share/examples/named                     base-obsolete   obsolete
 ./usr/share/examples/openssl                   base-crypto-examples
+./usr/share/examples/pf                                base-netutil-examples   pf
 ./usr/share/examples/postfix                   base-postfix-examples
 ./usr/share/examples/racoon                    base-netutil-examples
 ./usr/share/examples/racoon/roadwarrior                base-netutil-examples
diff -r 998d7aad339b -r 1028955793a5 distrib/sets/lists/misc/mi
--- a/distrib/sets/lists/misc/mi        Tue Mar 15 15:57:58 2005 +0000
+++ b/distrib/sets/lists/misc/mi        Tue Mar 15 16:05:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.110 2005/03/15 02:34:54 atatat Exp $
+# $NetBSD: mi,v 1.111 2005/03/15 16:05:04 peter Exp $
 ./etc/mtree/set.misc                           misc-sys-root
 ./usr/share/dict/README                                misc-reference-share    share
 ./usr/share/dict/eign                          misc-reference-share    share
@@ -534,6 +534,15 @@
 ./usr/share/examples/openssl/CA.sh             misc-crypto-examples    crypto,share
 ./usr/share/examples/openssl/der_chop          misc-crypto-examples    crypto,share
 ./usr/share/examples/openssl/openssl.cnf       misc-crypto-examples    crypto,share
+./usr/share/examples/pf/ackpri                 misc-netutil-examples   pf,share
+./usr/share/examples/pf/faq-example1           misc-netutil-examples   pf,share
+./usr/share/examples/pf/faq-example2           misc-netutil-examples   pf,share
+./usr/share/examples/pf/faq-example3           misc-netutil-examples   pf,share
+./usr/share/examples/pf/queue1                 misc-netutil-examples   pf,share
+./usr/share/examples/pf/queue2                 misc-netutil-examples   pf,share
+./usr/share/examples/pf/queue3                 misc-netutil-examples   pf,share
+./usr/share/examples/pf/queue4                 misc-netutil-examples   pf,share
+./usr/share/examples/pf/spamd                  misc-netutil-examples   pf,share
 ./usr/share/examples/postfix/ADDRESS_CLASS_README      misc-postfix-examples   postfix,doc
 ./usr/share/examples/postfix/ADDRESS_REWRITING_README  misc-postfix-examples   postfix,doc
 ./usr/share/examples/postfix/ADDRESS_VERIFICATION_README       misc-postfix-examples   postfix,doc
diff -r 998d7aad339b -r 1028955793a5 etc/mtree/NetBSD.dist
--- a/etc/mtree/NetBSD.dist     Tue Mar 15 15:57:58 2005 +0000
+++ b/etc/mtree/NetBSD.dist     Tue Mar 15 16:05:03 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist,v 1.275 2005/02/19 16:55:04 thorpej Exp $
+#      $NetBSD: NetBSD.dist,v 1.276 2005/03/15 16:05:04 peter Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -416,6 +416,7 @@
 ./usr/share/examples/kerberos
 ./usr/share/examples/mount_portal
 ./usr/share/examples/openssl
+./usr/share/examples/pf
 ./usr/share/examples/postfix
 ./usr/share/examples/racoon
 ./usr/share/examples/racoon/roadwarrior
diff -r 998d7aad339b -r 1028955793a5 usr.sbin/pf/Makefile
--- a/usr.sbin/pf/Makefile      Tue Mar 15 15:57:58 2005 +0000
+++ b/usr.sbin/pf/Makefile      Tue Mar 15 16:05:03 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/11/14 20:27:13 yamt Exp $
+#      $NetBSD: Makefile,v 1.4 2005/03/15 16:05:04 peter Exp $
 
 .include <bsd.own.mk>
 
@@ -13,6 +13,10 @@
 
 SUBDIR+=       man
 
+.if (${MKSHARE} != "no")
+SUBDIR+=       examples
+.endif
+
 configinstall:
        ${MAKEDIRTARGET} etc configinstall
 
diff -r 998d7aad339b -r 1028955793a5 usr.sbin/pf/examples/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/pf/examples/Makefile     Tue Mar 15 16:05:03 2005 +0000
@@ -0,0 +1,11 @@
+#      $NetBSD: Makefile,v 1.1 2005/03/15 16:05:04 peter Exp $
+
+.include <bsd.own.mk>
+
+FILESDIR=      /usr/share/examples/pf
+FILES=         ackpri faq-example1 faq-example2 faq-example3
+FILES+=                queue1 queue2 queue3 queue4 spamd
+
+.PATH: ${NETBSDSRCDIR}/dist/pf/share/pf
+
+.include <bsd.prog.mk>



Home | Main Index | Thread Index | Old Index