Add official patches 0-11
This commit is contained in:
parent
18d6084424
commit
4391208f50
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115433
4 changed files with 40 additions and 61 deletions
|
@ -7,15 +7,27 @@
|
|||
|
||||
PORTNAME= png
|
||||
PORTVERSION= 1.2.5
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ftp://swrinde.nde.swri.edu/pub/png/src/ \
|
||||
${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= lib${PORTNAME}
|
||||
DISTNAME= lib${PORTNAME}-${PORTVERSION}
|
||||
|
||||
#PATCH_SITES= ftp://ftp.libpng.org/pub/png/src/
|
||||
#PATCHFILES=
|
||||
PATCH_SITES= ${MASTER_SITES}
|
||||
PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
|
||||
PATCHFILES= libpng-patch00-pngrtran-filler-RRGGBB-overflow.txt \
|
||||
libpng-patch01-pngrtran-filler-GG-overflow.txt \
|
||||
libpng-patch02-pngerror-memcpy-overflow.txt \
|
||||
libpng-patch03-trns-chunk-overflow.txt \
|
||||
libpng-patch04-get-uint-31.txt \
|
||||
libpng-patch05-pngpread-chunklength.txt \
|
||||
libpng-patch06-pngread-chunklength.txt \
|
||||
libpng-patch07-png-read-png-overflow.txt \
|
||||
libpng-patch08-splt-buffer-overflow.txt \
|
||||
libpng-patch09-null-iccp-profile.txt \
|
||||
libpng-patch10-find-duplicate-chunk.txt \
|
||||
libpng-patch11-limit-dimensions.txt
|
||||
PATCH_DIST_STRIP= -p1
|
||||
|
||||
MAINTAINER= ache@FreeBSD.org
|
||||
COMMENT= Library for manipulating PNG images
|
||||
|
|
|
@ -1,2 +1,26 @@
|
|||
MD5 (libpng-1.2.5.tar.gz) = 0cec860559f2f5f7145da3c6851bacb7
|
||||
SIZE (libpng-1.2.5.tar.gz) = 505988
|
||||
MD5 (libpng-patch00-pngrtran-filler-RRGGBB-overflow.txt) = 1e49d90ffa33c25b5af90311fe022436
|
||||
SIZE (libpng-patch00-pngrtran-filler-RRGGBB-overflow.txt) = 1105
|
||||
MD5 (libpng-patch01-pngrtran-filler-GG-overflow.txt) = e233371ec0a57d2bfa462dac6d5d089d
|
||||
SIZE (libpng-patch01-pngrtran-filler-GG-overflow.txt) = 1081
|
||||
MD5 (libpng-patch02-pngerror-memcpy-overflow.txt) = cacaea50d5c6a0e6b2876c50d79b50d3
|
||||
SIZE (libpng-patch02-pngerror-memcpy-overflow.txt) = 1232
|
||||
MD5 (libpng-patch03-trns-chunk-overflow.txt) = 91697e957e08e26aac2178a25f410dac
|
||||
SIZE (libpng-patch03-trns-chunk-overflow.txt) = 608
|
||||
MD5 (libpng-patch04-get-uint-31.txt) = d4c45cf4a1292a6fabca27dd39c779e7
|
||||
SIZE (libpng-patch04-get-uint-31.txt) = 1686
|
||||
MD5 (libpng-patch05-pngpread-chunklength.txt) = b2d0d1d9455ff99a46f24ab9e45f1cf1
|
||||
SIZE (libpng-patch05-pngpread-chunklength.txt) = 1329
|
||||
MD5 (libpng-patch06-pngread-chunklength.txt) = 00ad5b7467fd768a3316c1b340913997
|
||||
SIZE (libpng-patch06-pngread-chunklength.txt) = 1848
|
||||
MD5 (libpng-patch07-png-read-png-overflow.txt) = 8880f8530118a86075b3993bee711e65
|
||||
SIZE (libpng-patch07-png-read-png-overflow.txt) = 510
|
||||
MD5 (libpng-patch08-splt-buffer-overflow.txt) = 9dac4fcd1a9c01ad978b3e19e140558a
|
||||
SIZE (libpng-patch08-splt-buffer-overflow.txt) = 812
|
||||
MD5 (libpng-patch09-null-iccp-profile.txt) = c7f49429bf33281938c6b751b216329f
|
||||
SIZE (libpng-patch09-null-iccp-profile.txt) = 480
|
||||
MD5 (libpng-patch10-find-duplicate-chunk.txt) = 1ee3546f7568db193b788a60642864d2
|
||||
SIZE (libpng-patch10-find-duplicate-chunk.txt) = 1991
|
||||
MD5 (libpng-patch11-limit-dimensions.txt) = 1cea85235f65c953f7b3d2f9736dc086
|
||||
SIZE (libpng-patch11-limit-dimensions.txt) = 1092
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- pngerror.c.bak Thu Oct 3 15:32:27 2002
|
||||
+++ pngerror.c Sun May 16 08:10:42 2004
|
||||
@@ -137,7 +137,7 @@
|
||||
{
|
||||
buffer[iout++] = ':';
|
||||
buffer[iout++] = ' ';
|
||||
- png_memcpy(buffer+iout, error_message, 64);
|
||||
+ strncpy(buffer+iout, error_message, 63);
|
||||
buffer[iout+63] = 0;
|
||||
}
|
||||
}
|
|
@ -1,46 +0,0 @@
|
|||
--- pngrtran.c.orig Tue Jul 6 17:44:30 2004
|
||||
+++ pngrtran.c Tue Jul 6 17:46:22 2004
|
||||
@@ -1889,8 +1889,8 @@ png_do_read_filler(png_row_infop row_inf
|
||||
/* This changes the data from GG to GGXX */
|
||||
if (flags & PNG_FLAG_FILLER_AFTER)
|
||||
{
|
||||
- png_bytep sp = row + (png_size_t)row_width;
|
||||
- png_bytep dp = sp + (png_size_t)row_width;
|
||||
+ png_bytep sp = row + (png_size_t)row_width * 2;
|
||||
+ png_bytep dp = sp + (png_size_t)row_width * 2;
|
||||
for (i = 1; i < row_width; i++)
|
||||
{
|
||||
*(--dp) = hi_filler;
|
||||
@@ -1907,8 +1907,8 @@ png_do_read_filler(png_row_infop row_inf
|
||||
/* This changes the data from GG to XXGG */
|
||||
else
|
||||
{
|
||||
- png_bytep sp = row + (png_size_t)row_width;
|
||||
- png_bytep dp = sp + (png_size_t)row_width;
|
||||
+ png_bytep sp = row + (png_size_t)row_width * 2;
|
||||
+ png_bytep dp = sp + (png_size_t)row_width * 2;
|
||||
for (i = 0; i < row_width; i++)
|
||||
{
|
||||
*(--dp) = *(--sp);
|
||||
@@ -1965,8 +1965,8 @@ png_do_read_filler(png_row_infop row_inf
|
||||
/* This changes the data from RRGGBB to RRGGBBXX */
|
||||
if (flags & PNG_FLAG_FILLER_AFTER)
|
||||
{
|
||||
- png_bytep sp = row + (png_size_t)row_width * 3;
|
||||
- png_bytep dp = sp + (png_size_t)row_width;
|
||||
+ png_bytep sp = row + (png_size_t)row_width * 6;
|
||||
+ png_bytep dp = sp + (png_size_t)row_width * 2;
|
||||
for (i = 1; i < row_width; i++)
|
||||
{
|
||||
*(--dp) = hi_filler;
|
||||
@@ -1987,8 +1987,8 @@ png_do_read_filler(png_row_infop row_inf
|
||||
/* This changes the data from RRGGBB to XXRRGGBB */
|
||||
else
|
||||
{
|
||||
- png_bytep sp = row + (png_size_t)row_width * 3;
|
||||
- png_bytep dp = sp + (png_size_t)row_width;
|
||||
+ png_bytep sp = row + (png_size_t)row_width * 6;
|
||||
+ png_bytep dp = sp + (png_size_t)row_width * 2;
|
||||
for (i = 0; i < row_width; i++)
|
||||
{
|
||||
*(--dp) = *(--sp);
|
Loading…
Reference in a new issue