[src/netbsd-6]: src Pull up following revision(s) (requested by rmind in tick...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7dd0c6cb7f0
branches:  netbsd-6
changeset: 775546:d7dd0c6cb7f0
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Nov 29 00:09:44 2012 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #726):
        etc/rc.d/npf: revision 1.3
        distrib/sets/lists/base/mi: revision 1.1010
        usr.sbin/npf/npfctl/Makefile: revision 1.9
        distrib/sets/lists/comp/mi: revision 1.1785
put in /sbin
catch up with npfctl moving to /sbin.
untested, but i guess so was the move itself ;)
mv npfctl from /usr/sbin to /sbin so it is available before /usr is mounted.

diffstat:

 distrib/sets/lists/base/mi   |   5 +++--
 distrib/sets/lists/comp/mi   |   5 +++--
 etc/rc.d/npf                 |  12 ++++++------
 usr.sbin/npf/npfctl/Makefile |   3 ++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diffs (102 lines):

diff -r 49dc0836e818 -r d7dd0c6cb7f0 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Thu Nov 29 00:04:37 2012 +0000
+++ b/distrib/sets/lists/base/mi        Thu Nov 29 00:09:44 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984.2.12 2012/11/28 21:34:30 riz Exp $
+# $NetBSD: mi,v 1.984.2.13 2012/11/29 00:09:44 riz Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -315,6 +315,7 @@
 ./sbin/nfsd                                    base-obsolete           obsolete
 ./sbin/nfsiod                                  base-obsolete           obsolete
 ./sbin/nologin                                 base-sysutil-root
+./sbin/npfctl                                  base-npf-bin            npf
 ./sbin/pfctl                                   base-pf-root            pf
 ./sbin/pflogd                                  base-pf-root            pf
 ./sbin/pfs                                             base-pf-root            pf
@@ -1344,7 +1345,7 @@
 ./usr/sbin/netgroup_mkdb                       base-nis-bin
 ./usr/sbin/nfsd                                        base-nfsserver-bin
 ./usr/sbin/nfsiod                              base-obsolete           obsolete
-./usr/sbin/npfctl                              base-npf-bin            npf
+./usr/sbin/npfctl                              base-obsolete           obsolete
 ./usr/sbin/nsec3hash                           base-bind-bin
 ./usr/sbin/nslookup                            base-obsolete           obsolete
 ./usr/sbin/nsquery                             base-obsolete           obsolete
diff -r 49dc0836e818 -r d7dd0c6cb7f0 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Thu Nov 29 00:04:37 2012 +0000
+++ b/distrib/sets/lists/comp/mi        Thu Nov 29 00:09:44 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.1738.2.13 2012/11/28 21:34:43 riz Exp $
+#      $NetBSD: mi,v 1.1738.2.14 2012/11/29 00:09:46 riz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3472,6 +3472,7 @@
 ./usr/libdata/debug/sbin/newfs_sysvbfs.debug   comp-sysutil-debug      debug
 ./usr/libdata/debug/sbin/newfs_udf.debug       comp-sysutil-debug      debug
 ./usr/libdata/debug/sbin/newfs_v7fs.debug      comp-sysutil-debug      debug
+./usr/libdata/debug/sbin/npfctl.debug          comp-npf-debug          npf,debug
 ./usr/libdata/debug/sbin/pfctl.debug           comp-pf-debug           pf,debug
 ./usr/libdata/debug/sbin/pflogd.debug          comp-pf-debug           pf,debug
 ./usr/libdata/debug/sbin/pfs.debug             comp-pf-debug           pf,debug
@@ -4202,7 +4203,7 @@
 ./usr/libdata/debug/usr/sbin/ndp.debug         comp-netutil-debug      inet6,debug
 ./usr/libdata/debug/usr/sbin/netgroup_mkdb.debug       comp-nis-debug          debug
 ./usr/libdata/debug/usr/sbin/nfsd.debug                comp-nfsserver-debug    debug
-./usr/libdata/debug/usr/sbin/npfctl.debug      comp-npf-debug          npf,debug
+./usr/libdata/debug/usr/sbin/npfctl.debug      comp-obsolete           obsolete
 ./usr/libdata/debug/usr/sbin/nsec3hash.debug   comp-bind-debug         debug
 ./usr/libdata/debug/usr/sbin/ntp-keygen.debug  comp-ntp-debug          crypto,debug
 ./usr/libdata/debug/usr/sbin/ntpd.debug                comp-ntp-debug          debug
diff -r 49dc0836e818 -r d7dd0c6cb7f0 etc/rc.d/npf
--- a/etc/rc.d/npf      Thu Nov 29 00:04:37 2012 +0000
+++ b/etc/rc.d/npf      Thu Nov 29 00:09:44 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: npf,v 1.2 2011/03/07 23:21:13 jmcneill Exp $
+# $NetBSD: npf,v 1.2.6.1 2012/11/29 00:09:44 riz Exp $
 #
 # Public Domain.
 #
@@ -35,22 +35,22 @@
 {
        echo "Enabling NPF."
        npf_cfg_check
-       /usr/sbin/npfctl reload
-       /usr/sbin/npfctl start
+       /sbin/npfctl reload
+       /sbin/npfctl start
 }
 
 npf_stop()
 {
        echo "Disabling NPF."
-       /usr/sbin/npfctl stop
-       /usr/sbin/npfctl flush
+       /sbin/npfctl stop
+       /sbin/npfctl flush
 }
 
 npf_reload()
 {
        echo "Reloading NPF ruleset."
        npf_cfg_check
-       /usr/sbin/npfctl reload
+       /sbin/npfctl reload
 }
 
 npf_status()
diff -r 49dc0836e818 -r d7dd0c6cb7f0 usr.sbin/npf/npfctl/Makefile
--- a/usr.sbin/npf/npfctl/Makefile      Thu Nov 29 00:04:37 2012 +0000
+++ b/usr.sbin/npf/npfctl/Makefile      Thu Nov 29 00:09:44 2012 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.5.2.3 2012/11/18 22:38:28 riz Exp $
+# $NetBSD: Makefile,v 1.5.2.4 2012/11/29 00:09:46 riz Exp $
 
+BINDIR=/sbin
 PROG=          npfctl
 MAN=           npfctl.8 npf.conf.5