From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 3 19:10:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49E3D1065677 for ; Mon, 3 Mar 2008 19:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3827A8FC1B for ; Mon, 3 Mar 2008 19:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m23JA3aY065315 for ; Mon, 3 Mar 2008 19:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m23JA2WS065308; Mon, 3 Mar 2008 19:10:02 GMT (envelope-from gnats) Resent-Date: Mon, 3 Mar 2008 19:10:02 GMT Resent-Message-Id: <200803031910.m23JA2WS065308@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, bf Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 278411065671 for ; Mon, 3 Mar 2008 19:06:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 27ACB8FC1F for ; Mon, 3 Mar 2008 19:06:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m23J3Ccd046110 for ; Mon, 3 Mar 2008 19:03:12 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m23J3CdT046109; Mon, 3 Mar 2008 19:03:12 GMT (envelope-from nobody) Message-Id: <200803031903.m23J3CdT046109@www.freebsd.org> Date: Mon, 3 Mar 2008 19:03:12 GMT From: bf To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/121328: [PATCH]graphics/png: update to 1.2.25 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Mar 2008 19:10:03 -0000 >Number: 121328 >Category: ports >Synopsis: [PATCH]graphics/png: update to 1.2.25 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Mar 03 19:10:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: bf >Release: 7-STABLE i386 >Organization: >Environment: >Description: "... fixes a double-gamma-correction bug on colormapped images with partially transparent palette entries, as well as a number of problems (believed to be benign) that were found by the Coverity static-analysis tool." "Most versions of libpng up through 1.2.24 have a number of minor coding errors that could lead to crashes in exceptional cases. For example, if memory allocation fails while processing certain ancillary chunks, libpng could crash while attempting to write to the NULL pointer; or if the application author failed to set up the info_ptr as required, some parts of libpng fail to check for NULL and could crash trying to read the pointer (though it's probable that the error would have caused libpng to terminate upstream of these parts). The bugs are fixed in version 1.2.25, released 18 February 2008." >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN png.orig/Makefile png/Makefile --- png.orig/Makefile 2008-03-03 13:31:39.772549769 -0500 +++ png/Makefile 2008-03-03 13:31:54.277387395 -0500 @@ -6,25 +6,19 @@ # PORTNAME= png -PORTVERSION= 1.2.23 -PORTREVISION= 1 +PORTVERSION= 1.2.25 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lib${PORTNAME} DISTNAME= lib${PORTNAME}-${PORTVERSION} -PATCH_SITES= ${MASTER_SITES} -#PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -#PATCHFILES= -#PATCH_DIST_STRIP= -p1 - MAINTAINER= ache@FreeBSD.org COMMENT= Library for manipulating PNG images MAKEFILE= ${WRKSRC}/scripts/makefile.freebsd ALL_TARGET= all libpng-config test MAKE_FLAGS= ccopts="${CFLAGS}" ldopts="${LDFLAGS}" -f -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SHLIB_VER= 5 USE_BZIP2= yes diff -ruN png.orig/distinfo png/distinfo --- png.orig/distinfo 2008-03-03 13:31:39.772549769 -0500 +++ png/distinfo 2008-03-03 13:31:54.277387395 -0500 @@ -1,3 +1,3 @@ -MD5 (libpng-1.2.23.tar.bz2) = b1b3794a8b80dd298d4d216f4886ad52 -SHA256 (libpng-1.2.23.tar.bz2) = 87da54b8b03156d0ff6d4904e01f2afaf12c712f628f43c5f499704379c2b478 -SIZE (libpng-1.2.23.tar.bz2) = 614843 +MD5 (libpng-1.2.25.tar.bz2) = 0c1df914de7fd3b6a129af569889c856 +SHA256 (libpng-1.2.25.tar.bz2) = 2e92eada0c32d5e49da5617d389e43bc27a18bdca4b8d7badb7fee931d157ce0 +SIZE (libpng-1.2.25.tar.bz2) = 638262 diff -ruN png.orig/files/patch-ab png/files/patch-ab --- png.orig/files/patch-ab 2008-03-03 13:31:39.768547585 -0500 +++ png/files/patch-ab 1969-12-31 19:00:00.000000000 -0500 @@ -1,18 +0,0 @@ ---- scripts/libpng.pc.in.orig Wed Jun 28 00:22:40 2006 -+++ scripts/libpng.pc.in Sun Jul 23 10:56:25 2006 -@@ -1,10 +1,10 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@/libpng12 -+prefix=@PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include - - Name: libpng - Description: Loads and saves PNG files - Version: 1.2.23 --Libs: -L${libdir} -lpng12 -+Libs: -L${libdir} -lpng -lz -lm - Cflags: -I${includedir} diff -ruN png.orig/files/patch-ad png/files/patch-ad --- png.orig/files/patch-ad 2008-03-03 13:31:39.768547585 -0500 +++ png/files/patch-ad 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ ---- pngconf.h.orig 2007-10-04 15:53:09.000000000 +0400 -+++ pngconf.h 2007-10-13 17:31:06.000000000 +0400 -@@ -737,7 +737,7 @@ - # endif - #endif - --#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) -+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__) - # ifndef PNG_ASSEMBLER_CODE_SUPPORTED - # define PNG_ASSEMBLER_CODE_SUPPORTED - # endif diff -ruN png.orig/files/patch-pngconf.h png/files/patch-pngconf.h --- png.orig/files/patch-pngconf.h 1969-12-31 19:00:00.000000000 -0500 +++ png/files/patch-pngconf.h 2008-03-03 13:31:54.277387395 -0500 @@ -0,0 +1,11 @@ +--- pngconf.h.orig 2008-03-03 12:26:00.438934464 -0500 ++++ pngconf.h 2008-03-03 12:27:33.024234271 -0500 +@@ -742,7 +742,7 @@ + # endif + #endif + +-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) ++#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__) + # ifndef PNG_ASSEMBLER_CODE_SUPPORTED + # define PNG_ASSEMBLER_CODE_SUPPORTED + # endif diff -ruN png.orig/files/patch-scripts+libpng.pc.in png/files/patch-scripts+libpng.pc.in --- png.orig/files/patch-scripts+libpng.pc.in 1969-12-31 19:00:00.000000000 -0500 +++ png/files/patch-scripts+libpng.pc.in 2008-03-03 13:47:10.293847029 -0500 @@ -0,0 +1,18 @@ +--- scripts/libpng.pc.in.orig 2008-03-03 13:40:05.365510327 -0500 ++++ scripts/libpng.pc.in 2008-03-03 13:45:11.163017831 -0500 +@@ -1,10 +1,10 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@/libpng12 ++prefix=@PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include + + Name: libpng + Description: Loads and saves PNG files + Version: 1.2.25 +-Libs: -L${libdir} -lpng12 ++Libs: -L${libdir} -lpng -lz -lm + Cflags: -I${includedir} >Release-Note: >Audit-Trail: >Unformatted: