pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files Make sure that SYSCONFDIR i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9eb735491b9b
branches: trunk
changeset: 554759:9eb735491b9b
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Feb 19 20:27:36 2009 +0000
description:
Make sure that SYSCONFDIR is expanded in pkg_install.conf(5).
diffstat:
pkgtools/pkg_install/files/configure | 8 +-
pkgtools/pkg_install/files/configure.ac | 5 +-
pkgtools/pkg_install/files/lib/pkg_install.conf.5 | 158 ----------------
pkgtools/pkg_install/files/lib/pkg_install.conf.5.in | 158 ++++++++++++++++
pkgtools/pkg_install/files/lib/pkg_install.conf.cat5 | 117 -----------
pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in | 117 +++++++++++
6 files changed, 286 insertions(+), 277 deletions(-)
diffs (truncated from 613 to 300 lines):
diff -r f7108ff85ec0 -r 9eb735491b9b pkgtools/pkg_install/files/configure
--- a/pkgtools/pkg_install/files/configure Thu Feb 19 19:38:19 2009 +0000
+++ b/pkgtools/pkg_install/files/configure Thu Feb 19 20:27:36 2009 +0000
@@ -639,6 +639,7 @@
ac_subst_vars='LTLIBOBJS
LIBOBJS
+SYSCONFDIR
EGREP
CPP
bootstrap
@@ -6847,7 +6848,10 @@
-ac_config_files="$ac_config_files Makefile add/Makefile admin/Makefile bpm/bpm.sh create/Makefile delete/Makefile info/Makefile lib/Makefile"
+SYSCONFDIR="$sysconfdir"
+
+
+ac_config_files="$ac_config_files Makefile add/Makefile admin/Makefile bpm/bpm.sh create/Makefile delete/Makefile info/Makefile lib/Makefile lib/pkg_install.conf.5 lib/pkg_install.conf.cat5"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -7452,6 +7456,8 @@
"delete/Makefile") CONFIG_FILES="$CONFIG_FILES delete/Makefile" ;;
"info/Makefile") CONFIG_FILES="$CONFIG_FILES info/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+ "lib/pkg_install.conf.5") CONFIG_FILES="$CONFIG_FILES lib/pkg_install.conf.5" ;;
+ "lib/pkg_install.conf.cat5") CONFIG_FILES="$CONFIG_FILES lib/pkg_install.conf.cat5" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff -r f7108ff85ec0 -r 9eb735491b9b pkgtools/pkg_install/files/configure.ac
--- a/pkgtools/pkg_install/files/configure.ac Thu Feb 19 19:38:19 2009 +0000
+++ b/pkgtools/pkg_install/files/configure.ac Thu Feb 19 20:27:36 2009 +0000
@@ -145,7 +145,10 @@
#endif
)
+SYSCONFDIR="$sysconfdir"
+AC_SUBST(SYSCONFDIR)
+
AC_CONFIG_FILES([Makefile add/Makefile admin/Makefile bpm/bpm.sh \
create/Makefile delete/Makefile info/Makefile \
- lib/Makefile])
+ lib/Makefile lib/pkg_install.conf.5 lib/pkg_install.conf.cat5])
AC_OUTPUT
diff -r f7108ff85ec0 -r 9eb735491b9b pkgtools/pkg_install/files/lib/pkg_install.conf.5
--- a/pkgtools/pkg_install/files/lib/pkg_install.conf.5 Thu Feb 19 19:38:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-.\" $NetBSD: pkg_install.conf.5,v 1.3 2009/02/08 23:12:10 wiz Exp $
-.\"
-.\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Thomas Klausner.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 8, 2009
-.Dt PKG_INSTALL.CONF 5
-.Os
-.Sh NAME
-.Nm pkg_install.conf
-.Nd configuration file for package installation tools
-.Sh DESCRIPTION
-The file
-.Nm
-contains system defaults for the package installation tools
-as a list of variable-value pairs.
-Each line has the format
-.Ev VARIABLE=VALUE .
-If the value consists of more than one line, each line is prefixed with
-.Ev VARIABLE= .
-.Pp
-The current value of a variable can be checked by running
-.Dl Ic pkg_admin config-var VARIABLE
-.Pp
-The following variables are supported:
-.Bl -tag -width indent
-.It Dv ACTIVE_FTP
-Force the use of active FTP.
-.It Dv CERTIFICATE_ANCHOR_PKGS
-Path to the file containing the certificates used for validating
-binary packages.
-A package is trusted when a certificate chain ends in one of the
-certificates contained in this file.
-The certificates must be PEM-encoded.
-.It Dv CERTIFICATE_ANCHOR_PKGVULN
-Analogous to
-.Dv CERTIFICATE_ANCHOR_PKGS .
-The
-.Pa pkg-vulnerabilities
-is trusted when a certificate chain ends in one of the certificates
-contained in this file.
-.It Dv CERTIFICATE_CHAIN
-Path to a file containing additional certificates that can be used
-for completing certificate chains when validating binary packages or
-pkg-vulnerabilities files.
-.Dv CHECK_VULNERABILITIES
-Check for vulnerabilities when installing packages.
-Supported values are:
-.Bl -tag -width interactiveXX
-.It Dv never
-No check is performed.
-.It Dv always
-Passing the vulnerability check is required.
-A missing pkg-vulnerabilities file is considered an error.
-.It Dv interactive
-The user is always asked to confirm installation of vulnerable packages.
-.El
-.It Dv GPG
-Path to
-.Xr gpg 1 ,
-which can be used to verify the signature in the
-.Pa pkg-vulnerabilities
-file when running
-.Dl Ic pkg_admin check-pkg-vulnerabilities -s
-or
-.Dl Ic pkg_admin fetch-pkg-vulnerabilities -s
-It can also be used to verify and sign binary packages.
-.It Dv GPG_KEYRING_PKGVULN
-Non-default keyring to use for verifying GPG signatures of
-.Pa pkg-vulnerabilities .
-.It Dv GPG_KEYRING_SIGN
-Non-default keyring to use for signing packages with GPG.
-.It Dv GPG_KEYRING_VERIFY
-Non-default keyring to use for verifying GPG signature of packages.
-.It Dv GPG_SIGN_AS
-User-id to use for signing packages.
-.It Dv IGNORE_PROXY
-Use direct connections and ignore
-.Ev FTP_PROXY
-and
-.Ev HTTP_PROXY .
-.It Dv IGNORE_URL
-One line per advisory which should be ignored when running
-.Dl Ic pkg_admin audit
-The URL from the
-.Pa pkg-vulnerabilities
-file should be used as value.
-.It Dv PKGVULNDIR
-Directory name in which the
-.Pa pkg-vulnerabilities
-file resides.
-Default is
-.Pa ${PKG_DBDIR} .
-.It Dv PKGVULNURL
-URL which is used for updating the local
-.Pa pkg-vulnerabilities
-file when running
-.Dl Ic pkg_admin fetch-pkg-vulnerabilities
-The default is
-.Pa ftp://ftp.NetBSD.org/pub/NetBSD/packages/vulns/pkg-vulnerabilities.gz
-.Em Note :
-Usually, only the compression type should be changed.
-Currently supported are uncompressed files and files compressed by
-.Xr bzip2 1
-.Pq Pa .bz2
-or
-.Xr gzip 1
-.Pq Pa .gz .
-.It Dv VERBOSE_NETIO
-Log details of network IO to stderr.
-.It Dv VERIFIED_INSTALLATION
-Set trust level used when installation.
-Supported values are:
-.Bl -tag -width interactiveXX
-.It Dv never
-No signature checks are performed.
-.It Dv always
-A valid signature is required.
-If the binary package can not be verified, the installation is terminated
-.It Dv trusted
-A valid signature is required.
-If the binary package can not be verified, the user is asked interactively.
-.It Dv interactive
-The user is always asked interactively when installing a package.
-.El
-.El
-.Sh FILES
-.Bl -tag
-.It Pa @SYSCONFDIR@/pkg_install.conf
-Default location for the file described in this manual page.
-.El
-.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_admin 1
diff -r f7108ff85ec0 -r 9eb735491b9b pkgtools/pkg_install/files/lib/pkg_install.conf.5.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in Thu Feb 19 20:27:36 2009 +0000
@@ -0,0 +1,158 @@
+.\" $NetBSD: pkg_install.conf.5.in,v 1.1 2009/02/19 20:27:36 joerg Exp $
+.\"
+.\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Thomas Klausner.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd January 8, 2009
+.Dt PKG_INSTALL.CONF 5
+.Os
+.Sh NAME
+.Nm pkg_install.conf
+.Nd configuration file for package installation tools
+.Sh DESCRIPTION
+The file
+.Nm
+contains system defaults for the package installation tools
+as a list of variable-value pairs.
+Each line has the format
+.Ev VARIABLE=VALUE .
+If the value consists of more than one line, each line is prefixed with
+.Ev VARIABLE= .
+.Pp
+The current value of a variable can be checked by running
+.Dl Ic pkg_admin config-var VARIABLE
+.Pp
+The following variables are supported:
+.Bl -tag -width indent
+.It Dv ACTIVE_FTP
+Force the use of active FTP.
+.It Dv CERTIFICATE_ANCHOR_PKGS
+Path to the file containing the certificates used for validating
+binary packages.
+A package is trusted when a certificate chain ends in one of the
+certificates contained in this file.
+The certificates must be PEM-encoded.
+.It Dv CERTIFICATE_ANCHOR_PKGVULN
+Analogous to
+.Dv CERTIFICATE_ANCHOR_PKGS .
+The
+.Pa pkg-vulnerabilities
+is trusted when a certificate chain ends in one of the certificates
+contained in this file.
+.It Dv CERTIFICATE_CHAIN
+Path to a file containing additional certificates that can be used
+for completing certificate chains when validating binary packages or
+pkg-vulnerabilities files.
+.Dv CHECK_VULNERABILITIES
+Check for vulnerabilities when installing packages.
+Supported values are:
+.Bl -tag -width interactiveXX
+.It Dv never
+No check is performed.
+.It Dv always
+Passing the vulnerability check is required.
+A missing pkg-vulnerabilities file is considered an error.
+.It Dv interactive
+The user is always asked to confirm installation of vulnerable packages.
+.El
+.It Dv GPG
+Path to
+.Xr gpg 1 ,
+which can be used to verify the signature in the
+.Pa pkg-vulnerabilities
+file when running
Home |
Main Index |
Thread Index |
Old Index