Module Name: src
Committed By: wiz
Date: Wed Dec 2 14:18:13 UTC 2020
Modified Files:
src/etc: security
src/share/man/man5: daily.5 security.conf.5
Log Message:
Update default pkgsrc database location from /var/db/pkg to /usr/pkg/pkgdb.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/etc/security
cvs rdiff -u -r1.6 -r1.7 src/share/man/man5/daily.5
cvs rdiff -u -r1.41 -r1.42 src/share/man/man5/security.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/security
diff -u src/etc/security:1.126 src/etc/security:1.127
--- src/etc/security:1.126 Fri Dec 6 14:43:30 2019
+++ src/etc/security Wed Dec 2 14:18:13 2020
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: security,v 1.126 2019/12/06 14:43:30 riastradh Exp $
+# $NetBSD: security,v 1.127 2020/12/02 14:18:13 wiz Exp $
# from: @(#)security 8.1 (Berkeley) 6/9/93
#
@@ -991,7 +991,7 @@ if checkyesno check_pkgs && have_pkgs; t
pkgs=$work_dir/pkgs
migrate_file "$backup_dir/pkgs" "$pkgs"
pkg_dbdir=$(${pkg_admin} config-var PKG_DBDIR)
- : ${pkg_dbdir:=/var/db/pkg}
+ : ${pkg_dbdir:=/usr/pkg/pkgdb}
( cd $pkg_dbdir
$pkg_info | sort
echo ""
Index: src/share/man/man5/daily.5
diff -u src/share/man/man5/daily.5:1.6 src/share/man/man5/daily.5:1.7
--- src/share/man/man5/daily.5:1.6 Mon Jul 30 17:29:00 2012
+++ src/share/man/man5/daily.5 Wed Dec 2 14:18:13 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: daily.5,v 1.6 2012/07/30 17:29:00 wiz Exp $
+.\" $NetBSD: daily.5,v 1.7 2020/12/02 14:18:13 wiz Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd July 30, 2012
+.Dd December 2, 2020
.Dt DAILY 5
.Os
.Sh NAME
@@ -199,7 +199,7 @@ instead.
.Pp
If defined, points to the location of the packages database.
Defaults to
-.Pa /var/db/pkg .
+.Pa /usr/pkg/pkgdb .
.El
.Sh FILES
.Bl -tag -width /etc/defaults/daily.conf -compact
Index: src/share/man/man5/security.conf.5
diff -u src/share/man/man5/security.conf.5:1.41 src/share/man/man5/security.conf.5:1.42
--- src/share/man/man5/security.conf.5:1.41 Fri Dec 6 14:43:30 2019
+++ src/share/man/man5/security.conf.5 Wed Dec 2 14:18:13 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: security.conf.5,v 1.41 2019/12/06 14:43:30 riastradh Exp $
+.\" $NetBSD: security.conf.5,v 1.42 2020/12/02 14:18:13 wiz Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd April 5, 2012
+.Dd December 2, 2020
.Dt SECURITY.CONF 5
.Os
.Sh NAME
@@ -271,7 +271,7 @@ instead.
.Pp
If defined, points to the location of the packages database.
Defaults to
-.Pa /var/db/pkg .
+.Pa /usr/pkg/pkgdb .
.It Sy backup_uses_rcs
Use
.Xr rcs 1
