diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-10-29 12:25:22 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-10-29 12:25:22 +0000 |
| commit | b8f1640fa056402fce0911df2228e42d9b90a2f5 (patch) | |
| tree | 855b051f472455c61311fdc61a5b07a4b9159623 /usr.sbin | |
| parent | 7fcf8773f447dccc87ae37d4b3792e7343167707 (diff) | |
| download | FreeBSD-src-b8f1640fa056402fce0911df2228e42d9b90a2f5.zip FreeBSD-src-b8f1640fa056402fce0911df2228e42d9b90a2f5.tar.gz | |
MFC r257051:
Add support for using "pkg+http://" for the PACKAGESITE.
pkg 1.2 is adding this support as well. This should help
lessen the confusion on why the default SRV PACKAGESITE
does not load in a browser.
Approved by: bapt
Approved by: re (glebius)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg/config.c | 2 | ||||
| -rw-r--r-- | usr.sbin/pkg/config.h | 1 | ||||
| -rw-r--r-- | usr.sbin/pkg/pkg.c | 7 |
3 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index 429aad6..6a6b27d 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -62,7 +62,7 @@ static struct config_entry c[] = { [PACKAGESITE] = { PKG_CONFIG_STRING, "PACKAGESITE", - "http://pkg.FreeBSD.org/${ABI}/latest", + URL_SCHEME_PREFIX "http://pkg.FreeBSD.org/${ABI}/latest", NULL, false, }, diff --git a/usr.sbin/pkg/config.h b/usr.sbin/pkg/config.h index e592f6d..c3d877e 100644 --- a/usr.sbin/pkg/config.h +++ b/usr.sbin/pkg/config.h @@ -30,6 +30,7 @@ #define _PKG_CONFIG_H #define _LOCALBASE "/usr/local" +#define URL_SCHEME_PREFIX "pkg+" typedef enum { PACKAGESITE = 0, diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 34ab26f..0064e26 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -168,6 +168,13 @@ bootstrap_pkg(void) warnx("No MIRROR_TYPE defined"); return (-1); } + + /* Support pkg+http:// for PACKAGESITE which is the new format + in 1.2 to avoid confusion on why http://pkg.FreeBSD.org has + no A record. */ + if (strncmp(URL_SCHEME_PREFIX, packagesite, + strlen(URL_SCHEME_PREFIX)) == 0) + packagesite += strlen(URL_SCHEME_PREFIX); snprintf(url, MAXPATHLEN, "%s/Latest/pkg.txz", packagesite); snprintf(tmppkg, MAXPATHLEN, "%s/pkg.txz.XXXXXX", |
