svn commit: r477662 - in head/ports-mgmt/pkg: . files

[Brad Davis]

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);
+ 	}