Index: head/ports-mgmt/pkg/Makefile =================================================================== --- head/ports-mgmt/pkg/Makefile (revision 434958) +++ head/ports-mgmt/pkg/Makefile (revision 434959) @@ -1,82 +1,82 @@ # $FreeBSD$ PORTNAME= pkg DISTVERSION= 1.10.0 -PORTREVISION= 1 +PORTREVISION= 2 _PKG_VERSION= ${DISTVERSION} 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_LDCONFIG= yes USES= libtool tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-maintainer-mode INSTALL_TARGET= install-strip PORTDOCS= NEWS PORTSCOUT= ignore:1 # 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 .if !exists(/usr/include/jail.h) EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include .if defined(WITH_DEBUG) && !defined(WITHOUT_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 PKG_BIN= ${WRKSRC}/src/pkg-static post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS @${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \ ${STAGEDIR}${PREFIX}/lib/libpkg.a .include Index: head/ports-mgmt/pkg/files/patch-signing_command =================================================================== --- head/ports-mgmt/pkg/files/patch-signing_command (nonexistent) +++ head/ports-mgmt/pkg/files/patch-signing_command (revision 434959) @@ -0,0 +1,20 @@ +commit df567e873326532a96de420e6953d7111f446cff +Author: Baptiste Daroussin +Date: Mon Feb 27 14:31:48 2017 +0100 + + Use binary copy instead of printf to fix issues with pkg repo + signing_command when the signature contains \0 + +diff --git libpkg/pkg_repo_create.c libpkg/pkg_repo_create.c +index ac69e06c..1dab735c 100644 +--- libpkg/pkg_repo_create.c ++++ libpkg/pkg_repo_create.c +@@ -822,7 +822,7 @@ pkg_repo_sign(char *path, char **argv, int argc, UT_string **sig, UT_string **ce + break; + } + if (buf != NULL) +- utstring_printf(buf, "%s", line); ++ utstring_bincpy(buf, line, linelen); + } + + if (pclose(fp) != 0) { Property changes on: head/ports-mgmt/pkg/files/patch-signing_command ___________________________________________________________________ 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