Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10606
Modified Files:
libpng-shlibs.patch
Log Message:
security update to 1.0.60
Index: libpng-shlibs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/libpng-shlibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libpng-shlibs.patch 24 Jan 2006 16:14:57 -0000 1.1
+++ libpng-shlibs.patch 3 Jun 2013 22:35:14 -0000 1.2
@@ -1,110 +1,71 @@
-diff -ruN libpng-1.0.12/scripts/makefile.darwin
libpng-1.0.12-patched/scripts/makefile.darwin
---- libpng-1.0.12/scripts/makefile.darwin Thu Jan 1 01:00:00 1970
-+++ libpng-1.0.12-patched/scripts/makefile.darwin Tue Jun 26 20:24:21 2001
-@@ -0,0 +1,106 @@
-+# makefile for libpng on Darwin / Mac OS X
-+# Copyright (C) 2001 Christoph Pfisterer
-+# derived from makefile.linux:
-+# Copyright (C) 1998, 1999 Greg Roelofs
-+# Copyright (C) 1996, 1997 Andreas Dilger
-+# For conditions of distribution and use, see copyright notice in png.h
-+
-+# where "make install" puts libpng.a, libpng.dylib, png.h and pngconf.h
-+prefix=/usr/local
-+
-+# Where the zlib library and include files are located
-+#ZLIBLIB=/usr/local/lib
-+#ZLIBINC=/usr/local/include
-+ZLIBLIB=../zlib
-+ZLIBINC=../zlib
-+
-+CC=cc
-+CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
-+LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz
-+
-+#RANLIB=echo
-+RANLIB=ranlib
-+
-+# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
-+# have to change it.
-+PNGMAJ = 2
-+PNGMIN = 1.0.12
-+PNGVER = $(PNGMAJ).$(PNGMIN)
-+
-+INCPATH=$(prefix)/include
-+LIBPATH=$(prefix)/lib
-+
-+OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
-+ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
-+ pngwtran.o pngmem.o pngerror.o pngpread.o
-+
-+OBJSDLL = $(OBJS:.o=.pic.o)
-+
-+.SUFFIXES: .c .o .pic.o
-+
-+.c.pic.o:
-+ $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
-+
-+all: libpng.a libpng.dylib pngtest
-+
-+libpng.a: $(OBJS)
-+ ar rc $@ $(OBJS)
-+ $(RANLIB) $@
-+
-+libpng.dylib: libpng.$(PNGMAJ).dylib
-+ ln -sf libpng.$(PNGMAJ).dylib libpng.dylib
-+
-+libpng.$(PNGMAJ).dylib: libpng.$(PNGVER).dylib
-+ ln -sf libpng.$(PNGVER).dylib libpng.$(PNGMAJ).dylib
-+
-+libpng.$(PNGVER).dylib: $(OBJSDLL)
-+ $(CC) -dynamiclib \
-+ -install_name $(LIBPATH)/libpng.$(PNGMAJ).dylib \
-+ -current_version $(PNGMIN) -compatibility_version $(PNGMIN) \
-+ -o libpng.$(PNGVER).dylib \
-+ $(OBJSDLL) -L$(ZLIBLIB) -lz
-+
-+pngtest: pngtest.o libpng.dylib
-+ $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-+
-+test: pngtest
-+ ./pngtest
-+
-+install: libpng.a libpng.dylib
-+ -@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi
-+ -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi
-+ cp png.h pngconf.h $(INCPATH)
-+ chmod 644 $(INCPATH)/png.h $(INCPATH)/pngconf.h
-+ cp libpng.a libpng.$(PNGVER).dylib $(LIBPATH)
-+ chmod 755 $(LIBPATH)/libpng.$(PNGVER).dylib
-+ ranlib $(LIBPATH)/libpng.a
-+ -@/bin/rm -f $(LIBPATH)/libpng.$(PNGMAJ).dylib $(LIBPATH)/libpng.dylib
-+ (cd $(LIBPATH); ln -sf libpng.$(PNGVER).dylib libpng.$(PNGMAJ).dylib; \
-+ ln -sf libpng.$(PNGMAJ).dylib libpng.dylib)
-+
-+clean:
-+ rm -f *.o libpng.a libpng.*dylib pngtest pngout.png
-+
-+DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
-+writelock:
-+ chmod a-w *.[ch35] $(DOCS) scripts/*
-+
-+# DO NOT DELETE THIS LINE -- make depend depends on it.
-+
-+png.o png.pic.o: png.h pngconf.h
-+pngerror.o pngerror.pic.o: png.h pngconf.h
-+pngrio.o pngrio.pic.o: png.h pngconf.h
-+pngwio.o pngwio.pic.o: png.h pngconf.h
-+pngmem.o pngmem.pic.o: png.h pngconf.h
-+pngset.o pngset.pic.o: png.h pngconf.h
-+pngget.o pngget.pic.o: png.h pngconf.h
-+pngread.o pngread.pic.o: png.h pngconf.h
-+pngrtran.o pngrtran.pic.o: png.h pngconf.h
-+pngrutil.o pngrutil.pic.o: png.h pngconf.h
-+pngtrans.o pngtrans.pic.o: png.h pngconf.h
-+pngwrite.o pngwrite.pic.o: png.h pngconf.h
-+pngwtran.o pngwtran.pic.o: png.h pngconf.h
-+pngwutil.o pngwutil.pic.o: png.h pngconf.h
-+pngpread.o pngpread.pic.o: png.h pngconf.h
-+
-+pngtest.o: png.h pngconf.h
+--- libpng-1.0.60/scripts/makefile.darwin.orig 2013-06-02 15:15:50.000000000
-0400
++++ libpng-1.0.60/scripts/makefile.darwin 2013-06-02 15:17:04.000000000
-0400
+@@ -10,7 +10,7 @@
+ # and license in png.h
+
+ # where "make install" puts libpng.a, libpng10.dylib, png.h and pngconf.h
+-prefix=/usr/local
++prefix=@FINKPREFIX@
+ exec_prefix=$(prefix)
+
+ # Where the zlib library and include files are located
+@@ -58,7 +58,7 @@
+ # If you're going to install into a temporary location
+ # via DESTDIR, $(DESTDIR)$(prefix) must already exist before
+ # you execute make install.
+-DESTDIR=
++DESTDIR=${DESTDIR}
+
+ DB=$(DESTDIR)$(BINPATH)
+ DI=$(DESTDIR)$(INCPATH)
+@@ -101,21 +101,18 @@
+ $(LIBSO): $(LIBSOMAJ)
+ $(LN_SF) $(LIBSOMAJ) $(LIBSO)
+
+-$(LIBSOMAJ): $(LIBSOVER)
+- $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
+-
+-$(LIBSOVER): $(OBJSDLL)
++$(LIBSOMAJ): $(OBJSDLL)
+ $(CC) -dynamiclib \
+ -install_name $(LIBPATH)/$(LIBSOMAJ) \
+ -current_version 0 -compatibility_version 0 \
+- -o $(LIBSOVER) \
++ -o $(LIBSOMAJ) \
+ $(OBJSDLL) -L$(ZLIBLIB) -lz
+
+ $(OLDSOVER): $(OBJSDLL)
+ $(CC) -dynamiclib \
+ -install_name $(LIBPATH)/$(OLDSOMAJ) \
+ -current_version 2 -compatibility_version 2 \
+- -o $(OLDSOVER) \
++ -o $(OLDSOMAJ) \
+ $(OBJSDLL) -L$(ZLIBLIB) -lz
+
+ pngtest: pngtest.o $(LIBSO)
+@@ -150,21 +147,10 @@
+ -@$(RM_F) $(DL)/$(OLDSO)
+ -@$(RM_F) $(DL)/$(OLDSOMAJ)
+ -@$(RM_F) $(DL)/libpng.3.$(PNGMIN)*.dylib
+- cp $(LIBSOVER) $(DL)
+- cp $(OLDSOVER) $(DL)
+- chmod 755 $(DL)/$(LIBSOVER)
+- chmod 755 $(DL)/$(OLDSOVER)
+- (cd $(DL); \
+- $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
+- $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
+- $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
+- $(LN_SF) $(LIBSOMAJ) $(LIBSO))
+- -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
+- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
+- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
+- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
+- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
+- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
++ cp $(LIBSOMAJ) $(DL)
++ cp $(OLDSOMAJ) $(DL)
++ chmod 755 $(DL)/$(LIBSOMAJ)
++ chmod 755 $(DL)/$(OLDSOMAJ)
+
+ install-man: libpng.3 libpngpf.3 png.5
+ -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
