From owner-svn-ports-all@freebsd.org Wed May 9 16:00:38 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FDF8FC3B05; Wed, 9 May 2018 16:00:38 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 50A1286D84; Wed, 9 May 2018 16:00:38 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3233B139B2; Wed, 9 May 2018 16:00:38 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w49G0cLb028260; Wed, 9 May 2018 16:00:38 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w49G0bjJ028258; Wed, 9 May 2018 16:00:37 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201805091600.w49G0bjJ028258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Wed, 9 May 2018 16:00:37 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head/ports-mgmt/pkg: . files X-SVN-Commit-Revision: 469451 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 16:00:38 -0000 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; +