diff options
| author | tez <tez@pkgsrc.org> | 2011-07-27 16:33:25 +0000 |
|---|---|---|
| committer | tez <tez@pkgsrc.org> | 2011-07-27 16:33:25 +0000 |
| commit | d31873ccee725a5461d0ee5b2664fa3d982878fb (patch) | |
| tree | 3d71ce50a6257dad15221009c483b631f1a52d52 /textproc/groff/patches | |
| parent | e0311c143743749f873ccae5cb35d0f925b91579 (diff) | |
| download | pkgsrc-d31873ccee725a5461d0ee5b2664fa3d982878fb.tar.gz | |
Adjust pdfroff security patch to not use '-p' option to mktemp which is
missing on some platforms. fixes PR#45181
Diffstat (limited to 'textproc/groff/patches')
| -rw-r--r-- | textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh b/textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh index 0b8a53a2fc5..22b381f4a8a 100644 --- a/textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh +++ b/textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh @@ -1,4 +1,4 @@ -$NetBSD: patch-contrib_pdfmark_pdfroff.sh,v 1.1 2011/07/19 21:09:39 tez Exp $ +$NetBSD: patch-contrib_pdfmark_pdfroff.sh,v 1.2 2011/07/27 16:33:25 tez Exp $ Fix many temporary file handling issues, including in pdfroff (resolves CVE-2009-5044 / SA44999) @@ -6,6 +6,7 @@ Patches copied from: http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/groff/groff-1.20.1-owl-tmp.diff?rev=1.2 Modified for pkgsrc and excluded a documentaion change to doc/groff.texinfo that changes a `makeinfo' is too old warning into a fatal error. +Modified to not use '-p' option to mktemp which is missing on some platforms. Added patch to make pdfroff.sh use -dSAFER See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538338 for why. @@ -18,7 +19,7 @@ See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538338 for why. # - WRKFILE=${GROFF_TMPDIR=${TMPDIR-${TMP-${TEMP-"."}}}}/pdf$$.tmp + MYTMPDIR=${GROFF_TMPDIR-${TMPDIR-${TMP-${TEMP-"/tmp"}}}} -+ WRKDIR="`unset TMPDIR && mktemp -dp "$MYTMPDIR" groff-pdfroff.XXXXXXXXXX`" || exit ++ WRKDIR="`TMPDIR=$MYTMPDIR mktemp -d -t groff-pdfroff.XXXXXXXXXX`" || exit + + trap 'rm -rf -- "$WRKDIR"' EXIT + trap 'trap - EXIT; rm -rf -- "$WRKDIR"; exit 1' HUP INT QUIT PIPE TERM |