Index: head/ports-mgmt/pkg/Makefile =================================================================== --- head/ports-mgmt/pkg/Makefile (revision 525793) +++ head/ports-mgmt/pkg/Makefile (revision 525794) @@ -1,89 +1,88 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.12.0 +DISTVERSION= 1.13.0 _PKG_VERSION= ${DISTVERSION} -PORTREVISION= 1 CATEGORIES= ports-mgmt #MASTER_SITES= \ # http://files.etoilebsd.net/${PORTNAME}/ \ # LOCAL/portmgr \ # http://mirror.shatow.net/freebsd/${PORTNAME}/ \ MAINTAINER= pkg@FreeBSD.org COMMENT= Package manager LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd 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_CMD # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes CFLAGS+= -Wno-error OPTIONS_DEFINE= DOCS .if !exists(/usr/include/jail.h) EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include .if defined(WITH_DEBUG) MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif .if defined(WITH_PKG) .if ${WITH_PKG} == devel IGNORE= WITH_PKG is defined to 'devel', this version is the stable one .endif .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l .if exists(${PKG_BIN}) NB_NEWPKGS!= ${PKG_INFO} -aq | wc -l .else NB_NEWPKGS= 0 .endif # Only show the pre-everything notice if they have not already # converted any packages .if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0 && !defined(UPGRADEPKG) pre-everything:: @${ECHO_CMD} "You are about to convert your system to pkg while you have ports/packages"; \ ${ECHO_CMD} "installed with the old pkg_install tools."; \ ${ECHO_CMD} ""; \ ${ECHO_CMD} "To switch to pkg:"; \ ${ECHO_CMD} " 1) Install ports-mgmt/pkg"; \ ${ECHO_CMD} " cd ports-mgmt/pkg && make UPGRADEPKG=1 install clean"; \ ${ECHO_CMD} " 2) Convert your package database by running pkg2ng"; \ ${ECHO_CMD} ""; \ exit 1 .endif .endif .endif #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .undef INSTALLS_DEPENDS # Use the internal pkg instead, generally, unless this is a cross-build, # in which case that won't work. Hope for the best then. .if !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS .include Index: head/ports-mgmt/pkg/distinfo =================================================================== --- head/ports-mgmt/pkg/distinfo (revision 525793) +++ head/ports-mgmt/pkg/distinfo (revision 525794) @@ -1,3 +1,3 @@ -TIMESTAMP = 1568790737 -SHA256 (freebsd-pkg-1.12.0_GH0.tar.gz) = 53141c4833a9776d916fb31eff346b8877e687d54edaec59b8472b71f62ec165 -SIZE (freebsd-pkg-1.12.0_GH0.tar.gz) = 3867210 +TIMESTAMP = 1581409421 +SHA256 (freebsd-pkg-1.13.0_GH0.tar.gz) = 9c4a8be80d16562d7acfb95906ab8a8f31620f4d03fa0e8e78fce5e5076bef1f +SIZE (freebsd-pkg-1.13.0_GH0.tar.gz) = 3386839 Index: head/ports-mgmt/pkg/files/patch-libfetch =================================================================== --- head/ports-mgmt/pkg/files/patch-libfetch (revision 525793) +++ head/ports-mgmt/pkg/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/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 Index: head/ports-mgmt/pkg/pkg-plist =================================================================== --- head/ports-mgmt/pkg/pkg-plist (revision 525793) +++ head/ports-mgmt/pkg/pkg-plist (revision 525794) @@ -1,53 +1,56 @@ etc/bash_completion.d/_pkg.bash etc/periodic/daily/411.pkg-backup etc/periodic/daily/490.status-pkg-changes etc/periodic/security/410.pkg-audit etc/periodic/security/460.pkg-checksum etc/periodic/weekly/400.status-pkg @sample etc/pkg.conf.sample include/pkg.h lib/libpkg.a lib/libpkg.so lib/libpkg.so.4 libdata/pkgconfig/pkg.pc man/man3/pkg_printf.3.gz man/man3/pkg_repos.3.gz +man/man5/pkg-keywords.5.gz +man/man5/pkg-lua-script.5.gz man/man5/pkg-repository.5.gz +man/man5/pkg-script.5.gz man/man5/pkg.conf.5.gz man/man8/pkg-add.8.gz man/man8/pkg-alias.8.gz man/man8/pkg-annotate.8.gz man/man8/pkg-audit.8.gz man/man8/pkg-autoremove.8.gz man/man8/pkg-backup.8.gz man/man8/pkg-check.8.gz man/man8/pkg-clean.8.gz man/man8/pkg-config.8.gz man/man8/pkg-create.8.gz man/man8/pkg-delete.8.gz man/man8/pkg-fetch.8.gz man/man8/pkg-info.8.gz man/man8/pkg-install.8.gz man/man8/pkg-lock.8.gz man/man8/pkg-query.8.gz man/man8/pkg-register.8.gz man/man8/pkg-remove.8.gz man/man8/pkg-repo.8.gz man/man8/pkg-rquery.8.gz man/man8/pkg-search.8.gz man/man8/pkg-set.8.gz man/man8/pkg-shell.8.gz man/man8/pkg-shlib.8.gz man/man8/pkg-ssh.8.gz man/man8/pkg-static.8.gz man/man8/pkg-stats.8.gz man/man8/pkg-unlock.8.gz man/man8/pkg-update.8.gz man/man8/pkg-updating.8.gz man/man8/pkg-upgrade.8.gz man/man8/pkg-version.8.gz man/man8/pkg-which.8.gz man/man8/pkg.8.gz sbin/pkg sbin/pkg-static share/zsh/site-functions/_pkg