Sync from SUSE:SLFO:Main bsh2 revision 0c88f04ea1cb736c450a99e40c518cfb

.gitattributes

@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text

0000-source-target-1.8.patch

@@ -0,0 +1,57 @@
+diff --git a/build.xml b/build.xml
+index 8542245..6179cfa 100644
+--- a/build.xml
++++ b/build.xml
+@@ -16,8 +16,8 @@
+ 
+ <property name="file" value=""/>
+ 
+-	<property name="ant.build.javac.target" value="1.6" />
+-	<property name="ant.build.javac.source" value="1.6" />
++	<property name="ant.build.javac.target" value="1.8" />
++	<property name="ant.build.javac.source" value="1.8" />
+ 	<property name="version" value="2.1.1"/>
+ 	<property name="deprecation" value="on"/>
+ 	<property name="Specification-Title" value="BeanShell" />
+@@ -178,8 +178,8 @@
+ 			debug="on"
+ 			includes="**/*.java"
+ 			excludes="${excludes},**/bak/**"
+-			source="1.6"
+-			target="1.6"
++			source="1.8"
++			target="1.8"
+ 		>
+ 			<classpath>
+ 				<fileset refid="lib-fileset"/>
+@@ -213,8 +213,8 @@
+ 			debug="on"
+ 			includes="**/*.java"
+ 			excludes="${excludes},**/bak/**"
+-			source="1.6"
+-			target="1.6"
++			source="1.8"
++			target="1.8"
+ 		>
+ 			<classpath>
+ 				<fileset refid="lib-fileset"/>
+@@ -255,7 +255,7 @@
+ 			 destdir="${javadoc-dir}"
+ 			 author="true"
+ 			 version="true"
+-			 source="1.6"
++			 source="1.8"
+ 			 use="true"
+ 			 windowtitle="BeanShell ${version}"
+ 			 doctitle="&lt;h1&gt;BeanShell ${version}&lt;h1&gt;"
+@@ -680,8 +680,8 @@
+ 				destdir="${build-dir}"
+ 				debug="on"
+ 				debuglevel="lines,vars,source"
+-				source="1.6"
+-				target="1.6"
++				source="1.8"
++				target="1.8"
+ 			  >
+ 		 <classpath>
+ 			<path refid="test-classpath"/>

_service

@@ -0,0 +1,16 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/beanshell/beanshell.git</param>
+		<param name="revision">2.1.1</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+        <param name="exclude">**.jar</param>
+        <param name="exclude">engine/javax-src/javax/script/*.java</param>
+        <param name="exclude">engine/javax-src/javax/script/*.html</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

bsh-2.0b5-docs.patch

@@ -0,0 +1,25 @@
+Index: beanshell-2.0b6/docs/faq/faq.xsl
+===================================================================
+--- beanshell-2.0b6.orig/docs/faq/faq.xsl
++++ beanshell-2.0b6/docs/faq/faq.xsl
+@@ -18,7 +18,7 @@
+ <!--xsl:param name="imagedir"/-->
+ 
+ <!-- Output directives -->
+-<xsl:output method="xhtml" indent="yes"/>
++<xsl:output method="html" indent="yes"/>
+ 
+ <!-- 
+ 	Root
+Index: beanshell-2.0b6/docs/manual/xsl/manual.xsl
+===================================================================
+--- 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"
+-    xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
++        xmlns:redirect="http://xml.apache.org/xalan/redirect"
+     extension-element-prefixes="redirect"
+ >
+ 

bsh2.changes

@@ -0,0 +1,215 @@
+-------------------------------------------------------------------
+Fri Apr 28 12:05:16 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 2.1.1
+  * Changes of 2.1.1
+    + Fix src/bsh/util/AWTConsole.java breakage with newer Java
+      versions
+  * Changes of 2.1.0
+    + This release formalizes the merge of 2.0b6 with suitable
+      backports from the development version of BeanShell. Also
+      included are are some ALv2 contributions to the BeanShell2
+      fork that had not been folded into BeanShell but are still
+      applicable to this version. For backwards compatibility
+      purposes, the 2.x branch of BeanShell still supports a minimum
+      Java version of 1.6.
+- Modified patch:
+  * beanshell-2.0b6-target.patch -> 0000-source-target-1.8.patch
+    + rediff to changed context and clean up
+- Added patches:
+  * beanshell-2.0b6-getpeer.patch
+    + fixed in 2.1.1
+  * bsh2-fix-tests.patch
+    + not needed any more
+
+-------------------------------------------------------------------
+Mon Apr 15 08:26:46 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Replace find -exec rm by just -delete.
+- Trim BSH 2.x changelog from description, and trim "In other
+  words" description repetition. Trim leftover filler wording
+  from description.
+
+-------------------------------------------------------------------
+Thu Feb  7 07:17:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Build against javacc and glassfish-servlet-api instead of
+  javacc3 and servlet4
+
+-------------------------------------------------------------------
+Thu Nov  1 12:44:36 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Do not build against an old system asm, but use the few shaded
+  files source files distributed in the tarball.
+- Removed patches:
+  * bsh2-ClassGeneratorUtil.patch
+  * bsh2-asm.patch
+    - not needed after the above change
+- Modified patch:
+  * beanshell-2.0b6-target.patch
+    - fix source level to correspond to the target
+
+-------------------------------------------------------------------
+Thu Oct 18 03:03:38 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Use the pom.xml file from the sources to generate maven provides
+
+-------------------------------------------------------------------
+Wed May 16 07:29:15 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * beanshell-2.0b6-target.patch
+    + Build with source and target 8 to prepare for a possible
+      removal of 1.6 compatibility
+
+-------------------------------------------------------------------
+Wed Sep 20 09:11:09 UTC 2017 - fstrba@suse.com
+
+- Build with whatever is the default java-devel provider
+- Modified patch:
+  * beanshell-2.0b6-target.patch
+    + specify target and source consistently
+    + fix classpath issue with javadoc generation
+- Added patch:
+  * beanshell-2.0b6-getpeer.patch
+    + fix build with jdk9
+	+ access the inacessible APIs by reflection
+
+-------------------------------------------------------------------
+Thu Sep  7 17:25:40 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * beanshell-2.0b6-target.patch
+    - Force java target level to 1.6
+- Force java source and target levels to 1.6 in order to allow
+  building with jdk9
+- Force building with java-1_8_0-openjdk-devel since javadoc errors
+  are fatal in jdk9
+
+-------------------------------------------------------------------
+Fri May 19 08:45:20 UTC 2017 - mpluskal@suse.com
+
+- Update package dependencies 
+
+-------------------------------------------------------------------
+Wed Mar 16 17:21:37 UTC 2016 - bwiedemann@suse.com
+
+- Add reproducible.patch to fix build-compare
+
+-------------------------------------------------------------------
+Tue Feb 23 17:36:36 UTC 2016 - tchvatal@suse.com
+
+- 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
+
+-------------------------------------------------------------------
+Tue Mar 24 11:11:46 UTC 2015 - tchvatal@suse.com
+
+- Fix the pom's to not require network and thus pass parser validation
+
+-------------------------------------------------------------------
+Wed Mar 18 09:46:04 UTC 2015 - tchvatal@suse.com
+
+- Fix build with new javapackages-tools
+
+-------------------------------------------------------------------
+Tue Jul  8 08:41:24 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner.
+- Fix few rpmlint complaints
+- Kill src package as nothing seem to depend on it and it is pointless.
+
+-------------------------------------------------------------------
+Tue Jul  8 08:34:26 UTC 2014 - tchvatal@suse.com
+
+- Change the bytecode stuff.
+
+-------------------------------------------------------------------
+Thu May 15 15:39:22 UTC 2014 - darin@darins.net
+
+- disable bytecode check on sle_11
+- disable post-build-check on SLE_11 due to FHS 2.2 errors
+
+-------------------------------------------------------------------
+Thu Feb  6 13:49:20 UTC 2014 - fcrozat@suse.com
+
+- Fix license tag to SPL-1.0 or LGPL-2.0+ (bnc#862426)
+- Encure License.txt is part of main package (bnc#862426)
+
+-------------------------------------------------------------------
+Mon Sep  9 11:05:35 UTC 2013 - tchvatal@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+-------------------------------------------------------------------
+Wed Aug 28 13:22:44 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from javapackages-tools
+- unversioned javadoc dir
+
+-------------------------------------------------------------------
+Thu Jul 25 11:13:39 UTC 2013 - tchvatal@suse.com
+
+- Fix build on factory with new rpm.
+
+-------------------------------------------------------------------
+Fri Mar 11 09:37:31 UTC 2011 - mvyskocil@suse.cz
+
+- Fix build of documentation, remove xalan-j2 dependency
+  * add bsh-2.0b5-docs.patch
+
+-------------------------------------------------------------------
+Mon Aug  9 09:40:21 UTC 2010 - mvyskocil@suse.cz
+
+- Add a new bsh2-src subpackage, which will be used for build of jedit
+  bnc#629375
+
+-------------------------------------------------------------------
+Wed Nov 25 07:48:04 UTC 2009 - mvyskocil@suse.cz
+
+- Updated to bsh-2.0b5
+  * Merged with bsh2-2.0-0.b5.1.jpp5.src.rpm
+- Do not use a bundled javax.script API
+- Obsoleted patches:
+  * bsh2-build.patch
+  * bsh2-crosslink.patch
+  * bsh2-java14compat.patch
+  * bsh2-java15.patch
+  * bsh2-jedit.patch
+  * bsh2-readline.patch
+
+-------------------------------------------------------------------
+Wed Mar 25 15:10:00 CET 2009 - mvyskocil@suse.cz
+
+- added xalan-j2 and ant-trax to BR for documentation build 
+
+-------------------------------------------------------------------
+Fri Mar 30 10:58:23 CEST 2007 - aj@suse.de
+
+- Add unzip to BuildRequires.
+
+-------------------------------------------------------------------
+Mon Sep 25 15:16:21 CEST 2006 - skh@suse.de
+
+- don't use icecream
+- use source="1.4" and target="1.4" for build with java 1.5
+
+-------------------------------------------------------------------
+Wed Jan 25 21:45:57 CET 2006 - mls@suse.de
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Mon Oct 17 14:04:02 CEST 2005 - jsmeix@suse.de
+
+- Current version 2.0 from JPackage.org
+

bsh2.spec

@@ -0,0 +1,211 @@
+#
+# spec file for package bsh2
+#
+# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2000-2008, JPackage Project
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define orig_name bsh
+Name:           bsh2
+Version:        2.1.1
+Release:        0
+Summary:        Scripting for Java (BeanShell Version 2.x)
+License:        LGPL-2.0-or-later OR SPL-1.0
+Group:          Development/Libraries/Java
+URL:            http://www.beanshell.org/
+Source0:        beanshell-%{version}.tar.xz
+#PATCH-FIX-OPENSUSE: use html output and JVM's built-in xmlns:redirect
+Patch3:         bsh-2.0b5-docs.patch
+Patch1001:      reproducible.patch
+Patch1002:      0000-source-target-1.8.patch
+BuildRequires:  ant
+BuildRequires:  bsf
+BuildRequires:  bsf-javadoc
+BuildRequires:  fdupes
+BuildRequires:  glassfish-servlet-api
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javacc
+BuildRequires:  javapackages-local
+Requires:       bsf
+Requires:       javapackages-tools
+BuildArch:      noarch
+
+%description
+BeanShell is an embeddable Java source interpreter with object
+scripting language features, written in Java. BeanShell executes
+standard Java statements and expressions, in addition to obvious
+scripting commands and syntax. BeanShell supports scripted objects as
+simple method closures like those in Perl and JavaScript. BeanShell
+can be used interactively for Java experimentation and debugging or
+as a scripting engine for applications.
+
+%package bsf
+Summary:        BSF support for bsh2
+Group:          Development/Libraries/Java
+Requires:       bsf
+
+%description bsf
+Scripting for Java (BeanShell Version 2.x) (BSF support).
+
+%package classgen
+Summary:        ASM support for bsh2
+Group:          Development/Libraries/Java
+
+%description classgen
+Scripting for Java (BeanShell Version 2.x) (ASM support).
+
+%package manual
+Summary:        Documentation for bsh2
+Group:          Documentation/HTML
+
+%description manual
+Scripting for Java (BeanShell Version 2.x) (Manual).
+
+%package javadoc
+Summary:        Javadoc for bsh2
+Group:          Documentation/HTML
+
+%description javadoc
+Scripting for Java (BeanShell Version 2.x) (Java Documentation).
+
+%package demo
+Summary:        Demonstrations and samples for bsh2
+Group:          Development/Libraries/Java
+Requires:       %{name} = %{version}-%{release}
+
+%description demo
+Scripting for Java (BeanShell Version 2.x) (demo and samples).
+
+%prep
+%setup -q -n beanshell-%{version}
+%patch3 -p1
+%patch1001 -p1
+%patch1002 -p1
+
+sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl
+
+%build
+build-jar-repository -s -p lib bsf javacc glassfish-servlet-api
+ant dist
+
+%install
+# jars
+mkdir -p %{buildroot}%{_javadir}/%{name}
+rm -f dist/%{orig_name}-%{version}-src.jar
+rm -f dist/%{orig_name}-%{version}-sources.jar
+for jar in dist/*.jar; do
+  install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar} -%{version}.jar`.jar
+done
+
+# poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -m 644 pom.xml \
+    %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh.pom
+%add_maven_depmap JPP.%{name}-bsh.pom %{name}/bsh.jar -a org.beanshell:%{name},bsh:bsh,bsh:bsh-bsf,org.beanshell:bsh
+
+# manual
+find docs "(" -name ".cvswrappers" -o -name "*.xml" -o -name "*.xsl" -o -name "*.log" ")" -delete
+(cd docs/manual && mv -f html/* . && rm -Rf html xsl)
+
+# javadoc
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -a javadoc/* %{buildroot}%{_javadocdir}/%{name}
+
+# demo
+for i in `find tests -name "*.bsh"`; do
+  perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!%{_bindir}/%{name},' $i
+done
+
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -a tests %{buildroot}%{_datadir}/%{name}
+find %{buildroot}%{_datadir}/%{name} -type d \
+  | sed 's|'%{buildroot}'|%dir |' >  %{name}-demo-%{version}.files
+find %{buildroot}%{_datadir}/%{name} -type f -name "*.bsh" \
+  | sed 's|'%{buildroot}'|%attr(0755,root,root) |'      >> %{name}-demo-%{version}.files
+find %{buildroot}%{_datadir}/%{name} -type f ! -name "*.bsh" \
+  | sed 's|'%{buildroot}'|%attr(0644,root,root) |'      >> %{name}-demo-%{version}.files
+# bshservlet
+mkdir -p %{buildroot}%{_datadir}/%{name}/bshservlet
+(cd %{buildroot}%{_datadir}/%{name}/bshservlet
+jar xf $RPM_BUILD_DIR/beanshell-%{version}/dist/bshservlet.war
+)
+# scripts
+mkdir -p %{buildroot}%{_bindir}
+cat > %{buildroot}%{_bindir}/%{name} << EOF
+#!/bin/sh
+#
+# %{name} script
+# JPackage Project (http://jpackage.sourceforge.net)
+# Source functions library
+. %{_datadir}/java-utils/java-functions
+# Source system prefs
+if [ -f %{_sysconfdir}/%{name}.conf ] ; then
+  . %{_sysconfdir}/%{name}.conf
+fi
+# Source user prefs
+if [ -f \$HOME/.%{name}rc ] ; then
+  . \$HOME/.%{name}rc
+fi
+# Configuration
+MAIN_CLASS=bsh.Interpreter
+if [ -n "\$BSH_DEBUG" ]; then
+  BASE_FLAGS=-Ddebug=true
+fi
+BASE_JARS="%{name}.jar"
+# Set parameters
+set_jvm
+set_classpath \$BASE_JARS
+set_flags \$BASE_FLAGS
+set_options \$BASE_OPTIONS
+# Let's start
+run "\$@"
+EOF
+cat > %{buildroot}%{_bindir}/%{name}doc << EOF
+#!/usr/bin/env %{_bindir}/%{name}
+EOF
+cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/%{name}doc
+%fdupes -s %{buildroot}
+%fdupes docs/
+
+%files -f .mfiles
+%{_javadir}/%{name}/%{orig_name}.jar
+%{_javadir}/%{name}/%{orig_name}-classpath*.jar
+%{_javadir}/%{name}/%{orig_name}-commands*.jar
+%{_javadir}/%{name}/%{orig_name}-core*.jar
+%{_javadir}/%{name}/%{orig_name}-engine*.jar
+%{_javadir}/%{name}/%{orig_name}-reflect*.jar
+%{_javadir}/%{name}/%{orig_name}-util*.jar
+%attr(0755,root,root) %{_bindir}/%{name}
+%attr(0755,root,root) %{_bindir}/%{name}doc
+%license LICENSE
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/bshservlet
+
+%files bsf
+%{_javadir}/%{name}/%{orig_name}-bsf*.jar
+
+%files classgen
+%{_javadir}/%{name}/%{orig_name}-classgen*.jar
+
+%files manual
+%doc docs/*
+
+%files javadoc
+%dir %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
+
+%files demo -f %{name}-demo-%{version}.files
+
+%changelog

reproducible.patch

@@ -0,0 +1,11 @@
+--- beanshell-2.0b6/build.xml.orig	2016-02-05 17:16:07.000000000 +0000
++++ beanshell-2.0b6/build.xml	2016-03-16 17:16:55.240594000 +0000
+@@ -202,7 +202,7 @@
+ 		<copy file="${engine-config}" todir="${build-dir}/META-INF/services" />
+ 
+ 		<tstamp>
+-			<format property="DATE" pattern="yyyy-MM-dd hh:mm:ss" />
++			<format property="DATE" pattern="" />
+ 		</tstamp>
+ 	</target>
+