commit: 03051a29e85276b1bbc05ce58e07a6d1bc1348f0
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Aug 19 13:00:32 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 14:46:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03051a29
app-text/htmldoc: remove unused patches
app-text/htmldoc/files/htmldoc-1.8.27-crash.patch | 11 --
app-text/htmldoc/files/htmldoc-fortify-fail.patch | 21 ----
app-text/htmldoc/files/htmldoc-libpng15.patch | 116 ---------------------
.../htmldoc/files/htmldoc-sscanf-overflows.patch | 38 -------
4 files changed, 186 deletions(-)
diff --git a/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
b/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
deleted file mode 100644
index b339904ae41..00000000000
--- a/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- htmldoc/ps-pdf.cxx 2006-08-01 18:58:50.000000000 +0200
-+++ htmldoc/ps-pdf.cxx 2008-04-26 21:19:49.000000000 +0200
-@@ -3624,7 +3624,7 @@
- * Get the width of the page number, leave room for three dots...
- */
-
-- if (heading >= 0)
-+ if (heading >= 0 && heading < num_headings)
- {
- hpage = heading_pages[heading];
- numberwidth = get_width((uchar *)pages[hpage].page_text,
diff --git a/app-text/htmldoc/files/htmldoc-fortify-fail.patch
b/app-text/htmldoc/files/htmldoc-fortify-fail.patch
deleted file mode 100644
index 32ec8873567..00000000000
--- a/app-text/htmldoc/files/htmldoc-fortify-fail.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
---- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx 2009-08-13 19:32:21.846860508 -0400
-+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx 2009-08-13 19:40:29.185857503 -0400
-@@ -8619,7 +8619,7 @@
- return (NULL);
- }
- // Safe because buffer is allocated...
-- strcpy((char *)r->data.text.buffer, (char *)data);
-+ memcpy((char *)r->data.text.buffer, (char *)data, strlen((char
*)data));
- get_color(_htmlTextColor, r->data.text.rgb);
- break;
- case RENDER_IMAGE :
-@@ -8640,7 +8640,7 @@
- return (NULL);
- }
- // Safe because buffer is allocated...
-- strcpy((char *)r->data.link, (char *)data);
-+ memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
- break;
- }
-
diff --git a/app-text/htmldoc/files/htmldoc-libpng15.patch
b/app-text/htmldoc/files/htmldoc-libpng15.patch
deleted file mode 100644
index 7b834c304d2..00000000000
--- a/app-text/htmldoc/files/htmldoc-libpng15.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-http://bugs.gentoo.org/385521
-http://www.htmldoc.org/str.php?L243+P0+S-2+C0+I0+E0+M10+Q
-
---- htmldoc/image.cxx
-+++ htmldoc/image.cxx
-@@ -1472,6 +1472,9 @@ image_load_png(image_t *img, /* I - Imag
- png_bytep *rows; /* PNG row pointers */
- uchar *inptr, /* Input pixels */
- *outptr; /* Output pixels */
-+ png_bytep trans_alpha;
-+ int num_trans;
-+ png_color_16p trans_color;
-
-
- /*
-@@ -1499,7 +1502,7 @@ image_load_png(image_t *img, /* I - Imag
-
- rows = NULL;
-
-- if (setjmp(pp->jmpbuf))
-+ if (setjmp(png_jmpbuf(pp)))
- {
- progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
-
-@@ -1526,7 +1529,7 @@ image_load_png(image_t *img, /* I - Imag
-
- png_read_info(pp, info);
-
-- if (info->color_type & PNG_COLOR_MASK_PALETTE)
-+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
- {
- png_set_expand(pp);
-
-@@ -1535,15 +1538,15 @@ image_load_png(image_t *img, /* I - Imag
- if (Encryption)
- img->use ++;
- }
-- else if (info->bit_depth < 8)
-+ else if (png_get_bit_depth(pp, info) < 8)
- {
- png_set_packing(pp);
- png_set_expand(pp);
- }
-- else if (info->bit_depth == 16)
-+ else if (png_get_bit_depth(pp, info) == 16)
- png_set_strip_16(pp);
-
-- if (info->color_type & PNG_COLOR_MASK_COLOR)
-+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
- {
- depth = 3;
- img->depth = gray ? 1 : 3;
-@@ -1554,10 +1557,11 @@ image_load_png(image_t *img, /* I - Imag
- img->depth = 1;
- }
-
-- img->width = info->width;
-- img->height = info->height;
-+ img->width = png_get_image_width(pp, info);
-+ img->height = png_get_image_height(pp, info);
-
-- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
-+ png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color);
-+ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
- {
- if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3)
- image_need_mask(img, 8);
-@@ -1571,14 +1575,14 @@ image_load_png(image_t *img, /* I - Imag
-
- #ifdef DEBUG
- printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d,
img->depth=%d\n",
-- info->color_type, depth, img->width, img->height, img->depth);
-- if (info->color_type & PNG_COLOR_MASK_COLOR)
-+ png_get_color_type(pp, info), depth, img->width, img->height,
img->depth);
-+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
- puts(" COLOR");
- else
- puts(" GRAYSCALE");
-- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
-+ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
- puts(" ALPHA");
-- if (info->color_type & PNG_COLOR_MASK_PALETTE)
-+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
- puts(" PALETTE");
- #endif // DEBUG
-
-@@ -1594,9 +1598,9 @@ image_load_png(image_t *img, /* I - Imag
- * Allocate pointers...
- */
-
-- rows = (png_bytep *)calloc(info->height, sizeof(png_bytep));
-+ rows = (png_bytep *)calloc(png_get_image_height(pp, info),
sizeof(png_bytep));
-
-- for (i = 0; i < (int)info->height; i ++)
-+ for (i = 0; i < (int)png_get_image_height(pp, info); i ++)
- rows[i] = img->pixels + i * img->width * depth;
-
- /*
-@@ -1610,7 +1614,7 @@ image_load_png(image_t *img, /* I - Imag
- * Generate the alpha mask as necessary...
- */
-
-- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
-+ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
- {
- #ifdef DEBUG
- for (inptr = img->pixels, i = 0; i < img->height; i ++)
-@@ -1639,7 +1643,7 @@ image_load_png(image_t *img, /* I - Imag
- * Reformat the data as necessary for the reader...
- */
-
-- if (gray && info->color_type & PNG_COLOR_MASK_COLOR)
-+ if (gray && png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
- {
- /*
- * Greyscale output needed...
diff --git a/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch
b/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch
deleted file mode 100644
index 3a8d4edd31a..00000000000
--- a/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix several insecure calls to sscanf(), bug 278186. Patch by a...@gentoo.org.
-
-diff -ru a/htmldoc/htmllib.cxx b/htmldoc/htmllib.cxx
---- a/htmldoc/htmllib.cxx 2006-06-07 19:43:52.000000000 +0200
-+++ b/htmldoc/htmllib.cxx 2009-08-01 19:52:46.301099436 +0200
-@@ -2139,7 +2139,7 @@
- * 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 -ru a/htmldoc/ps-pdf.cxx b/htmldoc/ps-pdf.cxx
---- a/htmldoc/ps-pdf.cxx 2006-08-01 18:58:50.000000000 +0200
-+++ b/htmldoc/ps-pdf.cxx 2009-08-01 19:53:14.300610480 +0200
-@@ -12512,7 +12512,7 @@
- * 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 -ru a/htmldoc/util.cxx b/htmldoc/util.cxx
---- a/htmldoc/util.cxx 2005-04-24 21:20:32.000000000 +0200
-+++ b/htmldoc/util.cxx 2009-08-01 19:52:14.469652088 +0200
-@@ -484,7 +484,7 @@
- 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...
