[src/netbsd-2-0]: src/etc Pull up following revision(s) (requested by adrianp...

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

details:   https://anonhg.NetBSD.org/src/rev/f88fdfc62fb2
branches:  netbsd-2-0
changeset: 565062:f88fdfc62fb2
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Sep 17 19:58:48 2007 +0000

description:
Pull up following revision(s) (requested by adrianp in ticket #11367):
        etc/defaults/security.conf: revision 1.20
        etc/security: revision 1.104
The location of the pkg_info binary can now be specified in
/etc/security.conf.
The default remains as /usr/sbin/pkg_info.  This should fix PR# 36746.

diffstat:

 etc/defaults/security.conf |  3 ++-
 etc/security               |  5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 9678ddccc045 -r f88fdfc62fb2 etc/defaults/security.conf
--- a/etc/defaults/security.conf        Wed Sep 12 20:56:53 2007 +0000
+++ b/etc/defaults/security.conf        Mon Sep 17 19:58:48 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: security.conf,v 1.12 2003/11/18 03:21:40 jhawk Exp $
+#      $NetBSD: security.conf,v 1.12.2.1 2007/09/17 19:58:48 bouyer Exp $
 #
 # /etc/defaults/security.conf --
 #      default configuration of /etc/security.conf
@@ -28,6 +28,7 @@
 backup_uses_rcs=YES
 diff_options=-u
 pkgdb_dir=/var/db/pkg
+pkg_info=/usr/sbin/pkg_info
 
 check_homes_permit_usergroups=NO
 
diff -r 9678ddccc045 -r f88fdfc62fb2 etc/security
--- a/etc/security      Wed Sep 12 20:56:53 2007 +0000
+++ b/etc/security      Mon Sep 17 19:58:48 2007 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: security,v 1.88.2.1 2007/05/27 21:26:12 bouyer Exp $
+#      $NetBSD: security,v 1.88.2.2 2007/09/17 19:58:48 bouyer Exp $
 #      from: @(#)security      8.1 (Berkeley) 6/9/93
 #
 
@@ -26,6 +26,7 @@
 pkgdb_dir=${pkgdb_dir:-/var/db/pkg}
 max_loginlen=${max_loginlen:-8}
 max_grouplen=${max_grouplen:-8}
+pkg_info=${pkg_info:-/usr/sbin/pkg_info}
 
 # Other configurable variables
 #
@@ -819,7 +820,7 @@
        pkgs=$work_dir/pkgs
        migrate_file "$backup_dir/pkgs" "$pkgs"
        (       cd $pkgdb_dir
-               pkg_info | sort
+               $pkg_info | sort
                echo ""
                find . \( -name +REQUIRED_BY -o -name +CONTENTS \) -print0 |
                        xargs -0 ls -ldgTq | sort -t. +1 | sed -e 's, \./, ,'