[pkgsrc/pkgsrc-2011Q2]: pkgsrc/textproc/groff Pullup ticket #3481 - requested...

[sbd <sbd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7fc2a8fac64b
branches:  pkgsrc-2011Q2
changeset: 590235:7fc2a8fac64b
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Thu Jul 28 02:30:24 2011 +0000

description:
Pullup ticket #3481 - requested by tez
textproc/groff security/portablity update

Revisions pulled up:
- textproc/groff/Makefile                                       1.59
- textproc/groff/distinfo                                       1.16
- textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh       1.2

---
   Module Name:   pkgsrc
   Committed By:  tez
   Date:          Wed Jul 27 16:33:25 UTC 2011
   Modified Files:
         pkgsrc/textproc/groff: Makefile distinfo
         pkgsrc/textproc/groff/patches: patch-contrib_pdfmark_pdfroff.sh
   Log Message:
   Adjust pdfroff security patch to not use '-p' option to mktemp which is
   missing on some platforms.  fixes PR#45181

diffstat:

 textproc/groff/Makefile                                 |  4 ++--
 textproc/groff/distinfo                                 |  4 ++--
 textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh |  5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 57d1da3f0faa -r 7fc2a8fac64b textproc/groff/Makefile
--- a/textproc/groff/Makefile   Thu Jul 28 02:30:16 2011 +0000
+++ b/textproc/groff/Makefile   Thu Jul 28 02:30:24 2011 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57.2.1 2011/07/21 04:24:07 sbd Exp $
+# $NetBSD: Makefile,v 1.57.2.2 2011/07/28 02:30:24 sbd Exp $
 #
 
 DISTNAME=      groff-1.20.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=groff/}
 
diff -r 57d1da3f0faa -r 7fc2a8fac64b textproc/groff/distinfo
--- a/textproc/groff/distinfo   Thu Jul 28 02:30:16 2011 +0000
+++ b/textproc/groff/distinfo   Thu Jul 28 02:30:24 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14.14.1 2011/07/21 04:24:07 sbd Exp $
+$NetBSD: distinfo,v 1.14.14.2 2011/07/28 02:30:24 sbd Exp $
 
 SHA1 (groff-1.20.1.tar.gz) = 3066587d73df73c2bda235034f4515cf52d22549
 RMD160 (groff-1.20.1.tar.gz) = ec311727206d183fb04f1b4bd01c1284142fdb52
@@ -15,7 +15,7 @@
 SHA1 (patch-contrib_groffer_perl_groffer.pl) = 2583145fe594a11619cf237ca38a20bbbfee17f1
 SHA1 (patch-contrib_groffer_perl_roff2.pl) = 8ee9d4bba3c25a391b406e4dfac6352d414f7263
 SHA1 (patch-contrib_pdfmark_pdfroff.man) = c2a48a9f16650044a493d23192d9c00c2dabbc67
-SHA1 (patch-contrib_pdfmark_pdfroff.sh) = 0f23f02561913aaf9fabd2f41236de62b79bdf71
+SHA1 (patch-contrib_pdfmark_pdfroff.sh) = 8ff3360392c214940854a1b93a5f262c37e3cd2e
 SHA1 (patch-contrib_pic2graph_pic2graph.sh) = 447e25325f3c26be1e5fa8b6cd0bc05d9f99474e
 SHA1 (patch-doc_fixinfo.sh) = 7ad376be722b712b129f736804b9c8c30789da2d
 SHA1 (patch-doc_groff.info-2) = a5e366af0bc9ee018664d2ba9192b136980af6ce
diff -r 57d1da3f0faa -r 7fc2a8fac64b textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh
--- a/textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh   Thu Jul 28 02:30:16 2011 +0000
+++ b/textproc/groff/patches/patch-contrib_pdfmark_pdfroff.sh   Thu Jul 28 02:30:24 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-contrib_pdfmark_pdfroff.sh,v 1.1.2.2 2011/07/21 04:24:07 sbd Exp $
+$NetBSD: patch-contrib_pdfmark_pdfroff.sh,v 1.1.2.3 2011/07/28 02:30:24 sbd Exp $
 
 Fix many temporary file handling issues, including in pdfroff
 (resolves CVE-2009-5044 / SA44999)
@@ -6,6 +6,7 @@
  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 @@
  #
 -  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