diff options
author | tez <tez> | 2009-08-27 21:51:37 +0000 |
---|---|---|
committer | tez <tez> | 2009-08-27 21:51:37 +0000 |
commit | 42936107eafc47aefe38e6970f4e69db1b99d6e8 (patch) | |
tree | ebd003e18145ba4c2a5e8bc7b2ebb2f080ee5a86 /www | |
parent | 31bffcdc4f47394a21a5e4db4a12b96894547450 (diff) | |
download | pkgsrc-42936107eafc47aefe38e6970f4e69db1b99d6e8.tar.gz |
Fix for Secunia Advisory: SA35780
from http://bugs.gentoo.org/attachment.cgi?id=199846
Diffstat (limited to 'www')
-rw-r--r-- | www/htmldoc/Makefile | 5 | ||||
-rw-r--r-- | www/htmldoc/distinfo | 5 | ||||
-rw-r--r-- | www/htmldoc/patches/patch-ab | 15 | ||||
-rw-r--r-- | www/htmldoc/patches/patch-ac | 15 | ||||
-rw-r--r-- | www/htmldoc/patches/patch-ad | 15 |
5 files changed, 52 insertions, 3 deletions
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile index ce16a708f42..b6ff00b368c 100644 --- a/www/htmldoc/Makefile +++ b/www/htmldoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2009/08/26 19:58:26 sno Exp $ +# $NetBSD: Makefile,v 1.27 2009/08/27 21:51:37 tez Exp $ # This section contains variables that might be overridden. PKGNAME?= ${PKGNAME_BASE} @@ -7,7 +7,7 @@ COMMENT?= Converts HTML to indexed HTML, PDF and/or PostScript # Normal package Makefile contents follow. DISTNAME= htmldoc-1.8.27-source PKGNAME_BASE= ${DISTNAME:S/-source//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.bz2 @@ -17,6 +17,7 @@ CONFLICTS+= htmldoc-x11-[0-9]* MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.htmldoc.org/ +LICENSE= gnu-gpl-v2 # ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha diff --git a/www/htmldoc/distinfo b/www/htmldoc/distinfo index d4a8d42e8f7..d1b0638be33 100644 --- a/www/htmldoc/distinfo +++ b/www/htmldoc/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.8 2009/01/08 11:57:24 obache Exp $ +$NetBSD: distinfo,v 1.9 2009/08/27 21:51:37 tez Exp $ SHA1 (htmldoc-1.8.27-source.tar.bz2) = 472908e0aafed1cedfbacd8ed3168734aebdec4b RMD160 (htmldoc-1.8.27-source.tar.bz2) = 9605a5894675439f5fae405fb060972e19f33c7e Size (htmldoc-1.8.27-source.tar.bz2) = 3960271 bytes SHA1 (patch-aa) = 92de5e1e4761ffe2d117004b2a38ec52edb33d7c +SHA1 (patch-ab) = 22add1402202fed917a79ce67963cb282ca46f87 +SHA1 (patch-ac) = bf9036087e03095d51ee064e1f193c899848adff +SHA1 (patch-ad) = 94e5f10387ede380b7579392e41234ff832f1295 diff --git a/www/htmldoc/patches/patch-ab b/www/htmldoc/patches/patch-ab new file mode 100644 index 00000000000..ec4d3dbee6f --- /dev/null +++ b/www/htmldoc/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.3 2009/08/27 21:51:37 tez Exp $ +Fix for Secunia Advisory: SA35780 +from http://bugs.gentoo.org/attachment.cgi?id=199846 + +--- htmldoc/htmllib.cxx.orig 2009-08-26 20:34:51.474463400 -0500 ++++ htmldoc/htmllib.cxx +@@ -2139,7 +2139,7 @@ htmlLoadFontWidths(void) + * assigned charset... + */ + +- if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2) ++ if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2) + continue; + + for (ch = 0; ch < 256; ch ++) diff --git a/www/htmldoc/patches/patch-ac b/www/htmldoc/patches/patch-ac new file mode 100644 index 00000000000..e00cb73ae1f --- /dev/null +++ b/www/htmldoc/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2009/08/27 21:51:37 tez Exp $ +Fix for Secunia Advisory: SA35780 +from http://bugs.gentoo.org/attachment.cgi?id=199846 + +--- htmldoc/ps-pdf.cxx.orig 2009-08-26 20:35:52.397461300 -0500 ++++ htmldoc/ps-pdf.cxx +@@ -12512,7 +12512,7 @@ write_type1(FILE *out, /* I - Fil + * assigned charset... + */ + +- if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2) ++ if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2) + continue; + + for (ch = 0; ch < 256; ch ++) diff --git a/www/htmldoc/patches/patch-ad b/www/htmldoc/patches/patch-ad new file mode 100644 index 00000000000..c092f68b442 --- /dev/null +++ b/www/htmldoc/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2009/08/27 21:51:37 tez Exp $ +Fix for Secunia Advisory: SA35780 +from http://bugs.gentoo.org/attachment.cgi?id=199846 + +--- htmldoc/util.cxx.orig 2009-08-26 20:36:33.787563300 -0500 ++++ htmldoc/util.cxx +@@ -484,7 +484,7 @@ set_page_size(const char *size) /* I - P + PageWidth = 595; + PageLength = 792; + } +- else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2) ++ else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2) + { + /* + * Custom size... |