Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2014-07-12 17:14:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2014-06-24 22:47:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2014-07-12 17:14:44.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 8 09:26:28 UTC 2014 - [email protected] + +- Add scilab-intg-crash.patch to fix scilab crash when intg + involved division by zero; patch came from upstream; fixes + http://bugzilla.scilab.org/13491 . + +------------------------------------------------------------------- New: ---- scilab-intg-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.hdraJE/_old 2014-07-12 17:14:46.000000000 +0200 +++ /var/tmp/diff_new_pack.hdraJE/_new 2014-07-12 17:14:46.000000000 +0200 @@ -52,6 +52,8 @@ Patch15: scilab-make-doc-ja_JP.patch # PATCH-FIX-UPSTREAM scilab-fix-arpack-detection.patch bnc#883233 [email protected] -- Fix detection of arpack-ng library during configure stage Patch16: scilab-fix-arpack-detection.patch +# PATCH-FIX-UPSTREAM scilab-intg-crash.patch [email protected] -- Fix scilab crash when intg involved division by zero; patch came from upstream +Patch17: scilab-intg-crash.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -136,8 +138,8 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: liberation-fonts # make doc now requires access to display -BuildRequires: xorg-x11-server BuildRequires: Mesa-libGL-devel +BuildRequires: xorg-x11-server %define X_display ":98" # QA tests and validation @@ -282,6 +284,7 @@ %patch14 -p2 %patch15 -p1 %patch16 -p1 +%patch17 -p2 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++++++ scilab-intg-crash.patch ++++++ X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Fdifferential_equations%2Fsrc%2Ffortran%2Fdqk21.f;h=29bd2e91b3f245fe08f3665e2a0a06a6b24b3ada;hp=9ea1458a55749699092c1b840b12bf6d7876a4b5;hb=f34a4175acea621acabbe625caed2cb4adb76128;hpb=1f9d8436bc683da2e52c21246d9188dd28d0a0dd diff --git a/scilab/modules/differential_equations/src/fortran/dqk21.f b/scilab/modules/differential_equations/src/fortran/dqk21.f index 9ea1458..29bd2e9 100644 --- a/scilab/modules/differential_equations/src/fortran/dqk21.f +++ b/scilab/modules/differential_equations/src/fortran/dqk21.f @@ -55,6 +55,7 @@ c * resg,resk,reskh,result,uflow,wg,wgk,xgk integer j,jtw,jtwm1 external f + common/ierajf/iero c dimension fv1(10),fv2(10),wg(5),wgk(11),xgk(11) c @@ -140,13 +141,16 @@ c the integral, and estimate the absolute error. c resg = 0.0d+00 fc = f(centr) + if(iero.gt.0) return resk = wgk(11)*fc resabs = dabs(resk) do 10 j=1,5 jtw = 2*j absc = hlgth*xgk(jtw) fval1 = f(centr-absc) + if(iero.gt.0) return fval2 = f(centr+absc) + if(iero.gt.0) return fv1(jtw) = fval1 fv2(jtw) = fval2 fsum = fval1+fval2 @@ -158,7 +162,9 @@ c jtwm1 = 2*j-1 absc = hlgth*xgk(jtwm1) fval1 = f(centr-absc) + if(iero.gt.0) return fval2 = f(centr+absc) + if(iero.gt.0) return fv1(jtwm1) = fval1 fv2(jtwm1) = fval2 fsum = fval1+fval2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
