diff options
| author | Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-04-22 15:48:22 +0200 |
|---|---|---|
| committer | Florian Schmaus <flow@gentoo.org> | 2023-09-11 14:32:30 +0200 |
| commit | 3e54188b375ca5be53aa15fc99ce5e634dad27b8 (patch) | |
| tree | c6a810b8168ce8f1cc63a87bada1ed3957a0adb8 /dev-java/java-service-wrapper | |
| parent | 6e7b28350a208dbb70c0bfecca748eae96f3de7b (diff) | |
| download | gentoo-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')
| -rw-r--r-- | dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch | 25 | ||||
| -rw-r--r-- | dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild (renamed from dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild) | 6 |
2 files changed, 30 insertions, 1 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)); + diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild index 261d3bf92668..8fdfe9ac2063 100644 --- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild @@ -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 |