Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2016-02-25 21:51:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh2 (Old) and /work/SRC/openSUSE:Factory/.bsh2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh2" Changes: -------- --- /work/SRC/openSUSE:Factory/bsh2/bsh2.changes 2015-04-02 15:54:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bsh2.new/bsh2.changes 2016-02-25 21:51:40.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Feb 23 17:36:36 UTC 2016 - [email protected] + +- Version update to 2.0b6 bnc#967593 CVE-2016-2510 + * Upstream developement moved to github + * No obvious changelog apart from the above +- Refreshed/updated patches: + * bsh-2.0b5-docs.patch + * bsh2-ClassGeneratorUtil.patch + * bsh2-asm.patch + * bsh2-fix-tests.patch +- Delete needless patch: + * bsh2-standard-script-api.patch +- Update version in .pom files + +------------------------------------------------------------------- Old: ---- bsh-2.0b5-src.tar.bz2 bsh2-standard-script-api.patch New: ---- 2.0b6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bsh2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,15 +18,15 @@ %define orig_name bsh -%define fversion 2.0b5 +%define fversion 2.0b6 Name: bsh2 -Version: 2.0.0.b5 +Version: 2.0.0.b6 Release: 0 Summary: Lightweight Scripting for Java (BeanShell Version 2.x) License: SPL-1.0 or LGPL-2.0+ Group: Development/Libraries/Java Url: http://www.beanshell.org/ -Source0: http://www.beanshell.org/%{orig_name}-%{fversion}-src.tar.bz2 +Source0: https://github.com/beanshell/beanshell/archive/%{fversion}.tar.gz Source1: beanshell-2.0b5.pom Source2: bsh-classpath-2.0b5.pom Source3: bsh-commands-2.0b5.pom @@ -42,7 +42,6 @@ Patch3: bsh-2.0b5-docs.patch #PATCH-FIX-OPENSUSE: those two patches fixes a compatibility with a standard javax.script API Patch1000: bsh2-fix-tests.patch -Patch1001: bsh2-standard-script-api.patch BuildRequires: ant BuildRequires: asm >= 1.5.3 BuildRequires: asm-javadoc @@ -128,12 +127,11 @@ Lightweight Scripting for Java (BeanShell Version 2.x) (demo and samples). %prep -%setup -q -n BeanShell-%{fversion} +%setup -q -n beanshell-%{fversion} %patch1 -p1 %patch2 %patch3 -p1 %patch1000 -p1 -%patch1001 -p1 for j in $(find . -name "*.jar"); do mv $j $j.no done @@ -173,8 +171,8 @@ %install # jars mkdir -p %{buildroot}%{_javadir}/%{name} -#rap#%__rm -f dist/%{orig_name}-%{fversion}.jar rm -f dist/%{orig_name}-%{fversion}-src.jar +rm -f dist/%{orig_name}-%{fversion}-sources.jar for jar in dist/*.jar; do install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar} -%{fversion}.jar`-%{version}.jar done @@ -240,7 +238,7 @@ # bshservlet mkdir -p %{buildroot}%{_datadir}/%{name}/bshservlet (cd %{buildroot}%{_datadir}/%{name}/bshservlet -jar xf $RPM_BUILD_DIR/BeanShell-%{fversion}/dist/bshservlet.war +jar xf $RPM_BUILD_DIR/beanshell-%{fversion}/dist/bshservlet.war ) # scripts mkdir -p %{buildroot}%{_bindir} @@ -265,11 +263,6 @@ BASE_FLAGS=-Ddebug=true fi BASE_JARS="%{name}.jar" -#if [ -f /usr/lib/libJavaReadline.so ]; then -# BASE_FLAGS="$BASE_FLAGS -Djava.library.path=/usr/lib" -# BASE_FLAGS="\$BASE_FLAGS -Dbsh.console.readlinelib=GnuReadline" -# BASE_JARS="\$BASE_JARS libreadline-java.jar" -#fi # Set parameters set_jvm set_classpath \$BASE_JARS @@ -289,7 +282,7 @@ %defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/%{name} %attr(0755,root,root) %{_bindir}/%{name}doc -%doc src/License.txt +%doc LICENSE %dir %{_javadir}/%{name} %{_javadir}/%{name}/%{orig_name}-%{version}.jar %{_javadir}/%{name}/%{orig_name}.jar ++++++ beanshell-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> <packaging>pom</packaging> <name>BeanShell</name> <description>BeanShell</description> ++++++ bsh-2.0b5-docs.patch ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -1,7 +1,7 @@ -Index: BeanShell-2.0b5/docs/faq/faq.xsl +Index: beanshell-2.0b6/docs/faq/faq.xsl =================================================================== ---- BeanShell-2.0b5.orig/docs/faq/faq.xsl 2005-06-10 19:20:48.000000000 +0200 -+++ BeanShell-2.0b5/docs/faq/faq.xsl 2011-03-11 10:22:15.465882372 +0100 +--- beanshell-2.0b6.orig/docs/faq/faq.xsl ++++ beanshell-2.0b6/docs/faq/faq.xsl @@ -18,7 +18,7 @@ <!--xsl:param name="imagedir"/--> @@ -11,10 +11,10 @@ <!-- Root -Index: BeanShell-2.0b5/docs/manual/xsl/manual.xsl +Index: beanshell-2.0b6/docs/manual/xsl/manual.xsl =================================================================== ---- BeanShell-2.0b5.orig/docs/manual/xsl/manual.xsl 2005-06-10 19:20:50.000000000 +0200 -+++ BeanShell-2.0b5/docs/manual/xsl/manual.xsl 2011-03-11 10:29:22.272450854 +0100 +--- beanshell-2.0b6.orig/docs/manual/xsl/manual.xsl ++++ beanshell-2.0b6/docs/manual/xsl/manual.xsl @@ -1,6 +1,6 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0" @@ -23,12 +23,3 @@ extension-element-prefixes="redirect" > -@@ -29,7 +29,7 @@ - <xsl:param name="pagesdir"/> - - <!-- Output directives --> --<xsl:output method="xhtml" indent="no"/> -+<xsl:output method="html" indent="no"/> - - <!-- - Root ++++++ bsh-bsf-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -6,7 +6,7 @@ <parent> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </parent> <artifactId>bsh-bsf</artifactId> <name>BeanShell bsf</name> @@ -16,7 +16,7 @@ <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh-core</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </dependency> <dependency> <groupId>bsf</groupId> ++++++ bsh-classgen-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -6,7 +6,7 @@ <parent> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </parent> <artifactId>bsh-classgen</artifactId> <name>BeanShell classgen</name> @@ -16,7 +16,7 @@ <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh-core</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </dependency> </dependencies> </project> ++++++ bsh-classpath-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -6,7 +6,7 @@ <parent> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </parent> <artifactId>bsh-classpath</artifactId> <name>BeanShell classpath</name> @@ -16,7 +16,7 @@ <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh-core</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </dependency> </dependencies> </project> ++++++ bsh-commands-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -6,7 +6,7 @@ <parent> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </parent> <artifactId>bsh-commands</artifactId> <name>BeanShell commands</name> @@ -16,7 +16,7 @@ <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh-core</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </dependency> </dependencies> </project> ++++++ bsh-core-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -6,7 +6,7 @@ <parent> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </parent> <artifactId>bsh-core</artifactId> <name>BeanShell core</name> ++++++ bsh-engine-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -6,7 +6,7 @@ <parent> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </parent> <artifactId>bsh-engine</artifactId> <name>BeanShell engine</name> @@ -16,7 +16,7 @@ <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh-core</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </dependency> </dependencies> </project> ++++++ bsh-reflect-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -6,10 +6,10 @@ <parent> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </parent> <artifactId>bsh-reflect</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> <name>BeanShell reflect</name> <description>BeanShell reflect</description> @@ -17,7 +17,7 @@ <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh-core</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </dependency> </dependencies> </project> ++++++ bsh-util-2.0b5.pom ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -6,7 +6,7 @@ <parent> <groupId>org.beanshell</groupId> <artifactId>beanshell</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </parent> <artifactId>bsh-util</artifactId> <name>BeanShell util</name> @@ -16,7 +16,7 @@ <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh-classpath</artifactId> - <version>2.0b5</version> + <version>2.0b6</version> </dependency> </dependencies> </project> ++++++ bsh2-ClassGeneratorUtil.patch ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -1,11 +1,13 @@ ---- src/bsh/ClassGeneratorUtil.java.sav 2008-08-19 13:01:12.000000000 +0200 -+++ src/bsh/ClassGeneratorUtil.java 2008-08-19 13:01:59.000000000 +0200 -@@ -192,7 +192,7 @@ +Index: src/bsh/ClassGeneratorUtil.java +=================================================================== +--- src/bsh/ClassGeneratorUtil.java.orig ++++ src/bsh/ClassGeneratorUtil.java +@@ -213,7 +213,7 @@ public class ClassGeneratorUtil implemen String sourceFile = "BeanShell Generated via ASM (www.objectweb.org)"; ClassWriter cw = new ClassWriter(true); -- cw.visit( classMods, fqClassName, superClassName, -+ cw.visit( 0x30, classMods, fqClassName, superClassName, +- cw.visit( classMods, fqClassName, superClassName, ++ cw.visit( 0x30, classMods, fqClassName, superClassName, interfaceNames, sourceFile ); if ( !isInterface ) ++++++ bsh2-asm.patch ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -1,38 +1,47 @@ -Index: BeanShell-2.0b5/src/bsh/ClassGeneratorUtil.java +Index: beanshell-2.0b6/src/bsh/ClassGeneratorUtil.java =================================================================== ---- BeanShell-2.0b5.orig/src/bsh/ClassGeneratorUtil.java 2010-08-09 13:47:18.951873609 +0200 -+++ BeanShell-2.0b5/src/bsh/ClassGeneratorUtil.java 2010-08-09 13:47:21.344997553 +0200 -@@ -303,7 +303,7 @@ - static void generateField( - String fieldName, String type, int modifiers, ClassWriter cw ) +--- beanshell-2.0b6.orig/src/bsh/ClassGeneratorUtil.java ++++ beanshell-2.0b6/src/bsh/ClassGeneratorUtil.java +@@ -329,7 +329,7 @@ public class ClassGeneratorUtil implemen + static void generateField( + String fieldName, String type, int modifiers, ClassWriter cw ) { - cw.visitField( modifiers, fieldName, type, null/*value*/ ); + cw.visitField( modifiers, fieldName, type, null, null ); } - + /** -@@ -327,7 +327,7 @@ +@@ -353,7 +353,7 @@ public class ClassGeneratorUtil implemen // Generate method body - CodeVisitor cv = cw.visitMethod( + CodeVisitor cv = cw.visitMethod( - modifiers, methodName, methodDescriptor, exceptions ); + modifiers, methodName, methodDescriptor, exceptions, null ); if ( (modifiers & ACC_ABSTRACT) != 0 ) return; -@@ -405,7 +405,7 @@ +@@ -429,7 +429,7 @@ public class ClassGeneratorUtil implemen // Create this constructor method - CodeVisitor cv = + CodeVisitor cv = - cw.visitMethod( modifiers, "<init>", methodDescriptor, exceptions ); + cw.visitMethod( modifiers, "<init>", methodDescriptor, exceptions, null ); // Generate code to push arguments as an object array generateParameterReifierCode( paramTypes, false/*isStatic*/, cv ); -@@ -606,7 +606,7 @@ +@@ -466,7 +466,7 @@ public class ClassGeneratorUtil implemen + void generateStaticInitializer( ClassWriter cw ) + { + CodeVisitor cv = +- cw.visitMethod( ACC_STATIC, "<clinit>", "()V", null/*exceptions*/ ); ++ cw.visitMethod( ACC_STATIC, "<clinit>", "()V", null/*exceptions*/, null ); + + // Generate code to invoke the ClassGeneratorUtil initStatic() method + +@@ -669,7 +669,7 @@ public class ClassGeneratorUtil implemen // Add method body - CodeVisitor cv = cw.visitMethod( + CodeVisitor cv = cw.visitMethod( - modifiers, "_bshSuper"+methodName, methodDescriptor, exceptions ); + modifiers, "_bshSuper"+methodName, methodDescriptor, exceptions, null ); ++++++ bsh2-fix-tests.patch ++++++ --- /var/tmp/diff_new_pack.HC2WSc/_old 2016-02-25 21:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.HC2WSc/_new 2016-02-25 21:51:42.000000000 +0100 @@ -1,17 +1,8 @@ -Index: BeanShell-2.0b5/engine/src/TestBshScriptEngine.java +Index: beanshell-2.0b6/engine/src/TestBshScriptEngine.java =================================================================== ---- BeanShell-2.0b5.orig/engine/src/TestBshScriptEngine.java 2005-06-12 16:45:52.000000000 +0200 -+++ BeanShell-2.0b5/engine/src/TestBshScriptEngine.java 2009-11-25 09:12:27.361877742 +0100 -@@ -42,7 +42,7 @@ - engine.eval("foo() { return foo+1; }"); - // invoke a method - Invocable invocable = (Invocable) engine; -- int foo = (Integer)invocable.invoke( "foo" ); -+ int foo = (Integer)invocable.invokeFunction( "foo", null ); - assertTrue( foo == 43 ); - - // get interface -@@ -53,6 +53,7 @@ +--- beanshell-2.0b6.orig/engine/src/TestBshScriptEngine.java ++++ beanshell-2.0b6/engine/src/TestBshScriptEngine.java +@@ -54,6 +54,7 @@ public class TestBshScriptEngine runnable.run(); assertTrue( (Boolean)engine.get("flag") == true ); @@ -19,7 +10,7 @@ // get interface from scripted object engine.eval( "flag2=false; myObj() { run() { flag2=true; } return this; }"); -@@ -63,6 +64,7 @@ +@@ -64,6 +65,7 @@ public class TestBshScriptEngine (Runnable)invocable.getInterface( scriptedObject, Runnable.class ); runnable.run(); assertTrue( (Boolean)engine.get("flag2") == true );
