[Libreoffice-commits] core.git: Branch 'aoo/trunk' - beanshell/bsh-2.0b5-src.patch beanshell/bsh-2.0b6-src.patch beanshell/makefile.mk external_deps.lst

[Pedro Giffuni]

 beanshell/bsh-2.0b5-src.patch |   64 ------------------------------------------
 beanshell/bsh-2.0b6-src.patch |   64 ++++++++++++++++++++++++++++++++++++++++++
 beanshell/makefile.mk         |    8 ++---
 external_deps.lst             |    7 ++--
 4 files changed, 72 insertions(+), 71 deletions(-)

New commits:
commit 6675a022a47153b59f4e67ebbba9010c06c7f055
Author: Pedro Giffuni <pfg at apache.org>
Date:   Tue Feb 23 04:06:11 2016 +0000

    Update the Apache licensed Beanshell to 2.0b6
    
    From it's new home at github:
    
    https://github.com/beanshell/beanshell
    
    The new release addresses CVE-2016-2510.

diff --git a/beanshell/bsh-2.0b5-src.patch b/beanshell/bsh-2.0b6-src.patch
similarity index 88%
rename from beanshell/bsh-2.0b5-src.patch
rename to beanshell/bsh-2.0b6-src.patch
index 04aa721..d4fb3d6 100644
--- a/beanshell/bsh-2.0b5-src.patch
+++ b/beanshell/bsh-2.0b6-src.patch
@@ -1,5 +1,5 @@
---- misc/BeanShell-2.0b5/build.xml	Fri Dec 19 17:14:27 2003
-+++ misc/build/BeanShell-2.0b5/build.xml	Fri Mar 28 15:55:04 2008
+--- misc/BeanShell-2.0b6/build.xml	Fri Dec 19 17:14:27 2003
++++ misc/build/BeanShell-2.0b6/build.xml	Fri Mar 28 15:55:04 2008
 @@ -10,7 +10,7 @@
  		- Why can't I nest filesets?  This seems like it would be so easy and
  		useful...
@@ -29,8 +29,8 @@
  	<!-- Legacy excludes.  Comment this *out* to build these legacy items -->
  	<property name="excludes-legacy" 
  		value="bsh/JThis.java"/>
---- misc/BeanShell-2.0b5/makefile.mk	Fri Mar 28 15:56:40 2008
-+++ misc/build/BeanShell-2.0b5/makefile.mk	Fri Mar 28 15:56:06 2008
+--- misc/BeanShell-2.0b6/makefile.mk	Fri Mar 28 15:56:40 2008
++++ misc/build/BeanShell-2.0b6/makefile.mk	Fri Mar 28 15:56:06 2008
 @@ -1 +1,29 @@
 -dummy
 +#**************************************************************
diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
index 5bf174a..fddd5db 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/makefile.mk
@@ -44,10 +44,10 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=bsh-2.0b5-src
-TARFILE_MD5=ec1941a74d3ef513c4ce57a9092b74e1
-TARFILE_ROOTDIR=BeanShell-2.0b5
-PATCH_FILES=bsh-2.0b5-src.patch
+TARFILE_NAME=bsh-2.0b6-src
+TARFILE_MD5=beeca87be45ec87d241ddd0e1bad80c1
+TARFILE_ROOTDIR=BeanShell-2.0b6
+PATCH_FILES=bsh-2.0b6-src.patch
 
 ADDITIONAL_FILES=makefile.mk
 
diff --git a/external_deps.lst b/external_deps.lst
index 8110c44..950b598 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -265,9 +265,10 @@ if (RAT_JAR_HOME==BUILD)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA==TRUE && SYSTEM_BSH!=YES)
-    MD5 = ec1941a74d3ef513c4ce57a9092b74e1
-    name = bsh-2.0b5-src.zip
-    URL1 = http://svn.codespot.com/a/apache-extras.org/beanshell/src_releases/$(name)
+    MD5 = beeca87be45ec87d241ddd0e1bad80c1
+    name = bsh-2.0b6-src.zip
+    URL1 = https://bintray.com/artifact/download/beanshell/Beanshell/org/apache-extras/beanshell/bsh/2.0b6/$(name)
+    URL2 = http://central.maven.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/$(name)
 
 ###############################################################################
 # Libraries with category B license