gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 06:37:10 -08:00
Code Issues Projects Releases Wiki Activity

dev-java/java-service-wrapper: do not directly call java-run-tool

Browse Source 
Closes: https://bugs.gentoo.org/878869
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Florian Schmaus <flow@gentoo.org>
This commit is contained in:
Volkmar W. Pogatzki
2023-09-11 14:32:30 +02:00
committed by Florian Schmaus
parent 6e7b28350a
commit 3e54188b37
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
+25
View File
@@ -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));
dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild → dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
+5 -1
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,6 +33,10 @@ JAVA_JAR_FILENAME="wrapper.jar"
JAVA_TEST_SRC_DIR="src/test"
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
PATCHES=(
"${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
)
src_prepare() {
default