From a8c0f0c72eed8651dcddd5e6654f7968d53f0e86 Mon Sep 17 00:00:00 2001 From: elad Date: Tue, 30 Jan 2007 19:40:07 +0000 Subject: [PATCH] Move paxctl from usr.bin/paxctl to usr.sbin/paxctl, and make it an admin tool (man-page moved from section 1 to section 8). --- distrib/sets/lists/base/mi | 5 +++-- distrib/sets/lists/comp/mi | 5 +++-- distrib/sets/lists/man/mi | 8 +++++--- usr.bin/Makefile | 4 ++-- usr.bin/paxctl/Makefile | 5 ----- usr.sbin/Makefile | 5 +++-- usr.sbin/paxctl/Makefile | 6 ++++++ usr.bin/paxctl/paxctl.1 => usr.sbin/paxctl/paxctl.8 | 4 ++-- {usr.bin => usr.sbin}/paxctl/paxctl.c | 4 ++-- 9 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 usr.bin/paxctl/Makefile create mode 100644 usr.sbin/paxctl/Makefile rename usr.bin/paxctl/paxctl.1 => usr.sbin/paxctl/paxctl.8 (97%) rename {usr.bin => usr.sbin}/paxctl/paxctl.c (97%) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index b0b8cd10d855..9e17a8ba4c16 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.684 2007/01/26 16:36:20 sborrill Exp $ +# $NetBSD: mi,v 1.685 2007/01/30 19:40:08 elad Exp $ . base-sys-root ./altroot base-sys-root ./bin base-sys-root @@ -574,7 +574,7 @@ ./usr/bin/patch base-util-bin ./usr/bin/pathchk base-util-bin ./usr/bin/pawd base-amd-bin -./usr/bin/paxctl base-util-bin +./usr/bin/paxctl base-obsolete obsolete ./usr/bin/pgrep base-util-bin ./usr/bin/pkill base-util-bin ./usr/bin/pmap base-util-bin @@ -1154,6 +1154,7 @@ ./usr/sbin/ntptrace base-ntp-bin ./usr/sbin/omshell base-dhcpd-bin ./usr/sbin/pac base-sysutil-bin +./usr/sbin/paxctl base-sysutil-bin ./usr/sbin/pcictl base-sysutil-bin ./usr/sbin/pfspamdb base-obsolete obsolete ./usr/sbin/pim6dd base-obsolete obsolete diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 3411047b2833..36a79e179624 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.994 2007/01/26 23:55:58 pooka Exp $ +# $NetBSD: mi,v 1.995 2007/01/30 19:40:09 elad Exp $ ./etc/mtree/set.comp comp-sys-root ./usr/bin/addr2line comp-debug-bin bfd ./usr/bin/ar comp-util-bin bfd @@ -2516,7 +2516,7 @@ ./usr/libdata/debug/usr/bin/patch.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/pathchk.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/pawd.debug comp-amd-debug debug -./usr/libdata/debug/usr/bin/paxctl.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/paxctl.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/pfbtops.debug comp-groff-debug debug ./usr/libdata/debug/usr/bin/pic.debug comp-groff-debug debug ./usr/libdata/debug/usr/bin/pkill.debug comp-util-debug debug @@ -2890,6 +2890,7 @@ ./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug debug ./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug ./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/sbin/paxctl.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/pcictl.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/pkg_add.debug comp-pkgutil-debug debug ./usr/libdata/debug/usr/sbin/pkg_admin.debug comp-pkgutil-debug debug diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 184dd8b8aa27..f543f92f47be 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.970 2007/01/26 16:36:22 sborrill Exp $ +# $NetBSD: mi,v 1.971 2007/01/30 19:40:09 elad Exp $ ./etc/mtree/set.man man-sys-root ./usr/share/info/am-utils.info man-amd-info info ./usr/share/info/as.info man-computil-info bfd,info @@ -327,7 +327,7 @@ ./usr/share/man/cat1/pathchk.0 man-util-catman .cat ./usr/share/man/cat1/pawd.0 man-amd-catman .cat ./usr/share/man/cat1/pax.0 man-util-catman .cat -./usr/share/man/cat1/paxctl.0 man-util-catman .cat +./usr/share/man/cat1/paxctl.0 man-obsolete obsolete ./usr/share/man/cat1/pgrep.0 man-util-catman .cat ./usr/share/man/cat1/pim6stat.0 man-obsolete obsolete ./usr/share/man/cat1/pkg_add.0 man-pkgutil-catman .cat @@ -2164,6 +2164,7 @@ ./usr/share/man/cat8/pam_skey.0 man-sysutil-catman skey,pam,.cat ./usr/share/man/cat8/pam_ssh.0 man-sysutil-catman crypto,pam,.cat ./usr/share/man/cat8/pam_unix.0 man-sysutil-catman pam,.cat +./usr/share/man/cat8/paxctl.0 man-sysutil-catman .cat ./usr/share/man/cat8/pc532/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/pc532/bim.0 man-sysutil-catman .cat ./usr/share/man/cat8/pc532/makedev.0 man-obsolete obsolete @@ -2739,7 +2740,7 @@ ./usr/share/man/man1/pathchk.1 man-util-man .man ./usr/share/man/man1/pawd.1 man-amd-man .man ./usr/share/man/man1/pax.1 man-util-man .man -./usr/share/man/man1/paxctl.1 man-util-man .man +./usr/share/man/man1/paxctl.1 man-obsolete obsolete ./usr/share/man/man1/pgrep.1 man-util-man .man ./usr/share/man/man1/pim6stat.1 man-obsolete obsolete ./usr/share/man/man1/pkg_add.1 man-pkgutil-man .man @@ -4576,6 +4577,7 @@ ./usr/share/man/man8/pam_skey.8 man-sysutil-man skey,.man,pam ./usr/share/man/man8/pam_ssh.8 man-sysutil-man crypto,.man,pam ./usr/share/man/man8/pam_unix.8 man-sysutil-man .man,pam +./usr/share/man/man8/paxctl.8 man-sysutil-man .man ./usr/share/man/man8/pc532/MAKEDEV.8 man-obsolete obsolete ./usr/share/man/man8/pc532/bim.8 man-sysutil-man .man ./usr/share/man/man8/pc532/makedev.8 man-obsolete obsolete diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 812b43b2c179..8e7ed4e23a44 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.155 2006/10/07 13:04:43 tron Exp $ +# $NetBSD: Makefile,v 1.156 2007/01/30 19:40:07 elad Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include @@ -17,7 +17,7 @@ SUBDIR= apply apropos asa at audio awk banner basename biff bthset btpin \ machine mail make man menuc mesg midiplay mixerctl mkcsmapper \ mkdep mkesdb mkfifo mklocale mkstr mktemp modstat moduli msgc msgs \ netgroup netstat newsyslog nfsstat nice nl nohup \ - pagesize passwd paste patch pathchk paxctl pkill pmap pmc pr \ + pagesize passwd paste patch pathchk pkill pmap pmc pr \ printenv printf progress pwhash qsubst quota radioctl rdist \ renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh rup \ ruptime rusers rwall rwho script sdpquery sed seq shar shlock \ diff --git a/usr.bin/paxctl/Makefile b/usr.bin/paxctl/Makefile deleted file mode 100644 index c7e4f32b0f87..000000000000 --- a/usr.bin/paxctl/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2006/05/16 00:08:25 elad Exp $ - -PROG= paxctl - -.include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 31ddb4249bb5..daa7d4fcb520 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.224 2007/01/26 07:01:03 mouse Exp $ +# $NetBSD: Makefile,v 1.225 2007/01/30 19:40:07 elad Exp $ # from: @(#)Makefile 5.20 (Berkeley) 6/12/93 .include @@ -13,7 +13,8 @@ SUBDIR= ac accton acpitools altq amd apm apmd arp bad144 bind bootp \ kgmon lastlogin link lmcconfig lockstat lpr mailwrapper makefs \ map-mbone mdconfig memswitch mlxctl mopd mountd moused \ mrinfo mrouted mscdlabel mtrace \ - mtree ndbootd ndiscvt netgroup_mkdb nfsd ntp ofctl pcictl pkg_install \ + mtree ndbootd ndiscvt netgroup_mkdb nfsd ntp ofctl paxctl pcictl \ + pkg_install \ pppd pstat pwd_mkdb postinstall powerd quot quotacheck quotaon \ rarpd rbootd rdate \ repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \ diff --git a/usr.sbin/paxctl/Makefile b/usr.sbin/paxctl/Makefile new file mode 100644 index 000000000000..d58561d191cb --- /dev/null +++ b/usr.sbin/paxctl/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/01/30 19:40:08 elad Exp $ + +PROG= paxctl +MAN= paxctl.8 + +.include diff --git a/usr.bin/paxctl/paxctl.1 b/usr.sbin/paxctl/paxctl.8 similarity index 97% rename from usr.bin/paxctl/paxctl.1 rename to usr.sbin/paxctl/paxctl.8 index 67b16be8836a..ae6f8f198598 100644 --- a/usr.bin/paxctl/paxctl.1 +++ b/usr.sbin/paxctl/paxctl.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: paxctl.1,v 1.4 2007/01/09 12:49:37 elad Exp $ +.\" $NetBSD: paxctl.8,v 1.1 2007/01/30 19:40:08 elad Exp $ .\" .\" Copyright 2006 Elad Efrat .\" All rights reserved. @@ -23,7 +23,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd November 22, 2006 -.Dt PAXCTL 1 +.Dt PAXCTL 8 .Os .Sh NAME .Nm paxctl diff --git a/usr.bin/paxctl/paxctl.c b/usr.sbin/paxctl/paxctl.c similarity index 97% rename from usr.bin/paxctl/paxctl.c rename to usr.sbin/paxctl/paxctl.c index 83f7aaa5de0a..73b0afa72d55 100644 --- a/usr.bin/paxctl/paxctl.c +++ b/usr.sbin/paxctl/paxctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: paxctl.c,v 1.11 2007/01/09 12:49:37 elad Exp $ */ +/* $NetBSD: paxctl.c,v 1.1 2007/01/30 19:40:08 elad Exp $ */ /*- * Copyright (c) 2006 Elad Efrat @@ -33,7 +33,7 @@ #include #ifndef lint #ifdef __RCSID -__RCSID("$NetBSD: paxctl.c,v 1.11 2007/01/09 12:49:37 elad Exp $"); +__RCSID("$NetBSD: paxctl.c,v 1.1 2007/01/30 19:40:08 elad Exp $"); #endif #endif /* not lint */