415be47 Revert some changes from 3bf0093db8b6752e5efa7c84ce01ee8b73c0077d — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Revert some changes from 3bf0093db8b6752e5efa7c84ce01ee8b73c0077d

Alexandre Perrin committed 11 years ago

commit 415be47d3736824bde0f2f450ec13741e57a4e5d
parent 5373842

4 files changed +18 -11

modified docs/pkg-upgrade.8

@@ -48,7 +48,8 @@ is that

 .Nm
 tries to upgrade dependencies of packages matched as well while
 .Xr pkg-install 8
 is more conservative during dependencies upgrade. Moreover,
 is more conservative during dependencies upgrade.
 Moreover,
 .Nm
 cannot install new packages, so a caller should ensure that patterns specified
 as arguments have installed candidates for matching.

modified docs/pkg.8

@@ -83,8 +83,9 @@ will override any other command line arguments.

 .It Fl o Ao option=value Ac , Cm --option Ao option=value Ac
 Set configuration option for
 .Nm
 from the command line. Options that are set from the environment are
 redefined. It is permitted to specify this option multiple times.
 from the command line.
 Options that are set from the environment are redefined.
 It is permitted to specify this option multiple times.
 .It Fl N
 Activation status check mode.
 Prevent

modified docs/pkg.conf.5

@@ -158,11 +158,13 @@ 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.

@@ -281,7 +283,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.

modified docs/pkg_repos.3

@@ -77,7 +77,8 @@ If the repository is not signed by a public key, NULL will be returned.

 .Pp
 .Fn pkg_repo_fingerprints
 takes a pointer to a repository as argument and returns the path to
 the fingerprints. If the repository is not signed using the
 the fingerprints.
 If the repository is not signed using the
 .Qq FINGERPRINT
 method, NULL will be returned.
 .Pp

@@ -115,10 +116,11 @@ The repository does not have any mirror.

 .Pp
 .Fn pkg_repo_find_ident
 Take an internal indentification string as argument and return a pointer to
 a repository. If no repository matches, NULL is returned.
 a repository.
 If no repository matches, NULL is returned.
 .Pp
 .Fn pkg_repo_find_name
 Take a repository
 .Qq name
 as argument and return a pointer to a repository. If no repository matches,
 NULL is returned.
 as argument and return a pointer to a repository.
 If no repository matches, NULL is returned.