Author: pfg Date: Tue Feb 23 04:06:11 2016 New Revision: 1731783 URL: http://svn.apache.org/viewvc?rev=1731783&view=rev Log: 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. Added: openoffice/trunk/main/beanshell/bsh-2.0b6-src.patch - copied, changed from r1731782, openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch Removed: openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch Modified: openoffice/trunk/main/beanshell/makefile.mk openoffice/trunk/main/external_deps.lst Copied: openoffice/trunk/main/beanshell/bsh-2.0b6-src.patch (from r1731782, openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch) URL: http://svn.apache.org/viewvc/openoffice/trunk/main/beanshell/bsh-2.0b6-src.patch?p2=openoffice/trunk/main/beanshell/bsh-2.0b6-src.patch&p1=openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch&r1=1731782&r2=1731783&rev=1731783&view=diff ============================================================================== --- openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch (original) +++ openoffice/trunk/main/beanshell/bsh-2.0b6-src.patch Tue Feb 23 04:06:11 2016 @@ -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 +#************************************************************** Modified: openoffice/trunk/main/beanshell/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/beanshell/makefile.mk?rev=1731783&r1=1731782&r2=1731783&view=diff ============================================================================== --- openoffice/trunk/main/beanshell/makefile.mk (original) +++ openoffice/trunk/main/beanshell/makefile.mk Tue Feb 23 04:06:11 2016 @@ -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 Modified: openoffice/trunk/main/external_deps.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1731783&r1=1731782&r2=1731783&view=diff ============================================================================== --- openoffice/trunk/main/external_deps.lst (original) +++ openoffice/trunk/main/external_deps.lst Tue Feb 23 04:06:11 2016 @@ -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
