diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2020-01-26 20:22:32 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2020-01-26 20:22:32 +0000 |
| commit | a141fedd06673d36b5b3710b84a0084b46d81d05 (patch) | |
| tree | a9b38fe3427a81765801bc61667d22a62a5960da /ports-mgmt/portmaster | |
| parent | aed8c82ed52d549646ddaf5308ee2a48517adef2 (diff) | |
| download | ports-a141fedd06673d36b5b3710b84a0084b46d81d05.tar.gz ports-a141fedd06673d36b5b3710b84a0084b46d81d05.zip | |
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)
Notes
Notes:
svn path=/head/; revision=524231
Diffstat (limited to 'ports-mgmt/portmaster')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 577f33beb5ab..80e1acf3e91b 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index 8efb10784ee5..ae571bfc35ec 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -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 |