From owner-svn-ports-all@freebsd.org Sun Jan 26 20:22:33 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1AFC1FA581; Sun, 26 Jan 2020 20:22:33 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 485PST3kJPz4Sfy; Sun, 26 Jan 2020 20:22:33 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B21D2698E; Sun, 26 Jan 2020 20:22:33 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00QKMXEC021738; Sun, 26 Jan 2020 20:22:33 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00QKMXa5021736; Sun, 26 Jan 2020 20:22:33 GMT (envelope-from se@FreeBSD.org) Message-Id: <202001262022.00QKMXa5021736@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Sun, 26 Jan 2020 20:22:33 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/ports-mgmt/portmaster: . files X-SVN-Commit-Revision: 524231 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jan 2020 20:22:33 -0000 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 ${PM_NEEDS_UPDATE}" > ${TMPDIR}/portmasterfail.txt ++ echo "$progname ${PM_NEEDS_UPDATE}" > ~/portmasterfail.txt + echo '' + echo "===>>> You can restart from the point of failure with this command line:" + echo " $progname ${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