Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b1a32d2b23ab8864893510051c417bf80eb7e63e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b1a32d2b23ab8864893510051c417bf80eb7e63e)
  • Date: Sat, 29 Jan 2011 18:25:31 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

graphics/xzgv/BUILD | 9 -
graphics/xzgv/DEPENDS | 7
graphics/xzgv/DETAILS | 11 -
graphics/xzgv/HISTORY | 6
graphics/xzgv/INSTALL | 5
graphics/xzgv/xzgv-0.8-integer-overflow-fix.diff | 197
-----------------------
6 files changed, 25 insertions(+), 210 deletions(-)

New commits:
commit 0b32f693f26395553353e892f35cfb555fc861b6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/xzgv: version 0.9.1

diff --git a/graphics/xzgv/BUILD b/graphics/xzgv/BUILD
index fb05b53..f6b5a33 100755
--- a/graphics/xzgv/BUILD
+++ b/graphics/xzgv/BUILD
@@ -1,3 +1,6 @@
-patch -p1 < $SCRIPT_DIRECTORY/xzgv-0.8-integer-overflow-fix.diff &&
-sedit "s/PREFIX=\/usr\/local/PREFIX=\/usr/" config.mk &&
-make
+sedit "s:PREFIX=/usr/local:PREFIX=${INSTALL_ROOT}/usr:" config.mk &&
+sedit "s:CFLAGS=.*:CFLAGS=${CFLAGS}:" config.mk &&
+cd ${SOURCE_DIRECTORY}/src &&
+default_build_make &&
+cd ${SOURCE_DIRECTORY}/doc &&
+default_build_make
diff --git a/graphics/xzgv/DEPENDS b/graphics/xzgv/DEPENDS
index 399418f..bd09ca0 100755
--- a/graphics/xzgv/DEPENDS
+++ b/graphics/xzgv/DEPENDS
@@ -1,5 +1,6 @@
-depends JPEG &&
+depends gtk+2 &&
+depends JPEG &&
depends libpng &&
-depends zlib &&
-depends tiff &&
+depends zlib &&
+depends tiff &&
depends imlib
diff --git a/graphics/xzgv/DETAILS b/graphics/xzgv/DETAILS
index a2c8a38..6a565b9 100755
--- a/graphics/xzgv/DETAILS
+++ b/graphics/xzgv/DETAILS
@@ -1,13 +1,13 @@
SPELL=xzgv
- VERSION=0.8
+ VERSION=0.9.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/$SOURCE
- WEB_SITE=http://rus.members.beeb.net/xzgv.html
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+ WEB_SITE=http://sourceforge.net/projects/xzgv
ENTERED=20020406
UPDATED=20021025
-
SOURCE_HASH=sha512:2416f3cb680694d8215569ae03dcae8849561773b97103309a2272283b44d55a0764f00c82d4d37493c6390c63f463d87ad4a31b3c879b051aa12f10248842d5
- LICENSE[0]=GPL
+
SOURCE_HASH=sha512:e57d0eb3f34bc63cb9f2d033856eefdeb6363ce55589b8bc52a8c253e211a4e36d3c0691b4559581d4052810fde445c6ec1832b964c40c5365c3869ce72f7361

+ LICENSE[0]=GPL
KEYWORDS="graphics"
SHORT="xzgv is a GTK+/Imlib-based picture viewer for X."

@@ -17,4 +17,3 @@ formats. It provides a thumbnail-based file selector, and
allows panning and
fit-to-window methods of viewing. It has mouse support as well, but can be
used solely from the keyboard.
EOF
-
diff --git a/graphics/xzgv/HISTORY b/graphics/xzgv/HISTORY
index e5fbbde..2f9361f 100644
--- a/graphics/xzgv/HISTORY
+++ b/graphics/xzgv/HISTORY
@@ -1,3 +1,9 @@
+2011-01-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.1
+ * BUILD: fixed so CFLAGS and INSTALL_ROOT are used, use
+ default_build_make
+ * INSTALL: fixed to prevent error during make install, use
default_install
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/graphics/xzgv/INSTALL b/graphics/xzgv/INSTALL
index e6fe4f7..81a98e5 100755
--- a/graphics/xzgv/INSTALL
+++ b/graphics/xzgv/INSTALL
@@ -1 +1,4 @@
-make install
+cd ${SOURCE_DIRECTORY}/src &&
+default_install &&
+cd ${SOURCE_DIRECTORY}/doc &&
+default_install
diff --git a/graphics/xzgv/xzgv-0.8-integer-overflow-fix.diff
b/graphics/xzgv/xzgv-0.8-integer-overflow-fix.diff
deleted file mode 100644
index 627ba19..0000000
--- a/graphics/xzgv/xzgv-0.8-integer-overflow-fix.diff
+++ /dev/null
@@ -1,197 +0,0 @@
-diff -urN xzgv-0.8/ChangeLog xzgv/ChangeLog
---- xzgv-0.8/ChangeLog Tue Sep 16 15:08:42 2003
-+++ xzgv/ChangeLog Wed Dec 15 03:30:46 2004
-@@ -1,3 +1,13 @@
-+2004-11-03 Russell Marks <russell.marks AT ntlworld.com>
-+
-+ * Added width/height limits to all native picture readers. This is
-+ a crude (albeit effective) fix for heap overflow bugs - there may
-+ yet be more subtle problems, but I can't really fix them until I
-+ know they're there. :-) Thanks to Luke Macken for letting me know
-+ about the heap overflow problems (in zgv). I suppose I should also
-+ thank "infamous41md" for publishing the original advisory/exploit
-+ (again for zgv), even if he didn't bother emailing me or anything.
-+
- 2003-09-16 Russell Marks <russell.marks AT ntlworld.com>
-
- * Version 0.8.
-diff -urN xzgv-0.8/src/Makefile xzgv/src/Makefile
---- xzgv-0.8/src/Makefile Tue Jan 1 05:37:45 2002
-+++ xzgv/src/Makefile Wed Dec 15 03:30:46 2004
-@@ -84,18 +84,19 @@
- logo.o: logo.c logodata.h
- logoconv.o: logoconv.c
- main.o: main.c backend.h readmrf.h readgif.h readpng.h readjpeg.h \
-- readtiff.h resizepic.h rcfile.h filedetails.h gotodir.h updatetn.h \
-- confirm.h misc.h copymove.h rename.h help.h dir_icon.xpm \
-+ readtiff.h readprf.h resizepic.h rcfile.h filedetails.h gotodir.h \
-+ updatetn.h confirm.h misc.h copymove.h rename.h help.h dir_icon.xpm \
- dir_icon_small.xpm file_icon.xpm file_icon_small.xpm logo.h \
- icon-48.xpm main.h
- misc.o: misc.c misc.h
- rcfile.o: rcfile.c getopt.h rcfile.h rcfile_opt.h rcfile_var.h \
- rcfile_short.h
--readgif.o: readgif.c readgif.h
--readjpeg.o: readjpeg.c rcfile.h readjpeg.h
--readmrf.o: readmrf.c readmrf.h
-+readgif.o: readgif.c reader.h readgif.h
-+readjpeg.o: readjpeg.c rcfile.h reader.h readjpeg.h
-+readmrf.o: readmrf.c reader.h readmrf.h
- readpng.o: readpng.c readpng.h
--readtiff.o: readtiff.c readtiff.h
-+readprf.o: readprf.c reader.h readprf.h
-+readtiff.o: readtiff.c reader.h readtiff.h
- rename.o: rename.c backend.h main.h rename.h
- resizepic.o: resizepic.c resizepic.h
- updatetn.o: updatetn.c backend.h main.h rcfile.h dither.h resizepic.h \
-diff -urN xzgv-0.8/src/reader.h xzgv/src/reader.h
---- xzgv-0.8/src/reader.h Thu Jan 1 01:00:00 1970
-+++ xzgv/src/reader.h Wed Dec 15 03:30:46 2004
-@@ -0,0 +1,15 @@
-+/* xzgv 0.8 - picture viewer for X, with file selector.
-+ * Copyright (C) 1999-2004 Russell Marks. See main.c for license details.
-+ *
-+ * reader.h
-+ */
-+
-+/* range check on width and height as a crude way of avoiding overflows
-+ * when calling malloc/calloc. 32767 is the obvious limit to use given that
-+ * xzgv effectively imposes such a limit anyway.
-+ * Adds an extra 2 to height for max-height check, partly to reflect what
-+ * the check in zgv does but also to allow for readtiff.c allocating an
-+ * extra line (so at least an extra 1 would have been needed in any case).
-+ */
-+#define WH_MAX 32767
-+#define WH_BAD(w,h) ((w)<=0 || (w)>WH_MAX || (h)<=0 || ((h)+2)>WH_MAX)
-diff -urN xzgv-0.8/src/readgif.c xzgv/src/readgif.c
---- xzgv-0.8/src/readgif.c Sun Mar 3 04:34:32 2002
-+++ xzgv/src/readgif.c Wed Dec 15 03:30:46 2004
-@@ -8,6 +8,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include "reader.h"
- #include "readgif.h"
-
-
-@@ -103,7 +104,7 @@
-
- if(local_colour_map) readcolmap(in);
-
-- if((image=malloc(width*height*3))==NULL)
-+ if(WH_BAD(width,height) || (image=malloc(width*height*3))==NULL)
- {
- fclose(in);
- return(0);
-diff -urN xzgv-0.8/src/readjpeg.c xzgv/src/readjpeg.c
---- xzgv-0.8/src/readjpeg.c Tue Sep 16 12:52:04 2003
-+++ xzgv/src/readjpeg.c Wed Dec 15 03:30:46 2004
-@@ -13,6 +13,7 @@
- #include <jpeglib.h>
-
- #include "rcfile.h"
-+#include "reader.h"
-
- #include "readjpeg.h"
-
-@@ -265,7 +266,7 @@
- /* this one shouldn't hurt */
- cinfo.do_block_smoothing=FALSE;
-
--if((*imagep=image=malloc(width*height*3))==NULL)
-+if(WH_BAD(width,height) || (*imagep=image=malloc(width*height*3))==NULL)
- longjmp(jerr.setjmp_buffer,1);
-
- jpeg_start_decompress(&cinfo);
-diff -urN xzgv-0.8/src/readmrf.c xzgv/src/readmrf.c
---- xzgv-0.8/src/readmrf.c Sat Oct 7 14:26:55 2000
-+++ xzgv/src/readmrf.c Wed Dec 15 03:30:46 2004
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include "reader.h"
- #include "readmrf.h"
-
-
-@@ -91,7 +92,8 @@
- w64=(w+63)/64;
- h64=(h+63)/64;
-
--if((*bmap=malloc(w*h*3))==NULL ||
-+if(WH_BAD(w64*64,h64*64) || WH_BAD(w,h) ||
-+ (*bmap=malloc(w*h*3))==NULL ||
- (image=calloc(w64*h64*64*64,1))==NULL)
- {
- if(*bmap) free(*bmap),*bmap=NULL;
-diff -urN xzgv-0.8/src/readpng.c xzgv/src/readpng.c
---- xzgv-0.8/src/readpng.c Thu Jul 10 16:13:43 2003
-+++ xzgv/src/readpng.c Wed Dec 15 03:32:46 2004
-@@ -16,6 +16,7 @@
- #include <stdlib.h>
- #include <png.h>
- #include <setjmp.h> /* after png.h to avoid horrible thing in pngconf.h */
-+#include "reader.h"
- #include "readpng.h"
-
-
-@@ -129,7 +130,8 @@
- }
-
- /* allocate image memory */
--if((*theimageptr=theimage=malloc(width*height*3))==NULL)
-+if(WH_BAD(width,height) ||
-+ (*theimageptr=theimage=malloc(width*height*3))==NULL)
- {
- png_read_end(png_ptr,info_ptr);
- png_destroy_read_struct(&png_ptr,&info_ptr,NULL);
-diff -urN xzgv-0.8/src/readprf.c xzgv/src/readprf.c
---- xzgv-0.8/src/readprf.c Mon Apr 9 19:08:19 2001
-+++ xzgv/src/readprf.c Wed Dec 15 03:30:46 2004
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include "reader.h"
- #include "readprf.h"
-
- #define squaresize 64
-@@ -164,7 +165,7 @@
- bytepp=1;
-
- n=width*squaresize;
--if((planebuf[0]=calloc(n,planes))==NULL)
-+if(WH_BAD(width,height) || (planebuf[0]=calloc(n,planes))==NULL)
- {
- fclose(in);
- return(0);
-@@ -173,6 +174,7 @@
- for(f=1;f<planes;f++)
- planebuf[f]=planebuf[f-1]+n;
-
-+/* width/height already checked above */
- if((*theimageptr=malloc(width*height*3))==NULL)
- {
- free(planebuf[0]);
-diff -urN xzgv-0.8/src/readtiff.c xzgv/src/readtiff.c
---- xzgv-0.8/src/readtiff.c Thu Dec 28 03:20:55 2000
-+++ xzgv/src/readtiff.c Wed Dec 15 03:30:46 2004
-@@ -11,7 +11,7 @@
- #include <setjmp.h>
- #include <sys/file.h> /* for open et al */
- #include <tiffio.h>
--
-+#include "reader.h"
- #include "readtiff.h"
-
-
-@@ -36,7 +36,8 @@
- * spare for the flip afterwards.
- */
- numpix=width*height;
--if((image=malloc(numpix*sizeof(uint32)+width*3))==NULL)
-+if(WH_BAD(width,height) ||
-+ (image=malloc(numpix*sizeof(uint32)+width*3))==NULL)
- {
- TIFFClose(in);
- return(0);



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b1a32d2b23ab8864893510051c417bf80eb7e63e), Florian Franzmann, 01/29/2011

Archive powered by MHonArc 2.6.24.

Top of Page