diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-26 13:14:20 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-26 13:14:20 +0000 |
| commit | 1ab7d6e7123e457eb8eefb6c4f626bbf9ce4af7a (patch) | |
| tree | 090b7375c35dd6b3553d3b0fa8b485727dfea4a1 /ports-mgmt | |
| parent | devel/py-colorlog: update to 2.4.0 (diff) | |
Fix an important regresion preventing pkg2ng to work properly
Reported by: roberto
Tested by: roberto
Notes
Notes:
svn path=/head/; revision=369323
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 0051ea6fa195..216760646ccf 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -2,7 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.3.8 -PORTREVISION= 1 +PORTREVISION= 2 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c b/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c new file mode 100644 index 000000000000..9e13a9c28801 --- /dev/null +++ b/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c @@ -0,0 +1,14 @@ +diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c +index 744ad4a..4308196 100644 +--- libpkg/pkg_ports.c ++++ libpkg/pkg_ports.c +@@ -1056,7 +1056,8 @@ plist_new(struct pkg *pkg, const char *stage) + + p->pkg = pkg; + pkg_get(pkg, PKG_PREFIX, &prefix); +- strlcpy(p->prefix, prefix, sizeof(p->prefix)); ++ if (prefix != NULL) ++ strlcpy(p->prefix, prefix, sizeof(p->prefix)); + p->slash = p->prefix[strlen(p->prefix) - 1] == '/' ? "" : "/"; + p->stage = stage; + p->uname = strdup("root"); |