df247d8854
Fixes CVE-2010-1205. ok naddy@
99 lines
3.3 KiB
Plaintext
99 lines
3.3 KiB
Plaintext
$OpenBSD: patch-scripts_makefile_openbsd,v 1.31 2010/06/27 19:55:04 kili Exp $
|
|
--- scripts/makefile.openbsd.orig Sat Jun 26 02:31:16 2010
|
|
+++ scripts/makefile.openbsd Sun Jun 27 08:39:13 2010
|
|
@@ -7,11 +7,12 @@
|
|
# and license 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
|
|
|
|
-SHLIB_MAJOR= 0
|
|
-SHLIB_MINOR= 1.2.44
|
|
|
|
LIB= png
|
|
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
|
|
@@ -25,24 +26,42 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE
|
|
|
|
NOPROFILE= Yes
|
|
|
|
-CLEANFILES+= pngtest.o pngtest
|
|
+CLEANFILES+= pngtest.o pngtest libpng-config
|
|
|
|
MAN= libpng.3 libpngpf.3 png.5
|
|
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO libpng.txt
|
|
+DOCS = libpng-1.2.44.txt
|
|
|
|
+all: ${_LIBS} libpng-config libpng.pc
|
|
+
|
|
+libpng.pc:
|
|
+ cat scripts/libpng.pc.in | sed -e s\!@prefix@!$(PREFIX)! \
|
|
+ -e s\!@exec_prefix@!$(BINDIR)! -e s\!@libdir@!$(LIBDIR)! \
|
|
+ -e s\!@includedir@!$(INCDIR)! \
|
|
+ -e s\!@PNGLIB_VERSION@!$(PNGLIB_VERSION)!> libpng.pc
|
|
+
|
|
+libpng-config:
|
|
+ ( cat scripts/libpng-config-head.in; \
|
|
+ echo prefix=\"$(PREFIX)\"; \
|
|
+ echo I_opts=\"-I$(INCDIR)\"; \
|
|
+ echo L_opts=\"-L$(LIBDIR)\"; \
|
|
+ echo R_opts=\"-Wl,-rpath,$(LIBDIR)\"; \
|
|
+ echo libs=\"-lpng -lz -lm\"; \
|
|
+ cat scripts/libpng-config-body.in ) > libpng-config
|
|
+ chmod +x libpng-config
|
|
+
|
|
pngtest.o: pngtest.c
|
|
${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
|
|
|
|
pngtest: pngtest.o
|
|
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm
|
|
|
|
-test: pngtest
|
|
+test regress: pngtest
|
|
cd ${.OBJDIR} && env \
|
|
LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
|
|
|
|
beforeinstall:
|
|
- if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
|
|
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \
|
|
+ if [ ! -d ${DESTDIR}${INCDIR} ]; then \
|
|
+ ${INSTALL} -d -o root -g wheel ${DESTDIR}${INCDIR}; \
|
|
fi
|
|
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
|
|
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
|
|
@@ -56,21 +75,24 @@ beforeinstall:
|
|
if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
|
|
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
|
|
fi
|
|
- if [ ! -d ${DESTDIR}${PREFIX}/share/doc/png ]; then \
|
|
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/share/doc/png; \
|
|
+ if [ ! -d ${DESTDIR}${DOCDIR} ]; then \
|
|
+ ${INSTALL} -d -o root -g wheel ${DESTDIR}${DOCDIR}; \
|
|
fi
|
|
+ if [ ! -d ${DESTDIR}${LIBDIR}/pkgconfig ]; then \
|
|
+ ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}/pkgconfig; \
|
|
+ fi
|
|
|
|
afterinstall:
|
|
@rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a
|
|
@rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a
|
|
- @rm -f ${DESTDIR}${PREFIX}/include/png.h
|
|
- @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
|
|
@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
|
|
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
|
|
+ -m ${BINMODE} libpng-config ${DESTDIR}${BINDIR}
|
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
|
- -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
|
+ -m ${NONBINMODE} ${HDRS} ${DESTDIR}${INCDIR}
|
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
|
- -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
|
+ -m ${NONBINMODE} libpng.pc ${DESTDIR}${LIBDIR}/pkgconfig
|
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
|
- -m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
|
|
+ -m ${NONBINMODE} ${DOCS} ${DESTDIR}${DOCDIR}
|
|
|
|
.include <bsd.lib.mk>
|