From 357e5784e487bf83b247c6b94e3acf77b85763a6 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 14 Apr 2014 14:47:45 +0000 Subject: Pullup ticket #4372 - requested by taca print/a2ps: security patch Revisions pulled up: - print/a2ps/Makefile 1.77 - print/a2ps/distinfo 1.15 - print/a2ps/patches/patch-CVE-2014-0466_1 1.1 - print/a2ps/patches/patch-CVE-2014-0466_2 1.1 --- Module Name: pkgsrc Committed By: tez Date: Tue Apr 8 19:32:11 UTC 2014 Modified Files: pkgsrc/print/a2ps: Makefile distinfo Added Files: pkgsrc/print/a2ps/patches: patch-CVE-2014-0466_1 patch-CVE-2014-0466_2 Log Message: Add fix for CVE-2014-0466 from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742902 --- print/a2ps/Makefile | 4 ++-- print/a2ps/distinfo | 4 +++- print/a2ps/patches/patch-CVE-2014-0466_1 | 17 +++++++++++++++++ print/a2ps/patches/patch-CVE-2014-0466_2 | 17 +++++++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 print/a2ps/patches/patch-CVE-2014-0466_1 create mode 100644 print/a2ps/patches/patch-CVE-2014-0466_2 diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index a9311d53f1c..c9e3838bbf0 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2014/02/05 17:20:31 drochner Exp $ +# $NetBSD: Makefile,v 1.76.2.1 2014/04/14 14:47:45 tron Exp $ DISTNAME= a2ps-4.14 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU:=a2ps/} \ ftp://ftp.enst.fr/pub/unix/a2ps/ diff --git a/print/a2ps/distinfo b/print/a2ps/distinfo index a8d3b996cec..c06d07b8ea2 100644 --- a/print/a2ps/distinfo +++ b/print/a2ps/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.14 2014/02/05 17:20:31 drochner Exp $ +$NetBSD: distinfo,v 1.14.2.1 2014/04/14 14:47:45 tron Exp $ SHA1 (a2ps-4.14.tar.gz) = 365abbbe4b7128bf70dad16d06e23c5701874852 RMD160 (a2ps-4.14.tar.gz) = a5105d6256a809483e099519325979aaaff7219e Size (a2ps-4.14.tar.gz) = 2552507 bytes SHA1 (patch-CVE-2001-1593_1) = d0ce811248c33c5df6952f84176c2901ca4bd176 SHA1 (patch-CVE-2001-1593_2) = f3a40104b0c510480ce5107a8acf2924d4ef5974 +SHA1 (patch-CVE-2014-0466_1) = fa77ad336e307678e0c649e049b57d1fbc8c492f +SHA1 (patch-CVE-2014-0466_2) = 1abc6d26bdf03d859cec53afc3f5c363942d9385 SHA1 (patch-aa) = 6317b6abca697388538fc705037da55379a4e1e1 SHA1 (patch-ab) = 7b1f1e3ed2af47e7d9864ec2dbcd7d105f93632a SHA1 (patch-ac) = 8e09c4c3b320b58bf12c4266d4d22977b5f9b826 diff --git a/print/a2ps/patches/patch-CVE-2014-0466_1 b/print/a2ps/patches/patch-CVE-2014-0466_1 new file mode 100644 index 00000000000..b29d1e1e9df --- /dev/null +++ b/print/a2ps/patches/patch-CVE-2014-0466_1 @@ -0,0 +1,17 @@ +$NetBSD: patch-CVE-2014-0466_1,v 1.1.2.2 2014/04/14 14:47:45 tron Exp $ + +Fix for CVE-2014-0466 from + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742902 + + +--- contrib/fixps.in ++++ contrib/fixps.in +@@ -389,7 +389,7 @@ + eval "$command" ;; + gs) + $verbose "$program: making a full rewrite of the file ($gs)." >&2 +- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;; ++ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;; + esac + ) + fi diff --git a/print/a2ps/patches/patch-CVE-2014-0466_2 b/print/a2ps/patches/patch-CVE-2014-0466_2 new file mode 100644 index 00000000000..b008394dbad --- /dev/null +++ b/print/a2ps/patches/patch-CVE-2014-0466_2 @@ -0,0 +1,17 @@ +$NetBSD: patch-CVE-2014-0466_2,v 1.1.2.2 2014/04/14 14:47:45 tron Exp $ + +Fix for CVE-2014-0466 from + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742902 + + +--- contrib/fixps.m4 ++++ contrib/fixps.m4 +@@ -307,7 +307,7 @@ + eval "$command" ;; + gs) + $verbose "$program: making a full rewrite of the file ($gs)." >&2 +- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;; ++ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;; + esac + ) + fi -- cgit v1.2.3