[Pkg-octave-commit] r2767 - in octave/trunk/debian: . in patches

[Rafael Laboissiere]

tags 521345 pending
thanks

Author: rafael
Date: 2009-03-28 08:45:30 +0000 (Sat, 28 Mar 2009)
New Revision: 2767

Added:
   octave/trunk/debian/patches/idx-not-volatile-in-eig.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Add patch

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-03-28 08:44:25 UTC (rev 2766)
+++ octave/trunk/debian/changelog	2009-03-28 08:45:30 UTC (rev 2767)
@@ -7,6 +7,9 @@
 
   * debian/patches/proper-delete-of-axes-in-clf.dpatch: Remove patch
     (applied upstream)
+  * debian/patches/idx-not-volatile-in-eig.dpatch: New patch for avoiding
+    memory exhaustion when calling eig on amd64 (closes: #521345).  Thanks
+    to John Eaton for the patch.
 
  -- Rafael Laboissiere <rafael at debian.org>  Thu, 26 Mar 2009 07:22:41 +0100
 

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-03-28 08:44:25 UTC (rev 2766)
+++ octave/trunk/debian/in/00list	2009-03-28 08:45:30 UTC (rev 2767)
@@ -6,6 +6,7 @@
 glpk-new-api.dpatch
 real-no-history.dpatch
 termios-h-check-3.0.dpatch
+idx-not-volatile-in-eig.dpatch
 :][V_3_1:
 50_octave-bug-tempfile
 no_pdf_in_print.dpatch

Added: octave/trunk/debian/patches/idx-not-volatile-in-eig.dpatch
===================================================================
--- octave/trunk/debian/patches/idx-not-volatile-in-eig.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/idx-not-volatile-in-eig.dpatch	2009-03-28 08:45:30 UTC (rev 2767)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## idx-not-volatile-in-eig.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid memory exhaustion when calling eig on amd64 (fixes Bug#521345).
+## DP: This is an adaptation of a patch taken from the 3.1 branch in
+## DP: the upstream Mercurial repository 
+## DP: http://hg.savannah.gnu.org/hgweb/octave/raw-rev/728e7943752d
+
+ at DPATCH@
+--- octave3.0-3.0.4~rc6.orig/liboctave/EIG.cc
++++ octave3.0-3.0.4~rc6/liboctave/EIG.cc
+@@ -99,7 +99,7 @@
+   Array<double> wi (n);
+   double *pwi = wi.fortran_vec ();
+ 
+-  volatile octave_idx_type nvr = calc_ev ? n : 0;
++  octave_idx_type nvr = calc_ev ? n : 0;
+   Matrix vr (nvr, nvr);
+   double *pvr = vr.fortran_vec ();
+