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

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

details:   https://anonhg.NetBSD.org/src/rev/c09b92053364
branches:  netbsd-3-0
changeset: 579449:c09b92053364
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Sep 17 20:07:15 2007 +0000

description:
Pull up following revision(s) (requested by adrianp in ticket #1841):
        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 fe9db99df600 -r c09b92053364 etc/defaults/security.conf
--- a/etc/defaults/security.conf        Sun Sep 09 21:37:22 2007 +0000
+++ b/etc/defaults/security.conf        Mon Sep 17 20:07:15 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: security.conf,v 1.14.2.1 2005/05/12 15:59:21 tron Exp $
+#      $NetBSD: security.conf,v 1.14.2.1.2.1 2007/09/17 20:07:15 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 fe9db99df600 -r c09b92053364 etc/security
--- a/etc/security      Sun Sep 09 21:37:22 2007 +0000
+++ b/etc/security      Mon Sep 17 20:07:15 2007 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: security,v 1.94.2.1.2.2 2007/06/28 18:14:39 ghen Exp $
+#      $NetBSD: security,v 1.94.2.1.2.3 2007/09/17 20:07:16 bouyer Exp $
 #      from: @(#)security      8.1 (Berkeley) 6/9/93
 #
 
@@ -28,6 +28,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
 #
@@ -833,7 +834,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, \./, ,'