Index: head/ports-mgmt/pkg-devel/Makefile =================================================================== --- head/ports-mgmt/pkg-devel/Makefile (revision 502777) +++ head/ports-mgmt/pkg-devel/Makefile (revision 502778) @@ -1,83 +1,82 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.10.99.13 +DISTVERSION= 1.10.99.14 _PKG_VERSION= ${DISTVERSION} -PORTREVISION= 2 CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel MAINTAINER= pkg@FreeBSD.org COMMENT= Package manager LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 68770f9 +GH_TAGNAME= 6c9b3097 WITH_DEBUG= yes CFLAGS+= -O0 -g -Wno-error USE_LDCONFIG= yes HAS_CONFIGURE= yes PORTDOCS= NEWS PORTSCOUT= ignore:1 CONFIGURE_ARGS= --mandir=${PREFIX}/man # 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 .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 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} " 2) Convert your package database by running pkg2ng"; \ ${ECHO_CMD} ""; \ exit 1 .endif .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 502777) +++ head/ports-mgmt/pkg-devel/distinfo (revision 502778) @@ -1,3 +1,3 @@ -TIMESTAMP = 1555695600 -SHA256 (freebsd-pkg-1.10.99.13-68770f9_GH0.tar.gz) = f061504330d7c090b0e501272217f3c037006d1b1a7c9cbb3192b0ab0241ada9 -SIZE (freebsd-pkg-1.10.99.13-68770f9_GH0.tar.gz) = 3560666 +TIMESTAMP = 1558947499 +SHA256 (freebsd-pkg-1.10.99.14-6c9b3097_GH0.tar.gz) = 545b20925763dc473a37d117943df84024514203753bc4743214a69aa69da7aa +SIZE (freebsd-pkg-1.10.99.14-6c9b3097_GH0.tar.gz) = 3560806 Index: head/ports-mgmt/pkg-devel/files/patch-better-stdin-handling =================================================================== --- head/ports-mgmt/pkg-devel/files/patch-better-stdin-handling (revision 502777) +++ head/ports-mgmt/pkg-devel/files/patch-better-stdin-handling (nonexistent) @@ -1,47 +0,0 @@ -diff --git libpkg/scripts.c libpkg/scripts.c -index 04667af1..489b46d7 100644 ---- libpkg/scripts.c -+++ libpkg/scripts.c -@@ -35,6 +35,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -59,6 +60,7 @@ pkg_script_run(struct pkg * const pkg, pkg_script type) - const char *argv[4]; - char **ep; - int ret = EPKG_OK; -+ int fd = -1; - int stdin_pipe[2] = {-1, -1}; - posix_spawn_file_actions_t action; - bool use_pipe = 0; -@@ -157,8 +159,15 @@ pkg_script_run(struct pkg * const pkg, pkg_script type) - - use_pipe = 1; - } else { -- posix_spawn_file_actions_addclose(&action, -- STDIN_FILENO); -+ fd = open("/dev/null", O_RDWR); -+ if (fd < 0) { -+ pkg_errno("Cannot open %s", "/dev/null"); -+ ret = EPKG_FATAL; -+ posix_spawn_file_actions_destroy(&action); -+ goto cleanup; -+ } -+ posix_spawn_file_actions_adddup2(&action, -+ fd, STDIN_FILENO); - - argv[0] = _PATH_BSHELL; - argv[1] = "-c"; -@@ -178,6 +187,8 @@ pkg_script_run(struct pkg * const pkg, pkg_script type) - } - posix_spawn_file_actions_destroy(&action); - -+ if (fd != -1) -+ close(fd); - if (use_pipe) { - script_cmd_p = utstring_body(script_cmd); - script_cmd_len = utstring_len(script_cmd); Property changes on: head/ports-mgmt/pkg-devel/files/patch-better-stdin-handling ___________________________________________________________________ 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