From owner-svn-ports-head@freebsd.org Mon Aug 20 16:53:06 2018 Return-Path: Delivered-To: svn-ports-head@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 A520910759B0; Mon, 20 Aug 2018 16:53:06 +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 5B68677207; Mon, 20 Aug 2018 16:53:06 +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 3C9E91805F; Mon, 20 Aug 2018 16:53:06 +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 w7KGr6U5097203; Mon, 20 Aug 2018 16:53:06 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7KGr5Sn097202; Mon, 20 Aug 2018 16:53:05 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201808201653.w7KGr5Sn097202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Mon, 20 Aug 2018 16:53:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477662 - 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: 477662 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2018 16:53:06 -0000 Author: brd Date: Mon Aug 20 16:53:05 2018 New Revision: 477662 URL: https://svnweb.freebsd.org/changeset/ports/477662 Log: Add a small patch to pkg to fix NULL check in pkg_is_config_file(). This helps pkgbase users with recent updates. Approved by: bapt Added: head/ports-mgmt/pkg/files/patch-1702 (contents, props changed) Modified: head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Mon Aug 20 16:49:50 2018 (r477661) +++ head/ports-mgmt/pkg/Makefile Mon Aug 20 16:53:05 2018 (r477662) @@ -2,7 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.10.5 -PORTREVISION= 1 +PORTREVISION= 2 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ Added: head/ports-mgmt/pkg/files/patch-1702 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-1702 Mon Aug 20 16:53:05 2018 (r477662) @@ -0,0 +1,13 @@ +diff --git a/libpkg/pkg.c b/libpkg/pkg.c +index 0c472b39..b4ee9ec3 100644 +--- libpkg/pkg.c ++++ libpkg/pkg.c +@@ -1668,7 +1668,7 @@ pkg_is_config_file(struct pkg *p, const char *path, + return (false); + + kh_find(pkg_config_files, p->config_files, path, *cfile); +- if (cfile == NULL) { ++ if (*cfile == NULL) { + *file = NULL; + return (false); + }