Index: head/ports-mgmt/pkg-devel/Makefile
===================================================================
--- head/ports-mgmt/pkg-devel/Makefile	(revision 524544)
+++ head/ports-mgmt/pkg-devel/Makefile	(revision 524545)
@@ -1,60 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
 DISTVERSION=	1.12.99.4
 _PKG_VERSION=	${DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkg@FreeBSD.org
 COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_TAGNAME=	72fa511f
 
 WITH_DEBUG=	yes
 CFLAGS+=	-O0 -g -Wno-error
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 PORTDOCS=	NEWS
 PORTSCOUT=	ignore:1
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man --prefix="${PREFIX}"
 CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER
 # so that pkg-static is used from the wrkdir
 USE_SUBMAKE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .if !exists(/usr/include/jail.h)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PKG)
 .if ${WITH_PKG} != devel
 .	if !defined(PACKAGE_BUILDING)
 IGNORE=	WITH_PKG is not defined to 'devel', this version is the devel one
 .	endif
 .else
 PKGNAMESUFFIX=
 #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
 PKG_DEPENDS=
 .endif
 .endif
 
 .undef INSTALLS_DEPENDS
 .if !exists(${LOCALBASE}/sbin/pkg) || !defined(CROSS_TOOLCHAIN)
 PKG_BIN=	${WRKSRC}/src/pkg-static
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
 
 .include <bsd.port.post.mk>
Index: head/ports-mgmt/pkg-devel/files/patch-libfetch
===================================================================
--- head/ports-mgmt/pkg-devel/files/patch-libfetch	(nonexistent)
+++ head/ports-mgmt/pkg-devel/files/patch-libfetch	(revision 524545)
@@ -0,0 +1,31 @@
+diff --git a/external/libfetch/fetch.c b/external/libfetch/fetch.c
+index 47c03a79..df5d5547 100644
+--- external/libfetch/fetch.c
++++ external/libfetch/fetch.c
+@@ -332,6 +332,8 @@ fetch_pctdecode(char *dst, const char *src, size_t dlen)
+ 		}
+ 		if (dlen-- > 0)
+ 			*dst++ = c;
++		else
++			return (NULL);
+ 	}
+ 	return (s);
+ }
+@@ -381,11 +383,15 @@ fetchParseURL(const char *URL)
+ 	if (p && *p == '@') {
+ 		/* username */
+ 		q = fetch_pctdecode(u->user, URL, URL_USERLEN);
++		if (q == NULL)
++			goto ouch;
+ 
+ 		/* password */
+-		if (*q == ':')
++		if (*q == ':') {
+ 			q = fetch_pctdecode(u->pwd, q + 1, URL_PWDLEN);
+-
++			if (q == NULL)
++				goto ouch;
++		}
+ 		p++;
+ 	} else {
+ 		p = URL;

Property changes on: head/ports-mgmt/pkg-devel/files/patch-libfetch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property