Date: Wed, 9 May 2018 16:00:37 +0000 (UTC) From: Brad Davis <brd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469451 - in head/ports-mgmt/pkg: . files Message-ID: <201805091600.w49G0bjJ028258@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brd Date: Wed May 9 16:00:37 2018 New Revision: 469451 URL: https://svnweb.freebsd.org/changeset/ports/469451 Log: Apply patch for a segfault on upgrade https://github.com/freebsd/pkg/issues/1663 Approved by: bapt Added: head/ports-mgmt/pkg/files/patch-1663 (contents, props changed) Modified: head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Wed May 9 15:28:49 2018 (r469450) +++ head/ports-mgmt/pkg/Makefile Wed May 9 16:00:37 2018 (r469451) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.10.5 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ Added: head/ports-mgmt/pkg/files/patch-1663 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-1663 Wed May 9 16:00:37 2018 (r469451) @@ -0,0 +1,28 @@ +diff --git a/libpkg/pkg_jobs_conflicts.c b/libpkg/pkg_jobs_conflicts.c +index 886e100c..141c69f9 100644 +--- libpkg/pkg_jobs_conflicts.c.orig ++++ libpkg/pkg_jobs_conflicts.c +@@ -477,7 +477,8 @@ pkg_conflicts_check_chain_conflict(struct pkg_job_universe_item *it, + it->pkg->uid); + + if (p != NULL) { +- pkg_jobs_universe_process_item(j->universe, p, &cun); ++ if (pkg_jobs_universe_process_item(j->universe, p, &cun)) ++ continue; + assert(cun != NULL); + pkg_conflicts_register_chain(j, it, cun, fcur->path); + } +diff --git a/libpkg/pkg_jobs_universe.c b/libpkg/pkg_jobs_universe.c +index 1a5a2c72..725825ac 100644 +--- libpkg/pkg_jobs_universe.c.orig ++++ libpkg/pkg_jobs_universe.c +@@ -570,6 +570,9 @@ pkg_jobs_universe_process_item(struct pkg_jobs_universe *universe, struct pkg *p + * flag that means that we have already tried to check our universe + */ + rc = pkg_jobs_universe_add_pkg(universe, pkg, false, &found); ++ if (rc == EPKG_CONFLICT) ++ return (rc); ++ + if (result) + *result = found; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805091600.w49G0bjJ028258>