head 1.10; access; symbols pkgsrc-2013Q2:1.10.0.8 pkgsrc-2013Q2-base:1.10 pkgsrc-2012Q4:1.10.0.6 pkgsrc-2012Q4-base:1.10 pkgsrc-2011Q4:1.10.0.4 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q2:1.10.0.2 pkgsrc-2011Q2-base:1.10 pkgsrc-2010Q4:1.9.0.4 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.2 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.8.0.8 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.6 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.4 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.2 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.7.0.14 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.12 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.10 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.8 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.6 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.4 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.2 pkgsrc-2008Q1:1.6.0.10 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.8 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.6 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.4 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.2 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.5.0.6 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.4 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.2 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.3.0.14 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.12 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.10 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.8 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.6 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.4 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.2 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.2.0.8 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2; locks; strict; comment @# @; 1.10 date 2011.01.23.11.24.54; author wiz; state dead; branches; next 1.9; 1.9 date 2010.09.24.08.58.41; author wiz; state Exp; branches; next 1.8; 1.8 date 2009.08.15.17.29.18; author wiz; state Exp; branches; next 1.7; 1.7 date 2008.05.20.12.07.39; author wiz; state Exp; branches; next 1.6; 1.6 date 2007.01.03.16.23.10; author tv; state Exp; branches; next 1.5; 1.5 date 2006.04.17.13.44.46; author wiz; state dead; branches 1.5.6.1; next 1.4; 1.4 date 2006.04.16.23.19.15; author wiz; state Exp; branches; next 1.3; 1.3 date 2004.08.06.09.25.18; author drochner; state dead; branches; next 1.2; 1.2 date 2002.12.20.17.54.28; author fredb; state Exp; branches; next 1.1; 1.1 date 2002.12.19.21.25.10; author fredb; state Exp; branches; next ; 1.5.6.1 date 2007.01.04.15.09.26; author salo; state Exp; branches; next ; desc @@ 1.10 log @Update to 1.5.1beta08. Integrates a better version of patch-ac and tries to fix the Solaris build problem reported in PR 44428. Version 1.5.1beta07 [January 22, 2011] In the manual, describe the png_get_IHDR() arguments in the correct order. Added const_png_structp and const_png_infop types, and used them in prototypes for most png_get_*() functions. Version 1.5.1beta08 [January 23, 2011] Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name() Added synopses for the IO_STATE functions and other missing synopses to the manual. Removed the synopses from libpngpf.3 because they were out of date and no longer useful. Better information can be obtained by reading the prototypes and comments in pngpriv.h Attempted to fix cpp on Solaris with S. Studio 12 cc, fix build Added a make macro DFNCPP that is a CPP that will accept the tokens in a .dfn file and adds configure stuff to test for such a CPP. ./configure should fail if one is not available. Corrected const_png_ in png.h to png_const_ to avoid polluting the namespace. Added png_get_current_row_number and png_get_current_pass_number for the benefit of the user transform callback. Added png_process_data_pause and png_process_data_skip for the benefit of progressive readers that need to stop data processing or want to optimize skipping of unread data (e.g., if the reader marks a chunk to be skipped.) @ text @$NetBSD: patch-ac,v 1.9 2010/09/24 08:58:41 wiz Exp $ --- configure.orig 2010-09-23 12:18:42.000000000 +0000 +++ configure @@@@ -11567,7 +11567,7 @@@@ $as_echo "no" >&6; } ;; * ) GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` -if test "$GLD"; then +if test "$GLD" && test "`uname -s`" != "Interix"; then have_ld_version_script=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @ 1.9 log @Update to 1.4.4: version 1.4.4beta01 [July 12, 2010] Removed extraneous new_push_process_row.c file. Revised the "SEE ALSO" style of libpng.3, libpngpf.3, and png.5 Removed some newly-added TAB characters from pngpread.c. Fixed some indentation in pngpread.c and pngrutil.c Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans) Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {') Put "#ifndef PNG_EXTERN, #endif" around "#define PNG_EXTERN" in pngpriv.h version 1.4.4beta02 [July 24, 2010] Added -DNO_PNG_SNPRINTF to CFLAGS in scripts/makefile.dj2 Moved the definition of png_snprintf() outside of the enclosing #ifdef blocks in pngconf.h Added a special case typedef of png_longjmp_ptr for WATCOM. version 1.4.4beta03 [July 24, 2010] Removed reference to cbuilder5/* from Makefile.in and Makefile.am Eliminated the new special case typedef of png_longjmp_ptr for WATCOM and made a special case "#define PNGAPI" in pngconf.h instead. version 1.4.4beta04 [July 31, 2010] Updated the read macros and functions from 1.5.0beta38. version 1.4.4beta05 [August 6, 2010] Updated projects/visualc71 so it can find scripts/pnglibconf.h Removed unused png_mem_* defines from pngconf.h. Correct use of _WINDOWS_ in pngconf.h version 1.4.4beta06 [August 11, 2010] Don't try to use version-script with cygwin/mingw. Revised contrib/gregbook to work under cygwin/mingw. version 1.4.4beta07 [August 26, 2010] Updated prebuilt aclocal.m4 and ltmain.sh Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) Updated CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for installing libpng in /usr/lib64 (Funda Wang). Revised CMakeLists.txt to put the man pages in share/man/man* not man/man* Revised CMakeLists.txt to make symlinks instead of copies when installing. Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman) Moved "#include pngusr.h" ahead of PNG_USER_PRIVATEBUILD test in pngconf.h Eliminated a deprecated reference to png_ptr->io_ptr in pngtest.c Eliminated new unnecessary #if tests regarding the sCAL chunk from pngrutil.c version 1.4.4beta08 [September 2, 2010] Updated the xcode project to work with libpng-1.4.x and added iOS targets for simulator and device (Philippe Hausler). version 1.4.4rc01 [September 10, 2010] No changes. version 1.4.4rc02 [September 13, 2010] Revised CMakeLists.txt (Philip Lowman). version 1.4.4rc03 [September 14, 2010] Removed an extraneous close-double-quote from CMakeLists.txt Eliminated another deprecated reference to png_ptr->io_ptr in pngtest.c version 1.4.4rc04 [September 16, 2010] Fixed indentation and removed debugging message from CMakeLists.txt Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER, $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE version 1.4.4rc05 [September 20, 2010] Rebuilt configure scripts with automake-1.11.1 instead of automake-1.11. Removed unused mkinstalldirs file. version 1.4.4 [September 23, 2010] No changes. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2009/08/15 17:29:18 wiz Exp $ @ 1.8 log @Update to 1.2.39. Use .xz instead of .gz. (20% smaller) version 1.2.39beta01 [July 25, 2009] Added a prototype for png_64bit_product() in png.c version 1.2.39beta02 [July 27, 2009] Avoid a possible NULL dereference in debug build, in png_set_text_2(). (bug introduced in libpng-0.95, discovered by Evan Rouault) version 1.2.39beta03 [July 29, 2009] Relocated new png_64_bit_product() prototype into png.h Expanded the information about prototypes in the libpng style section of the documentation. Rebuilt configure scripts with autoconf-2.64. version 1.2.39beta04 [August 1, 2009] Replaced *.tar.lzma with *.txz in distribution. Get the xz codec from . version 1.2.39beta05 [August 1, 2009] Reject attempt to write iCCP chunk with negative embedded profile length (JD Chen) version 1.2.39c01 [August 6, 2009] No changes. version 1.2.39 and 1.0.48 [August 13, 2009] No changes. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2008/05/20 12:07:39 wiz Exp $ d3 1 a3 1 --- configure.orig 2009-08-13 11:13:36.000000000 +0000 d5 3 a7 3 @@@@ -11424,7 +11424,7 @@@@ LIBPNG_DEFINES=$LIBPNG_DEFINES\ $LIBPNG_ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" >&5 $as_echo_n "checking if libraries can be versioned... " >&6; } @ 1.7 log @Update to 1.2.29: version 1.2.27beta04 [April 18, 2008] Added AC_LIBTOOL_WIN32_DLL to configure.ac Rebuilt Makefile.in, aclocal.m4, and configure with autoconf-2.62 version 1.2.27beta05 [April 19, 2008] Added MAINTEINERCLEANFILES variable to Makefile.am version 1.2.27beta06 [April 21, 2008] Avoid changing color_type from GRAY to RGB by png_set_expand_gray_1_2_4_to_8(). version 1.2.27rc01 [April 23, 2008] Fix broken URL for rfc2083 in png.5 and libpng-*.txt version 1.0.33 and 1.2.27 [April 30, 2008] No changes. version 1.0.34 and 1.2.28 [April 30, 2008] Rebuilt Makefile.in, aclocal.m4, and configure with autoconf-2.61 due to backward incompatibilities. Removed a stray object file from contrib/gregbook version 1.2.29beta01 [May 1, 2008] Removed some stray *.diff and *.orig files version 1.2.29beta02 [May 1, 2008] Reverted Makefile.in, aclocal.m4, and configure to the libpng-1.2.26 versions. version 1.2.29beta03 [May 2, 2008] Added --force to autogen libtoolize options and --force-missing to automake options. Changed $(ECHO) to echo in Makefile.am and Makefile.in Updated all configure files to autoconf-2.62 #ifdef out pnggcrd.c code if using MSC_VER version 1.2.29rc01 [May 4, 2008] No changes. version 1.0.35 and 1.2.29 [May 8, 2008] No changes. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2007/01/03 16:23:10 tv Exp $ d3 1 a3 1 --- configure.orig 2008-05-08 13:58:30.000000000 +0200 d5 2 a6 2 @@@@ -12584,7 +12584,7 @@@@ LIBPNG_DEFINES=$LIBPNG_DEFINES\ $LIBPNG_ { $as_echo "$as_me:$LINENO: checking if libraries can be versioned" >&5 d12 1 a12 1 { $as_echo "$as_me:$LINENO: result: yes" >&5 @ 1.6 log @Don't allow "ld --version-script" on Interix. Fixes PR pkg/35210. Based on patch idea from Aleksey Cheusov . (Sanity tested for breakage on a non-Interix platform, NetBSD.) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2006-11-28 11:26:14.000000000 -0500 d5 3 a7 3 @@@@ -21341,7 +21341,7 @@@@ fi { echo "$as_me:$LINENO: checking if libraries can be versioned" >&5 echo $ECHO_N "checking if libraries can be versioned... $ECHO_C" >&6; } d12 2 a13 2 { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } @ 1.5 log @Update to 1.2.9nb2 (hopefully final update for this weekend): . add rpath to libpng-config output . link against libpng12 (instead of libpng) in all cases. The latter causes shlib dependency changes, so update BUILDLINK_ABI_DEPENDS.png. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2006/04/16 23:19:15 wiz Exp $ d3 11 a13 9 --- scripts/libpng.pc.in.orig 2006-03-03 02:48:03.000000000 +0000 +++ scripts/libpng.pc.in @@@@ -6,5 +6,5 @@@@ includedir=@@includedir@@/libpng@@PNGLIB_MA Name: libpng Description: Loads and saves PNG files Version: @@PNGLIB_VERSION@@ -Libs: -L${libdir} -lpng@@PNGLIB_MAJOR@@ +Libs: -L${libdir} -lpng Cflags: -I${includedir} @ 1.5.6.1 log @Pullup ticket 1973 - requested by tv portability fix for png Revisions pulled up: - pkgsrc/graphics/png/Makefile 1.87, 1.88 - pkgsrc/graphics/png/buildlink3.mk 1.18, 1.19, 1.20 - pkgsrc/graphics/png/distinfo 1.35 - pkgsrc/graphics/png/patches/patch-ac 1.6 Module Name: pkgsrc Committed By: tv Date: Wed Jan 3 16:23:10 UTC 2007 Modified Files: pkgsrc/graphics/png: Makefile buildlink3.mk distinfo Added Files: pkgsrc/graphics/png/patches: patch-ac Log Message: Don't allow "ld --version-script" on Interix. Fixes PR pkg/35210. Based on patch idea from Aleksey Cheusov . (Sanity tested for breakage on a non-Interix platform, NetBSD.) --- Module Name: pkgsrc Committed By: joerg Date: Wed Jan 3 19:54:12 UTC 2007 Modified Files: pkgsrc/graphics/png: buildlink3.mk Log Message: Include bsd.fast.prefs.mk before accessing OPSYS. --- Module Name: pkgsrc Committed By: rillig Date: Wed Jan 3 20:38:46 UTC 2007 Modified Files: pkgsrc/graphics/png: Makefile buildlink3.mk Log Message: Fixed pkglint warnings. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2007/01/03 16:23:10 tv Exp $ d3 9 a11 11 --- configure.orig 2006-11-28 11:26:14.000000000 -0500 +++ configure @@@@ -21341,7 +21341,7 @@@@ fi { echo "$as_me:$LINENO: checking if libraries can be versioned" >&5 echo $ECHO_N "checking if libraries can be versioned... $ECHO_C" >&6; } GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` -if test "$GLD"; then +if test "$GLD" && test "`uname -s`" != "Interix"; then have_ld_version_script=yes { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } @ 1.4 log @Update to 1.2.9nb1: . pngconf.h included "config.h" if HAVE_CONFIG_H is defined -- really not a good idea, patch it out. broke at least libwmf, reported by veego@@ . install some libpng12 files -- IIUC, libpng12* is the future and libpng* is becoming obsolete -- at least according to the wishes of the authors. Don't follow this completely yet, but still patch the pkg-config file to link against -lpng instead of -lpng12, which would require a recursive PKGREVISION bump. We should probably do this at some future time. . switch pkgconfig file to look for headers in include/libpng12 -- the headers still exist in include/ for backwards compatibility. . switch to using GNU_CONFIGURE and the included libtool handling instead of patching in our own into a Makefile. Gets rid of patches and pkgsrc Makefile code. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @update to 1.2.6rc1, fixes some security issues, see http://scary.beasts.org/security/CESA-2004-001.txt @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2002/12/20 17:54:28 fredb Exp $ d3 9 a11 46 --- pngrtran.c.orig Thu Oct 3 06:32:29 2002 +++ pngrtran.c @@@@ -1889,8 +1889,8 @@@@ /* 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 @@@@ /* 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 @@@@ /* 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 @@@@ /* 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); @ 1.2 log @Fix another bug in png_do_read_filler() regarding 16-big *grayscale* images (and bump package to 1.2.5nb2). The following is taken directly from the png-implement mailing list... Date: Fri, 20 Dec 2002 11:26:31 -0500 From: Glenn Randers-Pehrson Reply-To: png-implement@@ccrc.wustl.edu To: png-implement@@ccrc.wustl.edu Subject: Re: [png-implement] bug in png_read_filler() with 16-bit samples At 01:01 AM 12/5/02 -0500, Glenn Randers-Pehrson wrote: >A bug has turned up in png_read_filler() with 16-bit samples. >The starting offsets for the loops are calculated incorrectly >which causes a buffer overrun beyond the beginning of the row >buffer. > >To fix, at lines 1968 and 1990, >change "row_width * 3" to "row_width * 6" >and at lines 1969 and 1991, >change "row_width;" to "row_width * 2;" This is only half of the story. Adding an alpha channel to 16-bit *grayscale* images with png_do_read_filler() exhibits the same bug, and pngcrush crashes if I try to do it. To fix, at lines 1892, 1893, 1910, and 1911 of pngrtran.c change "row_width" to "row_width * 2" Note that applications that do not add an alpha channel via png_set_filler(), and any applications that do, but reduce 16-bit samples to 8 bit via png_set_strip_16() are invulnerable to the bug. Pngcrush is the only application that I know of that uses png_set_filler() without also using png_set_strip_16(). Glenn -- Send the message body "help" to png-implement-request@@ccrc.wustl.edu @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Fix a buffer overrun in png_do_read_filler() with 16-bit samples, as reported to the png-implement mailing list by Glenn Randers-Pehrson: ftp://swrinde.nde.swri.edu/pub/png-group/archives/png-implement.200212 [Glenn Randers-Pehrson is the original author and chief maintainer of libpng.] From the discussion in the archive, it appears to be unlikely that the bug could be exploited by a malicious web-server, chiefly because the operation that triggers it is more likely to be carried out by an image manipulation program (i.e. pngcrush), than by a web browser. @ text @d5 23 a27 1 @@@@ -1965,8 +1965,8 @@@@ png_do_read_filler(png_row_infop row_inf d38 1 a38 1 @@@@ -1987,8 +1987,8 @@@@ png_do_read_filler(png_row_infop row_inf @