diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2012-08-24 06:09:53 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2012-08-24 06:09:53 +0800 |
| commit | 1b2f9a78fbbda4441bb5629f915912aead5845f9 (patch) | |
| tree | 78f7eb50a7c8ca5fb2009b8098acda65e6dd6d0b /ports-mgmt | |
| parent | 705f6e2be770a0c46ef255b2bde6b6a4b5378e4c (diff) | |
| download | freebsd-ports-gnome-1b2f9a78fbbda4441bb5629f915912aead5845f9.tar.gz freebsd-ports-gnome-1b2f9a78fbbda4441bb5629f915912aead5845f9.tar.zst freebsd-ports-gnome-1b2f9a78fbbda4441bb5629f915912aead5845f9.zip | |
- Fix crash when no PACKAGESITE is defined in pkg.conf
Approved by: bapt (mentor, maintainer)
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 | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index e7ccc132413a..4e75fe566b0b 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -7,6 +7,7 @@ PORTNAME= pkg DISTVERSION= 1.0-rc6 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/portmgr \ http://files.etoilebsd.net/pkg/ 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..64b4b0938efb --- /dev/null +++ b/ports-mgmt/pkg/files/patch-libpkg_pkg_config.c @@ -0,0 +1,11 @@ +--- libpkg/pkg_config.c ++++ libpkg/pkg_config.c +@@ -268,7 +268,7 @@ subst_packagesite(void) + + oldval = c[PKG_CONFIG_REPO].val; + +- if ((variable_string = strstr(oldval, ABI_VAR_STRING)) == NULL) ++ if (oldval == NULL || (variable_string = strstr(oldval, ABI_VAR_STRING)) == NULL) + return; + + newval = sbuf_new_auto(); |