diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-09-24 18:35:27 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-09-24 18:35:27 +0000 |
| commit | d3649e3087f92741b381e827c0e75186a34463b8 (patch) | |
| tree | 2278ccf62f275379d5a99420de3437b7807d8a0e /ports-mgmt | |
| parent | 60ee221669b31cda488dc5e95f6fb07ca705e0d7 (diff) | |
| download | ports-d3649e3087f92741b381e827c0e75186a34463b8.tar.gz ports-d3649e3087f92741b381e827c0e75186a34463b8.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-libpkg__pkg_config.c | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index ea56eb1c73ee..ddf9daa7b763 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.3.8 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c b/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c new file mode 100644 index 000000000000..d48a76bfad3d --- /dev/null +++ b/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c @@ -0,0 +1,28 @@ +commit 67751707406b7da5ff85978f755d4e68bab3d38d +Author: Bryan Drewery <bryan@shatow.net> +Date: Wed Sep 24 13:30:29 2014 -0500 + + Fix repo override crashing when URL is not defined. + + Only override URL if one is provided. + + Issue: #1024 + +diff --git libpkg/pkg_config.c libpkg/pkg_config.c +index ec96883..83e2f5d 100644 +--- libpkg/pkg_config.c ++++ libpkg/pkg_config.c +@@ -1065,9 +1065,11 @@ pkg_repo_overwrite(struct pkg_repo *r, const char *name, const char *url, + { + + free(r->name); +- free(r->url); + r->name = strdup(name); +- r->url = strdup(url); ++ if (url != NULL) { ++ free(r->url); ++ r->url = strdup(url); ++ } + r->ops = pkg_repo_find_type(type); + HASH_DEL(repos, r); + HASH_ADD_KEYPTR(hh, repos, r->name, strlen(r->name), r); |