r36909 - in /packages/scilab/branches/5.3/debian: changelog patches/CVE-2010-3378.diff patches/addchapter.diff patches/basename.diff patches/jhdf2.6.diff patches/sparcstartup.diff patches/writable-string.diff patches/xarmjavadetection.diff

Sat Oct 2 12:49:21 UTC 2010

Author: sylvestre
Date: Sat Oct  2 12:49:21 2010
New Revision: 36909

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36909
Log:
merge with Scilab 5.2.2-8 + packaging of 5.3.0 beta4

Added:
    packages/scilab/branches/5.3/debian/patches/CVE-2010-3378.diff
      - copied, changed from r36908, packages/scilab/trunk/debian/patches/CVE-2010-3378.diff
Removed:
    packages/scilab/branches/5.3/debian/patches/addchapter.diff
    packages/scilab/branches/5.3/debian/patches/basename.diff
    packages/scilab/branches/5.3/debian/patches/jhdf2.6.diff
    packages/scilab/branches/5.3/debian/patches/sparcstartup.diff
    packages/scilab/branches/5.3/debian/patches/writable-string.diff
    packages/scilab/branches/5.3/debian/patches/xarmjavadetection.diff
Modified:
    packages/scilab/branches/5.3/debian/changelog

Modified: packages/scilab/branches/5.3/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/changelog?rev=36909&op=diff
==============================================================================

--- packages/scilab/branches/5.3/debian/changelog (original)
+++ packages/scilab/branches/5.3/debian/changelog Sat Oct  2 12:49:21 2010
@@ -1,3 +1,10 @@
+scilab (5.3.0-beta-4-1) experimental; urgency=low
+
+  * New upstream release
+  patch addchapter.diff removed (applied upstream)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 28 Sep 2010 22:44:57 +0200
+
 scilab (5.3.0-beta-3-2) experimental; urgency=low
 
   * Missing dep on libjlatexmath-fop-java
@@ -13,7 +20,12 @@
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 12 Sep 2010 13:42:22 +0200
 
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 10 Sep 2008 13:35:28 +0200
+scilab (5.2.2-8) unstable; urgency=high
+
+  * SECURITY UPDATE: 
+    - (CVE-2010-3378) : Insecure library loading (Closes: #598422, #598423)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 30 Sep 2010 15:17:57 +0200
 
 scilab (5.2.2-7) unstable; urgency=low
 

Copied: packages/scilab/branches/5.3/debian/patches/CVE-2010-3378.diff (from r36908, packages/scilab/trunk/debian/patches/CVE-2010-3378.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/patches/CVE-2010-3378.diff?rev=36909&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/CVE-2010-3378.diff (original)
+++ packages/scilab/branches/5.3/debian/patches/CVE-2010-3378.diff Sat Oct  2 12:49:21 2010
@@ -1,15 +1,15 @@
---- scilab-5.2.2.orig/bin/scilab	2010-04-20 16:41:55.000000000 +0200
-+++ scilab-5.2.2/bin/scilab	2010-09-30 15:33:08.000000000 +0200
-@@ -280,7 +280,7 @@
-             *darwin* | *Darwin*)
-                     # Seems to be always that under Mac OS X. Don't hesitate to submit a bug report if it is not the case.
- 		    JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home/"
+--- bin/scilab.orig	2010-10-02 14:24:31.000000000 +0200
++++ bin/scilab	2010-10-02 14:26:46.000000000 +0200
+@@ -281,7 +281,7 @@
+                     # Apple thinks and does things different (it would be too easy otherwise)
+ 		    # They provide a script which returns the JAVA_HOME path
+ 		    JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
 -                    LD_LIBRARY_PATH="$JAVA_HOME/../Libraries:$LD_LIBRARY_PATH"
-+                    LD_LIBRARY_PATH="$JAVA_HOME/../Libraries${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
++                    LD_LIBRARY_PATH="$JAVA_HOME/../Libraries:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
  		    if test $SCIVERBOSE -ne 0; then
  			echo "Using default Mac OS X vm: $JAVA_HOME"
  			echo "And LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-@@ -459,7 +459,7 @@
+@@ -460,7 +460,7 @@
              CLASSPATH="$CLASSPATH:$SCI/modules/jvm/jar/org.scilab.modules.jvm.jar"
  		# @TODO This is the default path of the official sun JVM. 
  		# It is different for other implementation of the JVM....
@@ -18,7 +18,7 @@
  		fi
  	else
  		if test $SCIVERBOSE -ne 0; then
-@@ -518,16 +518,16 @@
+@@ -519,19 +519,19 @@
  case $OS in
      *darwin* | *Darwin*) # MacOS X
          # When using some packaging tools like fink which are storing the info in /sw/lib
@@ -27,14 +27,18 @@
  	# Export the path to the Scilab lib when Scilab has been install ...
  	# to a Mac os x specific variable used by the linker before LD_LIBRARY_PATH
 -		DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$SCI/../../lib/scilab/
-+        DYLD_LIBRARY_PATH=$SCI/../../lib/scilab/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}:
++		DYLD_LIBRARY_PATH=$SCI/../../lib/scilab/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
  		# Crappy workaround for the dynamic load of sundials under Mac OS X
  		# in the source tree version. This does not occur in the binary
  		# thanks to the previous declaration on ../../lib/scilab
  		# See bug #4949
+ 		if test -d "$SCI/modules/scicos_blocks/.libs/"; then
+-			DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$SCI/modules/scicos_blocks/.libs/
++			DYLD_LIBRARY_PATH=$SCI/modules/scicos_blocks/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
+ 		fi
  		if test -d "$SCI/modules/scicos/.libs/"; then
 -			DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$SCI/modules/scicos/.libs/
-+            DYLD_LIBRARY_PATH=$SCI/modules/scicos/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
++			DYLD_LIBRARY_PATH=$SCI/modules/scicos/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
  		fi
  		export DYLD_LIBRARY_PATH
          ;;


