Index: head/ports-mgmt/pkg-devel/Makefile =================================================================== --- head/ports-mgmt/pkg-devel/Makefile (revision 525913) +++ head/ports-mgmt/pkg-devel/Makefile (revision 525914) @@ -1,61 +1,60 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.12.99.4 +DISTVERSION= 1.13.99.0 _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 +GH_TAGNAME= ec7dd7e0 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 .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 Index: head/ports-mgmt/pkg-devel/distinfo =================================================================== --- head/ports-mgmt/pkg-devel/distinfo (revision 525913) +++ head/ports-mgmt/pkg-devel/distinfo (revision 525914) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580298354 -SHA256 (freebsd-pkg-1.12.99.4-72fa511f_GH0.tar.gz) = 2ea854b878412e44da89aff71fb1617848826ebd09bcd529757c5300ddd47816 -SIZE (freebsd-pkg-1.12.99.4-72fa511f_GH0.tar.gz) = 3386496 +TIMESTAMP = 1581519100 +SHA256 (freebsd-pkg-1.13.99.0-ec7dd7e0_GH0.tar.gz) = 8cc835475644fb4d47bbec03159b5d31dbc6f75210c647ea88f3550d1ccca92e +SIZE (freebsd-pkg-1.13.99.0-ec7dd7e0_GH0.tar.gz) = 3387030 Index: head/ports-mgmt/pkg-devel/files/patch-libfetch =================================================================== --- head/ports-mgmt/pkg-devel/files/patch-libfetch (revision 525913) +++ head/ports-mgmt/pkg-devel/files/patch-libfetch (nonexistent) @@ -1,31 +0,0 @@ -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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property