openkylin
/
bsh
mirror of https://gitee.com/openkylin/bsh.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

update version info.

This commit is contained in:
rtlhq 2023-10-16 13:17:25 +08:00 committed by cckylin-cibot
parent 9bf988fe84
commit c5acbd5cca
10 changed files with 96 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
bsh (2.0b4-ok1.2) nile; urgency=medium
* update version info.
-- rtlhq <nobelxyz@163.com> Mon, 16 Oct 2023 13:07:39 +0800
bsh (2.0b4-ok1.1) nile; urgency=medium
* Build for openkylin.

30
debian/patches/0007-update-version-info.patch vendored Normal file
View File

@ -0,0 +1,30 @@
From: rtlhq <nobelxyz@163.com>
Date: Mon, 16 Oct 2023 13:17:25 +0800
Subject: update version info.
---
build.xml | 2 +-
lib/keep | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 lib/keep
diff --git a/build.xml b/build.xml
index 755ea2f..52bfe64 100644
--- a/build.xml
+++ b/build.xml
@@ -159,7 +159,7 @@
optimize="on"
debug="off"
includes="**/*.java"
- excludes="${excludes},**/bak/**"
+ excludes="${excludes},**/bak/**" target="1.6"
>
<classpath>
<fileset refid="lib-fileset"/>
diff --git a/lib/keep b/lib/keep
new file mode 100644
index 0000000..2fa992c
--- /dev/null
+++ b/lib/keep
@@ -0,0 +1 @@
+keep

15
debian/patches/01_EnableBsfAdapter_buildXml.patch vendored
View File

@ -1,8 +1,15 @@
Description: Build without the BSF adapter.
Author: Wolfgang Baer <WBaer@gmx.de>
From: Wolfgang Baer <WBaer@gmx.de>
Date: Mon, 16 Oct 2023 05:17:44 +0000
Subject: Build without the BSF adapter.
--- bsh~/build.xml 2005-08-08 19:56:01.000000000 +0200
+++ bsh/build.xml 2005-08-06 21:16:21.000000000 +0200
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 8d8ec87..12c7322 100644
--- a/build.xml
+++ b/build.xml
@@ -54,10 +54,10 @@
-->

19
debian/patches/02_GNUvms_workaround.patch vendored
View File

@ -1,9 +1,16 @@
Description: Insert a work around for GNU JVMs to use an AWT based GUI instead
of swing.
Author: Wolfgang Baer <WBaer@gmx.de>
From: Wolfgang Baer <WBaer@gmx.de>
Date: Mon, 16 Oct 2023 05:17:44 +0000
Subject: Insert a work around for GNU JVMs to use an AWT based GUI instead
--- bsh~/src/bsh/Console.java 2003-08-29 17:11:14.000000000 +0200
+++ bsh/src/bsh/Console.java 2005-02-22 23:20:35.422962248 +0100
of swing.
---
src/bsh/Console.java | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/bsh/Console.java b/src/bsh/Console.java
index bb8481f..b27db2e 100644
--- a/src/bsh/Console.java
+++ b/src/bsh/Console.java
@@ -35,6 +35,7 @@
package bsh;
@ -12,7 +19,7 @@ Author: Wolfgang Baer <WBaer@gmx.de>
/**
Console startup class.
@@ -47,18 +48,25 @@
@@ -47,18 +48,25 @@ public class Console
System.out.println("Can't find the BeanShell utilities...");
if ( Capabilities.haveSwing() )

14
debian/patches/03_target13_buildXml.patch vendored
View File

@ -1,14 +0,0 @@
Description: Compile 1.3 java code.
Author: Wolfgang Baer <WBaer@gmx.de>
--- bsh~/build.xml 2005-08-08 20:13:21.000000000 +0200
+++ bsh/build.xml 2005-08-08 20:21:33.000000000 +0200
@@ -159,7 +159,7 @@
optimize="on"
debug="off"
includes="**/*.java"
- excludes="${excludes},**/bak/**"
+ excludes="${excludes},**/bak/**" target="1.6"
>
<classpath>
<fileset refid="lib-fileset"/>

17
debian/patches/04_fix_typo.patch vendored
View File

@ -1,9 +1,16 @@
Description: Fixes a typo.
Author: Niels Thykier <niels@thykier.net>
From: Niels Thykier <niels@thykier.net>
Date: Mon, 16 Oct 2023 05:17:44 +0000
Subject: Fixes a typo.
--- a/src/bsh/BshClassManager.java 2010-11-21 19:59:08.597086821 +0100
+++ b/src/bsh/BshClassManager.java 2010-11-21 20:01:06.128078201 +0100
@@ -493,7 +493,7 @@
---
src/bsh/BshClassManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bsh/BshClassManager.java b/src/bsh/BshClassManager.java
index ecd5e02..8f66b48 100644
--- a/src/bsh/BshClassManager.java
+++ b/src/bsh/BshClassManager.java
@@ -493,7 +493,7 @@ public class BshClassManager
if ( cur != null )
throw new InterpreterError("Defining class problem: "+className
+": BeanShell cannot yet simultaneously define two or more "

15
debian/patches/05_link_javadoc.patch vendored
View File

@ -1,8 +1,15 @@
Description: Link the Javadoc against system installed javadocs.
Author: Niels Thykier <niels@thykier.net>
From: Niels Thykier <niels@thykier.net>
Date: Mon, 16 Oct 2023 05:17:44 +0000
Subject: Link the Javadoc against system installed javadocs.
--- a/build.xml 2010-11-21 20:16:20.000000000 +0100
+++ b/build.xml 2010-11-21 20:24:15.544531250 +0100
---
build.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 12c7322..755ea2f 100644
--- a/build.xml
+++ b/build.xml
@@ -201,7 +201,11 @@
windowtitle="BeanShell ${version}"
doctitle="&lt;h1&gt;BeanShell ${version}&lt;h1&gt;"

14
debian/patches/07_java9_compatibility.patch vendored
View File

@ -1,9 +1,17 @@
Description: Fixes the build failure with Java 9
Author: Emmanuel Bourg <ebourg@apache.org>
From: Emmanuel Bourg <ebourg@apache.org>
Date: Mon, 16 Oct 2023 05:17:44 +0000
Subject: Fixes the build failure with Java 9
Forwarded: no
---
src/bsh/util/AWTConsole.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/bsh/util/AWTConsole.java b/src/bsh/util/AWTConsole.java
index aca67d4..ad0b484 100644
--- a/src/bsh/util/AWTConsole.java
+++ b/src/bsh/util/AWTConsole.java
@@ -220,8 +220,6 @@
@@ -220,8 +220,6 @@ public class AWTConsole extends TextArea
Great. What a piece of crap.
*/
public void setCaretPosition( int pos ) {

2
debian/patches/CVE-2016-2510.patch vendored
View File

@ -16,7 +16,7 @@ https://github.com/beanshell/beanshell/commit/1ccc66bb693d4e46a34a904db8eeff0780
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bsh/XThis.java b/src/bsh/XThis.java
index 3f05974..94bcc22 100644
index 3f05974..cd225c7 100644
--- a/src/bsh/XThis.java
+++ b/src/bsh/XThis.java
@@ -65,7 +65,7 @@ public class XThis extends This

1
debian/patches/series vendored
View File

@ -4,3 +4,4 @@
05_link_javadoc.patch
CVE-2016-2510.patch
07_java9_compatibility.patch
0007-update-version-info.patch