rpms/jasper/FC-4 jasper-1.701.0-GL-ac.patch, NONE, 1.1 jasper-1.701.0-memory_leak.patch, NONE, 1.1 jasper.spec, 1.8, 1.9

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14095

Modified Files:
	jasper.spec 
Added Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-memory_leak.patch 
Log Message:
include patch this time


jasper-1.701.0-GL-ac.patch:

--- NEW FILE jasper-1.701.0-GL-ac.patch ---
--- jasper-1.701.0.GEO/configure.ac.GL	2006-02-20 19:58:02.000000000 -0600
+++ jasper-1.701.0.GEO/configure.ac	2006-02-24 07:40:38.000000000 -0600
@@ -242,7 +242,7 @@
 OPENGL_LIBS=""
 if test $ENABLE_OPENGL = yes; then
 	if test $HAVE_OPENGL = no; then
-		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
+		TMPLIBS="-lglut"
 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
 	fi

jasper-1.701.0-memory_leak.patch:

--- NEW FILE jasper-1.701.0-memory_leak.patch ---
diff -ur jasper-1.701.0/src/libjasper/base/jas_stream.c jasper-1.701.0-local/src/libjasper/base/jas_stream.c
--- jasper-1.701.0/src/libjasper/base/jas_stream.c	2004-02-09 07:04:40.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/base/jas_stream.c	2005-10-23 02:08:06.145589016 +0530
@@ -361,11 +361,11 @@
 	}
 	obj->fd = -1;
 	obj->flags = 0;
-	obj->pathname[0] = '\0';
+	strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	tmpnam(obj->pathname);
+	mkstemp(obj->pathname);
 
 	/* Open the underlying file. */
 	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
diff -ur jasper-1.701.0/src/libjasper/jpg/jpg_enc.c jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c
--- jasper-1.701.0/src/libjasper/jpg/jpg_enc.c	2004-02-09 07:04:41.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c	2005-10-23 02:09:02.526017888 +0530
@@ -331,6 +331,7 @@
 	rewind(output_file);
 	jpg_copyfiletostream(out, output_file);
 	fclose(output_file);
+	jas_matrix_destroy(src_mgr->data);
 	output_file = 0;
 
 	return 0;


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jasper.spec	3 Oct 2006 20:35:50 -0000	1.8
+++ jasper.spec	3 Oct 2006 20:37:54 -0000	1.9
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 15%{?dist}
+Release: 15%{?dist}.1
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"