summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2023-04-22 15:48:22 +0200
committerFlorian Schmaus <flow@gentoo.org>2023-09-11 14:32:30 +0200
commit3e54188b375ca5be53aa15fc99ce5e634dad27b8 (patch)
treec6a810b8168ce8f1cc63a87bada1ed3957a0adb8 /dev-java/java-service-wrapper/files
parentdev-python/sphinxcontrib-qthelp: Stabilize 1.0.6 ALLARCHES, #914000 (diff)
downloadgentoo-3e54188b375ca5be53aa15fc99ce5e634dad27b8.tar.gz
gentoo-3e54188b375ca5be53aa15fc99ce5e634dad27b8.tar.bz2
gentoo-3e54188b375ca5be53aa15fc99ce5e634dad27b8.zip
dev-java/java-service-wrapper: do not directly call java-run-tool
Closes: https://bugs.gentoo.org/878869 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'dev-java/java-service-wrapper/files')
-rw-r--r--dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
new file mode 100644
index 000000000000..135c5a1ae8bf
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
@@ -0,0 +1,25 @@
+|Original version of this patch by Ralph Sennhauser <sera@gentoo.org>
+|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
+|
+|Added in 3.5.4, make false default for Gentoo
+|
+|* Add a new wrapper.java.command.resolve property to control whether or not the
+| Wrapper tries to resolve any symbolic links in the Java command, specified
+| with the wrapper.java.command property. Historically, it has always done so,
+| but some jvm started applications like run-java-tool on Gentoo will fail if
+| it is run directly as they have a check to make sure it is launched via a
+| symbolic link.
+|
+# https://bugs.gentoo.org/878869
+--- a/src/c/wrapper.c.old 2014-07-21 09:12:55.000000000 +0200
++++ b/src/c/wrapper.c 2014-07-21 09:13:22.000000000 +0200
+@@ -4908,7 +4908,7 @@
+ if (!path) {
+ log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
+ } else {
+- replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE);
++ replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE);
+ if (replacePath == TRUE) {
+ free(*para);
+ *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
+