Security update to png-1.2.12.

Fixes a buffer overflow vulnerability.

More information:
http://www.securityfocus.com/bid/18698/

ok steven@ naddy@
This commit is contained in:
bernd 2006-06-29 14:33:47 +00:00
parent 3dd4f38b07
commit fcc0136602
4 changed files with 24 additions and 25 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.56 2006/05/13 13:52:48 bernd Exp $
# $OpenBSD: Makefile,v 1.57 2006/06/29 14:33:47 bernd Exp $
COMMENT= "library for manipulating PNG images"
VERSION= 1.2.10
VERSION= 1.2.12
DISTNAME= libpng-${VERSION}
PKGNAME= ${DISTNAME:S/lib//}p0
SHARED_LIBS= png 5.0
PKGNAME= ${DISTNAME:S/lib//}
SHARED_LIBS= png 5.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/}

View File

@ -1,4 +1,4 @@
MD5 (libpng-1.2.10.tar.gz) = 720b4d636482405939dbdaa56ed2b8f6
RMD160 (libpng-1.2.10.tar.gz) = 4694e8d6e05d6b7ccd4cf29c484556355ecde4ad
SHA1 (libpng-1.2.10.tar.gz) = e9550b607c6e177f23c0837b19ac310a5f44e652
SIZE (libpng-1.2.10.tar.gz) = 832213
MD5 (libpng-1.2.12.tar.gz) = e82f39e46aac34a1ca559c79322979be
RMD160 (libpng-1.2.12.tar.gz) = c06b23123b02d98629fd05ac0427fee375aad981
SHA1 (libpng-1.2.12.tar.gz) = 66aa85d83773e9bed8b6b3a1e6daa3b8ad8658f2
SIZE (libpng-1.2.12.tar.gz) = 822835

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-scripts_libpng_pc_in,v 1.3 2006/05/10 13:50:01 bernd Exp $
--- scripts/libpng.pc.in.orig Fri Mar 3 03:48:03 2006
+++ scripts/libpng.pc.in Tue May 9 14:57:35 2006
$OpenBSD: patch-scripts_libpng_pc_in,v 1.4 2006/06/29 14:33:47 bernd Exp $
--- scripts/libpng.pc.in.orig Tue Jun 27 22:22:40 2006
+++ scripts/libpng.pc.in Thu Jun 29 10:52:35 2006
@@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@/libpng@PNGLIB_MAJOR@
-includedir=@includedir@/libpng12
+includedir=@includedir@
Name: libpng
Description: Loads and saves PNG files
Version: @PNGLIB_VERSION@
-Libs: -L${libdir} -lpng@PNGLIB_MAJOR@
Version: 1.2.12
-Libs: -L${libdir} -lpng12
+Libs: -L${libdir} -lpng -lz -lm
Cflags: -I${includedir}

View File

@ -1,23 +1,22 @@
$OpenBSD: patch-scripts_makefile_openbsd,v 1.15 2006/05/13 13:52:48 bernd Exp $
--- scripts/makefile.openbsd.orig Sun Apr 23 20:45:40 2006
+++ scripts/makefile.openbsd Sat May 13 13:21:46 2006
@@ -3,12 +3,12 @@
$OpenBSD: patch-scripts_makefile_openbsd,v 1.16 2006/06/29 14:33:47 bernd Exp $
--- scripts/makefile.openbsd.orig Tue Jun 27 22:22:40 2006
+++ scripts/makefile.openbsd Thu Jun 29 11:03:42 2006
@@ -3,11 +3,12 @@
# For conditions of distribution and use, see copyright notice in png.h
PREFIX?= /usr/local
+BINDIR= ${PREFIX}/bin
LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
+INCDIR= ${PREFIX}/include/libpng
+DOCDIR= ${PREFIX}/share/doc/png
+INCDIR= ${PREFIX}/include/libpng
+DOCDIR= ${PREFIX}/share/doc/png
-SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.10
-
-SHLIB_MINOR= 1.2.12
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
@@ -17,28 +17,46 @@ SRCS= png.c pngerror.c pnggccrd.c pngget
@@ -17,28 +18,46 @@ SRCS= png.c pngerror.c pnggccrd.c pngget
HDRS= png.h pngconf.h
CFLAGS+= -Wall
@ -70,7 +69,7 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.15 2006/05/13 13:52:48 bernd Exp $
fi
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
@@ -52,21 +70,24 @@ beforeinstall:
@@ -52,21 +71,24 @@ beforeinstall:
if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
fi