Date: Sun, 26 Jan 2020 20:22:33 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524231 - in head/ports-mgmt/portmaster: . files Message-ID: <202001262022.00QKMXa5021736@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Sun Jan 26 20:22:32 2020 New Revision: 524231 URL: https://svnweb.freebsd.org/changeset/ports/524231 Log: Save the file with instructions how to restart portmaster after a failure to non-world-writable directory. Save this file in the user's home directory instead of in /tmp to prevent a possible sym-link attack against the user. PR: 233378 Submitted by: Robert Schulze Approved by: antoine (implicit) Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Sun Jan 26 20:12:08 2020 (r524230) +++ head/ports-mgmt/portmaster/Makefile Sun Jan 26 20:22:32 2020 (r524231) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Sun Jan 26 20:12:08 2020 (r524230) +++ head/ports-mgmt/portmaster/files/patch-portmaster Sun Jan 26 20:22:32 2020 (r524231) @@ -43,6 +43,21 @@ echo "===>>> Done displaying pkg-message files" ; echo '' ) | $PAGER ;; esac +@@ -243,12 +245,12 @@ parent_exit () { + fi + + if [ -n "$1" -a -n "${PM_NEEDS_UPDATE# }" -a -n "$PM_BUILDING" -a -z "$FETCH_ONLY" ]; then +- echo "$progname <flags>${PM_NEEDS_UPDATE}" > ${TMPDIR}/portmasterfail.txt ++ echo "$progname <flags>${PM_NEEDS_UPDATE}" > ~/portmasterfail.txt + echo '' + echo "===>>> You can restart from the point of failure with this command line:" + echo " $progname <flags>${PM_NEEDS_UPDATE}" + echo '' +- echo "This command has been saved to ${TMPDIR}/portmasterfail.txt" ++ echo "This command has been saved to ~/portmasterfail.txt" + echo '' + fi + } @@ -260,7 +262,7 @@ safe_exit () { parent_exit $1 else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001262022.00QKMXa5021736>