7932117 igor fixes — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

igor fixes

Mark Felder committed 11 years ago

commit 7932117e16a84ed1256008befa902aecc5a06056
parent 28e1767

1 file changed +12 -10

modified docs/pkg.conf.5

@@ -117,7 +117,7 @@ Default: 3.

 .It Cm FETCH_TIMEOUT: integer
 Maximum number of seconds to wait for any one file to download from the
 network, either by SSH or any of the protocols supported by
 .Xr fetch 3
 .Xr fetch 3
 functions.
 Default: 30.
 .It Cm HANDLE_RC_SCRIPTS: boolean

@@ -158,15 +158,16 @@ Hostname or IPv4 or IPv6 address of name server to use for DNS

 resolution, overriding the system defaults in
 .Pa /etc/resolv.conf .
 When given as a hostname, will be converted to a list of IPv4 or IPv6
 addresses by the default mechanisms configured on the system. See
 addresses by the default mechanisms configured on the system.
 See
 .Xr getaddrinfo 3 .
 .It Cm PERMISSIVE: boolean
 Ignore conflicts while registering a package. Note that the
 conflicting files will not be recorded as owned by the new package.
 Ignore conflicts while registering a package.
 Note that the conflicting files will not be recorded as owned by the new package.
 Default: NO.
 .It Cm PKG_CACHEDIR: string
 Specifies the cache directory for packages.
 Default:
 Default:
 .Pa /var/cache/pkg
 .It Cm PKG_DBDIR: string
 Specifies the directory to use for storing the package

@@ -205,7 +206,7 @@ Default: not set.

 .It Cm PLIST_ACCEPT_DIRECTORIES: boolean
 Accept directories listed like plain files in plist. Default: NO.
 .It Cm PLUGINS: array
 List of plugins that
 List of plugins that
 .Xr pkg 8
 should load.
 Default: not set.

@@ -254,7 +255,7 @@ Log all the installation/deinstallation/upgrade operation via

 .Xr syslog 3 .
 Default: YES.
 .It Cm UNSET_TIMESTAMP: boolean
 Do not include timestamps in the package
 Do not include timestamps in the package
 .Xr tar 1
 archive.
 Normally, timestamps are copied from the staging directory the

@@ -267,7 +268,8 @@ vulnerability database from.

 Default:
 .Pa http://www.vuxml.org/freebsd/vuln.xml.bz2 .
 .It Cm WORKERS_COUNT: integer
 How many workers are used for pkg-repo. If set to 0,
 How many workers are used for pkg-repo.
 If set to 0,
 .Va hw.ncpu
 is used.
 Default: 0.

@@ -422,12 +424,12 @@ same directory processed in alphabetical order.

 Earlier files take precedence, meaning that packages will be downloaded
 from them preferentially where the same package is available from several
 repositories.
 This behaviour may be overridden per-package by adding a
 This behaviour may be overridden per-package by adding a
 .Sy repository
 annotation to the installed package.
 See
 .Xr pkg-repository 8
 for details.
 for details.
 .Pp
 It is possible to specify more than one repository per file.
 .Sh ENVIRONMENT