[freeplane] 03/08: fix patches for 1.6.6
Felix Natter
fnatter-guest at moszumanska.debian.org
Sat Sep 16 13:51:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit db85719ae9fc75f44177a9f8b3a41d77a6744bac
Author: Felix Natter <fnatter at gmx.net>
Date: Sat Sep 16 15:26:10 2017 +0200
fix patches for 1.6.6
---
debian/patches/10_build_usr_share_java.patch | 100 +++++++++++++++++++-------
debian/patches/30_disable_update_check.patch | 4 +-
debian/patches/40_allow_usj_codebase.patch | 11 ++-
debian/patches/50_disable_secure_groovy.patch | 28 ++++++++
debian/patches/series | 1 +
5 files changed, 108 insertions(+), 36 deletions(-)
diff --git a/debian/patches/10_build_usr_share_java.patch b/debian/patches/10_build_usr_share_java.patch
index fbfc6f6..fb6befc 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -9,7 +9,17 @@ Forwarded: not-needed
Last-Update: 2016-02-04
--- a/build.gradle
+++ b/build.gradle
-@@ -15,23 +15,45 @@
+@@ -1,6 +1,6 @@
+-plugins {
+- id "nebula.ospackage" version "4.4.0"
+-}
++//plugins {
++// id "nebula.ospackage" version "4.4.0"
++//}
+
+ allprojects {
+ // in a multi-project setup, all projects must have the same version number!
+@@ -20,23 +20,45 @@
rootDir.path + "/freeplane_plugin_jsyntaxpane/lib",
rootDir.path + "/freeplane_plugin_latex/lib",
rootDir.path + "/freeplane_plugin_svg/lib"]
@@ -60,7 +70,7 @@ Last-Update: 2016-02-04
}
def filterAndExternalizePluginDependencies(runtime_files) {
-@@ -77,12 +99,6 @@
+@@ -82,12 +104,6 @@
failOnError = false
}
@@ -71,9 +81,9 @@ Last-Update: 2016-02-04
- }
-
dependencies {
- testCompile group: 'junit', name: 'junit', version: '4.11'
- }
-@@ -104,14 +120,9 @@
+ testCompile 'junit:junit:4.11'
+ testCompile 'org.assertj:assertj-core:2.6.0'
+@@ -110,14 +126,9 @@
// OSGi projects (/plugin/, freeplane) need this for compilation (e.g. resolve Bundle),
// and freeplane_framework needs to copy it to BUILD/framework.jar
configure(subprojects.findAll {it.name =~ /plugin/ || it.name =~ /^freeplane$/ || it.name =~ /^freeplane_framework$/}){
@@ -84,13 +94,13 @@ Last-Update: 2016-02-04
- }
-
dependencies {
-- compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
-+ //compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
+- compile group: 'org.knopflerfish.kf6', name:'framework', version: '8.0.4'
++ //compile group: 'org.knopflerfish.kf6', name:'framework', version: '8.0.4'
+ compile ':knopflerfish-framework'
}
}
-@@ -124,11 +135,13 @@
+@@ -130,11 +141,13 @@
else
ext.pluginid = project.name.replace("freeplane_plugin_", "org.freeplane.plugin.")
@@ -109,7 +119,7 @@ Last-Update: 2016-02-04
task filterOSGiManifestForEclipse(type: Copy) {
from('build/tmp/jar/MANIFEST.MF') {
-@@ -180,18 +193,11 @@
+@@ -186,18 +199,9 @@
configure(subprojects.findAll {it.name =~ /plugin/ }) {
task copyOSGiJars(type: Copy) {
@@ -125,37 +135,36 @@ Last-Update: 2016-02-04
- include("*.jar")
- exclude('*-sources.jar')
- }
-+
+ from ("$buildDir/libs") {
+ include("plugin-${project.version}.jar")
+ }
-+
- into(globalBuild + '/plugins/' + pluginid + '/lib/')
+ into(globalBin + '/plugins/' + pluginid + '/lib/')
}
--- a/freeplane/build.gradle
+++ b/freeplane/build.gradle
-@@ -4,8 +4,9 @@
- }
+@@ -5,8 +5,10 @@
dependencies {
--
+
- mergedViewerDependencies 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
-+
-+ // no not use mergedViewerDependencies to avoid Debian upgrade problems
-+ compile 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
+- mergedViewerDependencies ':kitfox-svg-salamander-1.1.1-p1'
++ //mergedViewerDependencies 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
++ compile 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
++ //mergedViewerDependencies ':kitfox-svg-salamander-1.1.1-p1'
++ compile ':svgSalamander'
compile project(':JOrtho_0.4_freeplane')
-@@ -13,19 +14,18 @@
+@@ -14,19 +16,17 @@
'commons-io:commons-io:2.4',
'commons-codec:commons-codec:1.7',
'com.jgoodies:jgoodies-forms:1.9.0',
- 'com.jgoodies:jgoodies-common:1.8.1'
-+ //'com.jgoodies:jgoodies-common:1.8.1'
++ //'com.jgoodies:jgoodies-common:1.8.1'
+ ':idw'
- compile ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.16.18') {
+ compile ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.17.3') {
exclude module: 'javahelp'
exclude module: 'mnemonicsetter'
}
@@ -163,16 +172,16 @@ Last-Update: 2016-02-04
- testCompile 'junit:junit:4.12',
- 'org.hamcrest:hamcrest-all:1.3',
- 'org.mockito:mockito-all:1.10.19'
+-
+- // from flatDir "localGitDepsRepository":
+- compile ':idw-gpl-1.6.1'
+ //testCompile 'junit:junit:4.12',
+ // 'org.hamcrest:hamcrest-all:1.3',
+ // 'org.mockito:mockito-all:1.10.19'
-
-- // from flatDir "localGitDepsRepository":
-- compile ':idw-gpl-1.6.1'
}
sourceSets {
-@@ -180,16 +180,17 @@
+@@ -181,16 +181,17 @@
}
task copyOSGiJars(type: Copy) {
@@ -197,9 +206,9 @@ Last-Update: 2016-02-04
+ exclude('framework-*.jar')
+ exclude('freeplane-*.jar')
}
- into(globalBuild + '/core/' + pluginid + '/lib/')
+ into(globalBin + '/core/' + pluginid + '/lib/')
}
-@@ -312,7 +313,7 @@
+@@ -315,7 +316,7 @@
jar.dependsOn viewerJar
jar.dependsOn editorJar
jar.dependsOn osgiJar
@@ -273,3 +282,40 @@ Last-Update: 2016-02-04
}
jar {
+--- a/freeplane_plugin_script/build.gradle
++++ b/freeplane_plugin_script/build.gradle
+@@ -2,10 +2,10 @@
+ compile project(':freeplane')
+ compile project(':freeplane_plugin_jsyntaxpane')
+ compile 'org.codehaus.groovy:groovy-all:2.3.1'
+- compile ('org.freeplane.securegroovy:groovy-patcher:0.0.2') {
+- transitive = false
+- }
+- compile 'net.bytebuddy:byte-buddy:1.6.9'
++ //compile ('org.freeplane.securegroovy:groovy-patcher:0.0.2') {
++ // transitive = false
++ //}
++ //compile 'net.bytebuddy:byte-buddy:1.6.9'
+ }
+
+ tasks.withType(JavaCompile) {
+--- a/dist.gradle
++++ b/dist.gradle
+@@ -33,7 +33,7 @@
+ apply from: './win.dist.gradle'
+ apply from: './bin.dist.gradle'
+ apply from: './src.dist.gradle'
+-apply from: './linux-packages.gradle'
++//apply from: './linux-packages.gradle'
+
+ // meta task
+ task dist {
+@@ -45,7 +45,7 @@
+ dependsOn macDist
+ dependsOn gitinfoDist
+ dependsOn historyDist
+- dependsOn freeplaneDeb
++ //dependsOn freeplaneDeb
+ }
+
+ // clean
diff --git a/debian/patches/30_disable_update_check.patch b/debian/patches/30_disable_update_check.patch
index 38c090f..781d36b 100644
--- a/debian/patches/30_disable_update_check.patch
+++ b/debian/patches/30_disable_update_check.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
Last-Update: 2016-02-04
--- a/freeplane/viewer-resources/freeplane.properties
+++ b/freeplane/viewer-resources/freeplane.properties
-@@ -170,7 +170,7 @@
+@@ -176,7 +176,7 @@
browsemode_initial_map=map.mm
bugTrackerLocation=http\://www.freeplane.org/bugs
center_selected_node=false
@@ -15,7 +15,7 @@ Last-Update: 2016-02-04
connector_shape=CUBIC_CURVE
--- a/freeplane/external-resources/xml/mindmapmodemenu.xml
+++ b/freeplane/external-resources/xml/mindmapmodemenu.xml
-@@ -467,7 +467,7 @@
+@@ -488,7 +488,7 @@
<Entry builder="separator" />
</Entry>
<Entry name="help">
diff --git a/debian/patches/40_allow_usj_codebase.patch b/debian/patches/40_allow_usj_codebase.patch
index d579de7..593e60c 100644
--- a/debian/patches/40_allow_usj_codebase.patch
+++ b/debian/patches/40_allow_usj_codebase.patch
@@ -5,10 +5,11 @@ Forwarded: not-needed
Last-Update: 2016-05-05
--- a/freeplane_framework/script/freeplane.policy
+++ b/freeplane_framework/script/freeplane.policy
-@@ -6,6 +6,18 @@
- permission java.security.AllPermission;
+@@ -10,3 +10,15 @@
+ permission java.io.FilePermission "${org.freeplane.basedirectory}/-", "read";
+ permission java.lang.RuntimePermission "getClassLoader";
};
-
++
+grant codeBase "file:/usr/share/knopflerfish/*" {
+ permission java.security.AllPermission;
+};
@@ -20,7 +21,3 @@ Last-Update: 2016-05-05
+grant codeBase "file:/usr/share/maven-repo/-" {
+ permission java.security.AllPermission;
+};
-+
- grant {
- permission java.lang.RuntimePermission "getClassLoader";
- };
diff --git a/debian/patches/50_disable_secure_groovy.patch b/debian/patches/50_disable_secure_groovy.patch
new file mode 100644
index 0000000..9e0edef
--- /dev/null
+++ b/debian/patches/50_disable_secure_groovy.patch
@@ -0,0 +1,28 @@
+Description: disable "groovy patcher"
+ The GROOVY-8163 issue was fixed by freeplane upstream by using a library
+ "securegroovy" which uses byte-buddy to instrument groovy code.
+ GROOVY-8163 is fixed in groovy-2.5.0 and Debian's groovy-2.4.8-2, so this patch
+ removes the upstream "securegroovy" invocation.
+Author: Felix Natter
+Bug: https://issues.apache.org/jira/browse/GROOVY-8163
+Last-Update: 2017-09-15
+--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java
++++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java
+@@ -34,7 +34,7 @@
+ import org.freeplane.features.map.NodeModel;
+ import org.freeplane.features.mode.Controller;
+ import org.freeplane.plugin.script.proxy.ProxyFactory;
+-import org.freeplane.securegroovy.GroovyPatcher;
++//import org.freeplane.securegroovy.GroovyPatcher;
+
+ import groovy.lang.Binding;
+ import groovy.lang.GroovyObject;
+@@ -186,7 +186,7 @@
+ private static boolean groovyPatched = false;
+ private Script compileAndCache(final ScriptingSecurityManager scriptingSecurityManager) throws Throwable {
+ if(! groovyPatched){
+- GroovyPatcher.apply(GroovyObject.class);
++ //GroovyPatcher.apply(GroovyObject.class);
+ groovyPatched = true;
+ }
+ if (compileTimeStrategy.canUseOldCompiledScript()) {
diff --git a/debian/patches/series b/debian/patches/series
index d177a01..5fbddec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
20_freeplane_sh.patch
30_disable_update_check.patch
40_allow_usj_codebase.patch
+50_disable_secure_groovy.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git
More information about the pkg-java-commits
mailing list