[Midnightbsd-cvs] mports: graphics/png: update to 1.2.35 to fix a buffer overflow.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Mar 5 11:32:19 EST 2009


Log Message:
-----------
update to 1.2.35 to fix a buffer overflow.  Rework the patch based on ctriv's earlier work (patch-aa)

Modified Files:
--------------
    mports/graphics/png:
        Makefile (r1.15 -> r1.16)
        distinfo (r1.10 -> r1.11)
        pkg-plist (r1.3 -> r1.4)
    mports/graphics/png/files:
        patch-aa (r1.5 -> r1.6)
        patch-ab (r1.7 -> r1.8)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/png/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L graphics/png/pkg-plist -L graphics/png/pkg-plist -u -r1.3 -r1.4
--- graphics/png/pkg-plist
+++ graphics/png/pkg-plist
@@ -2,14 +2,15 @@
 bin/libpng-config
 @exec ln -sf %f %D/bin/libpng12-config
 include/libpng/png.h
- at exec ln -sf libpng/png.h %D/include/png.h
+ at exec ln -sf libpng/%f %D/include/%f
 @unexec rm -f %D/include/%f
 include/libpng/pngconf.h
- at exec ln -sf libpng/pngconf.h %D/include/pngconf.h
+ at exec ln -sf libpng/%f %D/include/%f
 @unexec rm -f %D/include/%f
 lib/libpng.a
 lib/libpng.so
 lib/libpng.so.%%SHLIB_VER%%
 libdata/pkgconfig/libpng12.pc
-libdata/pkgconfig/libpng.pc
+ at exec ln -sf %f %D/libdata/pkgconfig/libpng.pc
+ at unexec rm -f %D/libdata/pkgconfig/libpng.pc
 @dirrm include/libpng
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/png/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -L graphics/png/Makefile -L graphics/png/Makefile -u -r1.15 -r1.16
--- graphics/png/Makefile
+++ graphics/png/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for:    PNG images library
-# Date created:         5 Dec 1995
-# Whom:                 ache
-#
 # $MidnightBSD$
-# $FreeBSD: ports/graphics/png/Makefile,v 1.78 2006/07/27 18:21:10 ache Exp $
-#
 
 PORTNAME=	png
-PORTVERSION=	1.2.32
+PORTVERSION=	1.2.35
 PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -16,7 +10,7 @@
 
 FAKE_OPTS=	trueprefix
 
-PATCH_SITES=	${MASTER_SITES}
+#PATCH_SITES=	${MASTER_SITES}
 #PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 #PATCHFILES=
 #PATCH_DIST_STRIP= -p1
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/png/distinfo,v
retrieving revision 1.10
retrieving revision 1.11
diff -L graphics/png/distinfo -L graphics/png/distinfo -u -r1.10 -r1.11
--- graphics/png/distinfo
+++ graphics/png/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpng-1.2.32.tar.bz2) = df4a20c6f24a6f642ae11c9a5a4ffa7f
-SHA256 (libpng-1.2.32.tar.bz2) = 928cd5f6aa2ccce97125a3add90479b901df902f27cefbb2052b89d92e7d757f
-SIZE (libpng-1.2.32.tar.bz2) = 639460
+MD5 (libpng-1.2.35.tar.bz2) = b8b8d09adf6bee2c5902c8e54c4f2e68
+SHA256 (libpng-1.2.35.tar.bz2) = cafe6431f9e6d561fb7b396bf94ff73a9cd0f4279f3eea2fc714ab90e345eee6
+SIZE (libpng-1.2.35.tar.bz2) = 650154
Index: patch-ab
===================================================================
RCS file: /home/cvs/mports/graphics/png/files/patch-ab,v
retrieving revision 1.7
retrieving revision 1.8
diff -L graphics/png/files/patch-ab -L graphics/png/files/patch-ab -u -r1.7 -r1.8
--- graphics/png/files/patch-ab
+++ graphics/png/files/patch-ab
@@ -12,7 +12,7 @@
  
  Name: libpng
  Description: Loads and saves PNG files
- Version: 1.2.32
+ Version: 1.2.35
 -Libs: -L${libdir} -lpng12
 +Libs: -L${libdir} -lpng -lz -lm
  Cflags: -I${includedir}
Index: patch-aa
===================================================================
RCS file: /home/cvs/mports/graphics/png/files/patch-aa,v
retrieving revision 1.5
retrieving revision 1.6
diff -L graphics/png/files/patch-aa -L graphics/png/files/patch-aa -u -r1.5 -r1.6
--- graphics/png/files/patch-aa
+++ graphics/png/files/patch-aa
@@ -1,5 +1,5 @@
---- ./scripts/makefile.freebsd.orig	2007-06-20 18:10:26 -0400
-+++ ./scripts/makefile.freebsd	2009-01-01 21:27:38 -0500
+--- scripts/makefile.freebsd.orig	2007-06-20 18:10:26 -0400
++++ scripts/makefile.freebsd	2009-03-05 11:29:34 -0500
 @@ -8,26 +8,22 @@
  LIB=		png
  SHLIB_MAJOR=	${SHLIB_VER}


More information about the Midnightbsd-cvs mailing list