diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
| commit | 940b4d1848e8c70ab7642901a68594e8016caffc (patch) | |
| tree | eb72f344ee6c3d9b80a7ecc079ea79e9fba8676d /external/beanshell/bsh-2.0b1-src.patch | |
| parent | Initial commit. (diff) | |
| download | libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.tar.xz libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.zip | |
Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/beanshell/bsh-2.0b1-src.patch')
| -rw-r--r-- | external/beanshell/bsh-2.0b1-src.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/external/beanshell/bsh-2.0b1-src.patch b/external/beanshell/bsh-2.0b1-src.patch new file mode 100644 index 000000000..6124f18d1 --- /dev/null +++ b/external/beanshell/bsh-2.0b1-src.patch @@ -0,0 +1,50 @@ +--- misc/BeanShell/build.xml Fri Dec 19 17:14:27 2003 ++++ misc/build/BeanShell/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... + --> +-<project name="beanshell" default="compile" basedir="."> ++<project name="beanshell" default="jarall" basedir="."> + + <!-- Project Configuration --> + +@@ -65,6 +65,9 @@ + <property name="exclude-engine" value="bsh/engine/**"/> + --> + ++ <property name="exclude-bsf" ++ value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/> ++ + <!-- Uncomment to build without the ASM class generator code. + <property name="exclude-classgen" + value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/> +@@ -75,6 +78,9 @@ + value="bsh/servlet/*"/> + --> + ++ <property name="exclude-servlet" ++ value="bsh/servlet/*"/> ++ + <!-- Legacy excludes. Comment this *out* to build these legacy items --> + <property name="excludes-legacy" + value="bsh/JThis.java"/> +--- misc/BeanShell/src/bsh/classpath/BshClassPath.java 2003-12-19 17:14:28.000000000 +0100 ++++ misc/build/BeanShell/src/bsh/classpath/BshClassPath.java 2014-07-22 21:02:52.000000000 +0200 +@@ -36,6 +36,7 @@ + import bsh.StringUtil; + import bsh.ClassPathException; + import java.lang.ref.WeakReference; ++import java.lang.SecurityException; + import bsh.NameSource; + + /** +@@ -659,6 +660,8 @@ + URL url = new File( rtjar ).toURI().toURL(); + bootClassPath = new BshClassPath( + "Boot Class Path", new URL[] { url } ); ++ } catch ( SecurityException e ) { ++ throw new ClassPathException(" can't access to boot jar: "+e); + } catch ( MalformedURLException e ) { + throw new ClassPathException(" can't find boot jar: "+e); + } |