Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8e2dbcf
Followup 4bc7073308cb and remove references to PACKAGESITE/MIRROR_TYPE/PUBKEY
Bryan Drewery committed 11 years ago
commit 8e2dbcf40a1c9c4d01b732f6e1d37c8928a49f22
parent 2ba9202
6 files changed +8 -19
modified docs/pkg-install.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8

.\" $FreeBSD$

.\"
- 
.Dd May 26, 2014
+ 
.Dd August 14, 2014

.Dt PKG-INSTALL 8

.Os

.Sh NAME
@@ -192,7 +192,6 @@ for further description.
.It Ev ASSUME_ALWAYS_YES

.It Ev CASE_SENSITIVE_MATCH

.It Ev HANDLE_RC_SCRIPTS
- 
.It Ev PACKAGESITE

.It Ev PKG_CACHEDIR

.It Ev PKG_DBDIR

.It Ev REPO_AUTOUPDATE
modified docs/pkg-search.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8

.\" $FreeBSD$

.\"
- 
.Dd May 26, 2014
+ 
.Dd August 14, 2014

.Dt PKG-SEARCH 8

.Os

.Sh NAME
@@ -382,11 +382,7 @@ Display the installation prefix for the package, usually
Displays the repository name and the corresponding base Url for the

repository.

For a default repository defined in
- 
.Pa pkg.conf
- 
or one derived from the value of the
- 
.Ev PACKAGESITE
- 
environment variable the name will be
- 
.Dq packagesite .
+ 
.Pa pkg.conf .

.It Sy required-by

Displays all of the packages in the repository that require the named

package as a dependency.
modified docs/pkg-update.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8

.\" $FreeBSD$

.\"
- 
.Dd May 26, 2014
+ 
.Dd August 14, 2014

.Dt PKG-UPDATE 8

.Os

.Sh NAME
@@ -66,7 +66,7 @@ to false in
.Ss Signed repositories

If the repository catalogue is signed and

.Ev PUBKEY
- 
is defined, the signature will be verified after download.
+ 
is defined for the repository, the signature will be verified after download.

See

.Xr pkg.conf 5

for more information.
@@ -93,9 +93,7 @@ See
.Xr pkg.conf 5

for further description.

.Bl -tag -width ".Ev NO_DESCRIPTIONS"
- 
.It Ev PACKAGESITE

.It Ev PKG_DBDIR
- 
.It Ev PUBKEY

.It Ev REPO_AUTOUPDATE

.El

.Sh FILES
modified docs/pkg-upgrade.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8

.\" $FreeBSD$

.\"
- 
.Dd May 26, 2014
+ 
.Dd August 14, 2014

.Dt PKG-UPGRADE 8

.Os

.Sh NAME
@@ -183,7 +183,6 @@ for further description.
.Bl -tag -width ".Ev NO_DESCRIPTIONS"

.It Ev ASSUME_ALWAYS_YES

.It Ev HANDLE_RC_SCRIPTS
- 
.It Ev PACKAGESITE

.It Ev PKG_CACHEDIR

.It Ev PKG_DBDIR

.It Ev REPO_AUTOUPDATE
modified libpkg/repo/binary/fetch.c
@@ -181,12 +181,12 @@ pkg_repo_binary_try_fetch(struct pkg_repo *repo, struct pkg *pkg,
	/*

	 * In multi-repos the remote URL is stored in pkg[PKG_REPOURL]

	 * For a single attached database the repository URL should be
- 
	 * defined by PACKAGESITE.
+ 
	 * defined by URL.

	 */

	packagesite = pkg_repo_url(repo);



	if (packagesite == NULL || packagesite[0] == '\0') {
- 
		pkg_emit_error("PACKAGESITE is not defined");
+ 
		pkg_emit_error("URL is not defined");

		retcode = 1;

		goto cleanup;

	}
modified tests/frontend/pkg.sh
@@ -39,11 +39,9 @@ pkg_config_defaults_head()
pkg_config_defaults_body()

{

    atf_check                 \
- 
	-o match:'^ *PACKAGESITE: $' \

	-o match:'^ *PKG_DBDIR: /var/db/pkg$' \

	-o match:'^ *PKG_CACHEDIR: /var/cache/pkg$' \

	-o match:'^ *PORTSDIR: /usr/ports$' \
- 
	-o match:'^ *PUBKEY: $' \

	-o match:'^ *HANDLE_RC_SCRIPTS: no$' \

	-o match:'^ *ASSUME_ALWAYS_YES: no$' \

	-o match:'^ *PLIST_KEYWORDS_DIR: $' \
@@ -52,7 +50,6 @@ pkg_config_defaults_body()
	-o match:'^ *DEVELOPER_MODE: no$' \

	-o match:'^ *PORTAUDIT_SITE: http://portaudit.FreeBSD.org/auditfile.tbz$' \

	-o match:'^ *VULNXML_SITE: http://www.vuxml.org/freebsd/vuln.xml.bz2$' \
- 
	-o match:'^ *MIRROR_TYPE: SRV$' \

	-o match:'^ *FETCH_RETRY: 3$' \

	-o match:'^ *PKG_PLUGINS_DIR: /usr/local/lib/pkg/$' \

	-o match:'^ *PKG_ENABLE_PLUGINS: yes$' \