From e4b75638052fd0a850014dece4b0c27e0349a027 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 26 Apr 2012 08:23:22 -0500 Subject: [PATCH] [libpng14] Added -lssp_nonshared to a comment in scripts/makefile.freebsd --- ANNOUNCE | 7 +------ scripts/makefile.freebsd | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index f7cd46235..72934072b 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -24,12 +24,7 @@ Other information: 1.4.12beta01-README.txt 1.4.12beta01-LICENSE.txt -Changes since the last public release (1.4.10): - -version 1.4.11 [March 29, 2012] - Revised png_set_text_2() to avoid potential memory corruption (fixes - CVE-2011-3048). - Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice. +Changes since the last public release (1.4.11): version 1.4.12 [April 26, 2012] diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index c0014afbd..9f6522128 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -24,7 +24,10 @@ MAN= libpng.3 libpngpf.3 png.5 MANDIR= /man/man SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ libpng/pngconf.h ${INCSDIR}/../pngconf.h + LDADD+= -lm -lz +# LDADD+= -lm -lz -lssp_nonshared # for OSVERSION >= 800000 ? + DPADD+= ${LIBM} ${LIBZ} CFLAGS+= -I.