[xscreensaver/f14/master] - Kill memleak on gltext (bug 638600)

[Mamoru Tasaka]

commit fdf42385fecf246e45887968e33cd48533c459b5
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Wed Oct 13 08:21:42 2010 +0900

    - Kill memleak on gltext (bug 638600)

 xscreensaver-5.12-gltext-memleak.patch |   11 +++++++++++
 xscreensaver.spec                      |   11 +++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/xscreensaver-5.12-gltext-memleak.patch b/xscreensaver-5.12-gltext-memleak.patch
new file mode 100644
index 0000000..3da67c7
--- /dev/null
+++ b/xscreensaver-5.12-gltext-memleak.patch
@@ -0,0 +1,11 @@
+--- xscreensaver-5.12/hacks/glx/tube.c.mem	2010-08-23 12:39:51.000000000 +0900
++++ xscreensaver-5.12/hacks/glx/tube.c	2010-10-13 08:12:45.000000000 +0900
+@@ -181,6 +181,8 @@
+         glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
+       }
+ 
++  free(array);
++
+   return polys;
+ }
+ 
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 5ccd78e..6104b85 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
 %undefine extrarel
 
@@ -27,7 +27,7 @@ Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{mainversion}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
+Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
 License:         MIT
 Group:           Amusements/Graphics
@@ -59,6 +59,9 @@ Patch30:         xscreensaver-5.11-conf264.patch
 # on passwd prompt
 Patch31:         xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
 #
+# Kill memleak on gltext (bug 638600)
+Patch32:         xscreensaver-5.12-gltext-memleak.patch
+#
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -226,6 +229,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch21 -p1 -b .nonet
 %patch30 -p1 -b .conf264
 %patch31 -p1 -b .langc
+%patch32 -p1 -b .gltext_mem
 
 change_option(){
    set +x
@@ -727,6 +731,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Oct 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-3
+- Kill memleak on gltext (bug 638600)
+
 * Sun Oct 10 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-14+: rebuild against fixed gcc