Fri Nov 18 21:59:02 2011 UTC ()
Update to 1.0b7

I was unaware of version up.

* Fix html2psrc path in patch-aa

Changelog:
  051211 1.0b5   Bug fixes. Added -M option.
  091021 1.0b6   "Security" fix. Changed behavior for SSI, to avoid having
                 arbitrary readable files disclosed on a web server that uses
                 html2ps in a web application (cgi script etc), allowing HTML
                 files to be uploaded for conversion. Setting up a service like
                 this is begging for trouble in my opinion. (Is /bin/cat also
                 a vulnerability, since one can use it in a web app, allowing
                 uploading arbitrary parameters to it?)
  100507 1.0b7   Fixed a bug introduced by the previous bug fix...


(ryoon)
diff -r1.29 -r1.30 pkgsrc/print/html2ps/Makefile
diff -r1.10 -r1.11 pkgsrc/print/html2ps/distinfo
diff -r1.7 -r1.8 pkgsrc/print/html2ps/patches/patch-aa
cvs diff -r1.29 -r1.30 pkgsrc/print/html2ps/Makefile (expand / switch to unified diff)

--- pkgsrc/print/html2ps/Makefile 2011/11/18 21:43:59 1.29
+++ pkgsrc/print/html2ps/Makefile 2011/11/18 21:59:01 1.30
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.29 2011/11/18 21:43:59 ryoon Exp $ 1# $NetBSD: Makefile,v 1.30 2011/11/18 21:59:01 ryoon Exp $
2# 2#
3 3
4DISTNAME= html2ps-1.0b4 4DISTNAME= html2ps-1.0b7
5PKGREVISION= 6 
6CATEGORIES= print 5CATEGORIES= print
7MASTER_SITES= http://user.it.uu.se/~jan/ 6MASTER_SITES= http://user.it.uu.se/~jan/
8 7
9MAINTAINER= kim@tac.nyc.ny.us 8MAINTAINER= kim@tac.nyc.ny.us
10HOMEPAGE= http://user.it.uu.se/~jan/html2ps.html 9HOMEPAGE= http://user.it.uu.se/~jan/html2ps.html
11COMMENT= HTML to PostScript converter 10COMMENT= HTML to PostScript converter
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk 14DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
16DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick 15DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
17DEPENDS+= jpeg>=6b:../../graphics/jpeg 16DEPENDS+= jpeg>=6b:../../graphics/jpeg
18DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick 17DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
cvs diff -r1.10 -r1.11 pkgsrc/print/html2ps/distinfo (expand / switch to unified diff)

--- pkgsrc/print/html2ps/distinfo 2011/11/18 21:43:59 1.10
+++ pkgsrc/print/html2ps/distinfo 2011/11/18 21:59:01 1.11
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.10 2011/11/18 21:43:59 ryoon Exp $ 1$NetBSD: distinfo,v 1.11 2011/11/18 21:59:01 ryoon Exp $
2 2
3SHA1 (html2ps-1.0b4.tar.gz) = 09b1b6678e08eb08c49113e4837f0ac91942c095 3SHA1 (html2ps-1.0b7.tar.gz) = 20d508817803af08e397794d4986046ee8128b5c
4RMD160 (html2ps-1.0b4.tar.gz) = 248a6319eaddbf5fc342fd9150c6c8cb67c7df1f 4RMD160 (html2ps-1.0b7.tar.gz) = 69d8b528046ca6dc9329975a9a66379df8d41003
5Size (html2ps-1.0b4.tar.gz) = 127901 bytes 5Size (html2ps-1.0b7.tar.gz) = 128451 bytes
6SHA1 (patch-aa) = 3a3178ce5075b2a638883a0bc9b896ba80e86c4d 6SHA1 (patch-aa) = c08e8e2ce026dc131884e6730937db36caa64e97
7SHA1 (patch-ab) = d3cf5a878172dbe02fe278e21fe91c1a37ce86c7 7SHA1 (patch-ab) = d3cf5a878172dbe02fe278e21fe91c1a37ce86c7
cvs diff -r1.7 -r1.8 pkgsrc/print/html2ps/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/html2ps/patches/patch-aa 2011/11/18 21:44:00 1.7
+++ pkgsrc/print/html2ps/patches/patch-aa 2011/11/18 21:59:01 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.7 2011/11/18 21:44:00 ryoon Exp $ 1$NetBSD: patch-aa,v 1.8 2011/11/18 21:59:01 ryoon Exp $
2 2
3--- install.orig 2005-03-03 12:25:29.000000000 +0000 3--- install.orig 2005-03-03 12:25:29.000000000 +0000
4+++ install 4+++ install
5@@ -17,7 +17,9 @@ if(-e '/dev/null') { 5@@ -17,7 +17,9 @@ if(-e '/dev/null') {
6 $pathsep = ':'; 6 $pathsep = ':';
7 $dirsep = '/'; 7 $dirsep = '/';
8 $sys = 'unix'; 8 $sys = 'unix';
9- $prefix = '/usr/local'; 9- $prefix = '/usr/local';
10+ $prefix = $ARGV[0]; 10+ $prefix = $ARGV[0];
11+ $mandir = $ARGV[1]; 11+ $mandir = $ARGV[1];
12+ $iprefix = $ARGV[2]; 12+ $iprefix = $ARGV[2];
13 } elsif (-e 'nul') { 13 } elsif (-e 'nul') {
14 $pathsep = ';'; 14 $pathsep = ';';
@@ -171,27 +171,27 @@ $NetBSD: patch-aa,v 1.7 2011/11/18 21:44 @@ -171,27 +171,27 @@ $NetBSD: patch-aa,v 1.7 2011/11/18 21:44
171+#&getval($format, "A4", 171+#&getval($format, "A4",
172+# "\nEnter the default paper type, possible choices are:\nA0, A1, A2, A3, A4," 172+# "\nEnter the default paper type, possible choices are:\nA0, A1, A2, A3, A4,"
173+# ." A5, A6, A7, A8, A9, A10,\nB0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10,\n" 173+# ." A5, A6, A7, A8, A9, A10,\nB0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10,\n"
174+# ."letter, legal, arche, archd, archc, archb, archa,\nflsa, flse, halfletter," 174+# ."letter, legal, arche, archd, archc, archb, archa,\nflsa, flse, halfletter,"
175+# ." 11x17, ledger, other"); 175+# ." 11x17, ledger, other");
176 if($format !~ /^other$/i) { 176 if($format !~ /^other$/i) {
177 $paper .= " type: $format;"; 177 $paper .= " type: $format;";
178 } else { 178 } else {
179@@ -292,9 +298,9 @@ close RC; 179@@ -292,9 +298,9 @@ close RC;
180  180
181 undef $/; 181 undef $/;
182 open(HTML2PS,"html2ps") || die "*** Error opening html2ps\n"; 182 open(HTML2PS,"html2ps") || die "*** Error opening html2ps\n";
183-($code = <HTML2PS>) =~ s|\$globrc=.*|\$globrc='$glob${dirsep}html2psrc';|; 183-($code = <HTML2PS>) =~ s|\$globrc=.*|\$globrc='$glob${dirsep}html2psrc';|;
184+($code = <HTML2PS>) =~ s|\$globrc=.*|\$globrc='$iprefix${dirsep}${sharedir}${dirsep}html2psrc';|; 184+($code = <HTML2PS>) =~ s|\$globrc=.*|\$globrc='$iprefix${dirsep}${sharedir}${dirsep}html2ps${dirsep}html2psrc';|;
185 $code =~ s/exec \S+/exec $^X/; 185 $code =~ s/exec \S+/exec $^X/;
186-$code =~ s|\$ug=.*|\$ug='$html${dirsep}html2ps.html';|; 186-$code =~ s|\$ug=.*|\$ug='$html${dirsep}html2ps.html';|;
187+$code =~ s|\$ug=.*|\$ug='$iprefix${dirsep}${sharedir}${dirsep}html2ps.html';|; 187+$code =~ s|\$ug=.*|\$ug='$iprefix${dirsep}${sharedir}${dirsep}html2ps.html';|;
188 close HTML2PS; 188 close HTML2PS;
189 open(HTML2PS,">html2ps") || die "*** Error opening html2ps\n"; 189 open(HTML2PS,">html2ps") || die "*** Error opening html2ps\n";
190 print HTML2PS $code; 190 print HTML2PS $code;
191@@ -431,7 +437,7 @@ sub inst { 191@@ -431,7 +437,7 @@ sub inst {
192 copy $from => $_[0].$dirsep.$_[1] or die "*** Cannot write to $_[0]\n"; 192 copy $from => $_[0].$dirsep.$_[1] or die "*** Cannot write to $_[0]\n";
193 } 193 }
194 sub goodprefix { 194 sub goodprefix {
195- for ($prefix, "$prefix${dirsep}bin", "$prefix${dirsep}lib", 195- for ($prefix, "$prefix${dirsep}bin", "$prefix${dirsep}lib",
196+ for ($prefix, "$prefix${dirsep}bin", "$prefix${dirsep}${sharedir}", 196+ for ($prefix, "$prefix${dirsep}bin", "$prefix${dirsep}${sharedir}",
197 "$prefix${dirsep}man") 197 "$prefix${dirsep}man")