diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/Manifest.gz | bin | 57631 -> 57627 bytes | |||
| -rw-r--r-- | dev-java/java-service-wrapper/Manifest | 3 | ||||
| -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 |
4 files changed, 32 insertions, 2 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex 96c973225540..d23ee027c52d 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest index 5f5a8511bb39..67dbab84be84 100644 --- a/dev-java/java-service-wrapper/Manifest +++ b/dev-java/java-service-wrapper/Manifest @@ -1,3 +1,4 @@ +AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1292 BLAKE2B 192bb8dc9deb6d39131b4af992dc3e906fcf6d6d21e4d2edcb5e4aea9169c01dff273643c196b47c1f118b44e38083c1092f71e49e5502936945d51cf4c4c8b5 SHA512 075434a9a2067593332f7b0827dcc077102fb1c1ca11347ed3e2d62e499f6022c1948feaa3be66b17891e539c12a77d98bc292ac143bc5acdf387bd1e3ec399f DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09 -EBUILD java-service-wrapper-3.5.50.ebuild 2302 BLAKE2B 4a6c238518571f013e8ddd5d7f4346c0617cb307db33bd55563f93539d056b88f1c2ef0d740e3b8942c58b2a706586887d1d37a068564f3412f308025caade18 SHA512 c777594a5b2367af1be7b15192a62ed4e95e5f1b0e0cf728990da345049bc78707f0829b5791cfeef3570a8583c3427278947f045aabc803185ef6531db06af5 +EBUILD java-service-wrapper-3.5.50-r1.ebuild 2388 BLAKE2B f157561b01c9cbd75bc5f4327bdaa1eafb7fc445b024cf75c81c4f01cad3229cc4f542e8c3e932b188c03a09c23ca434536a0f5c83ead8ae3ccde3180add7fef SHA512 8a00fdb945e8cd0053daa3546c56e8000600f4bc81fe8c7fa25206b8d55f68c391e309f4c7a8f504844d8da5d9310324c0751aaa849a3dd99c1b9e7dfcda88dc MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1 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 |