Publish srcux candidate 0000000776-20261021-173123

6 files changed, 245 insertions, 0 deletions

diff --git a/dev-java/yajsw/files/yajsw-14.01-build-fixes.patch b/dev-java/yajsw/files/yajsw-14.01-build-fixes.patch
new file mode 100644
index 000000000000..31386c8a03f1
--- /dev/null
+++ b/dev-java/yajsw/files/yajsw-14.01-build-fixes.patch
@@ -0,0 +1,42 @@
+# Fix the build path and Java settings for Gradle 9
+
+--- a/build/gradle/build.gradle
++++ b/build/gradle/build.gradle
+@@ -4,10 +4,10 @@
+ }
+ 
+ ext {
+-	projectHome = 'Z:/dev/yajsw2026' //'../..'
+-	coreLibsDir = new File("$projectHome/lib/core").getAbsolutePath()
++	projectHome = rootProject.projectDir.parentFile.parentFile
++	coreLibsDir = new File(projectHome, "lib/core").getAbsolutePath()
+ 	println "$coreLibsDir"
+-	extendedLibsDir = new File("$projectHome/lib/extended").getAbsolutePath()
++	extendedLibsDir = new File(projectHome, "lib/extended").getAbsolutePath()
+ // dependency versions
+ 
+ 	commons_cli_version 			= '1.11.0'
+@@ -66,8 +66,10 @@
+ 
+ 
+ 
+-sourceCompatibility = 11
+-targetCompatibility = 11
++java {
++	sourceCompatibility = JavaVersion.VERSION_11
++	targetCompatibility = JavaVersion.VERSION_11
++}
+ //options.bootClasspath = "${System.getProperty('java6.home')}/jre/lib/rt.jar"
+ version = ''
+ 
+--- a/build/gradle/settings.gradle
++++ b/build/gradle/settings.gradle
+@@ -1,7 +1,7 @@
+ // defines a list of subprojects
+ 
+ // build8. comment out for build9
+-include "wrapper", "wrapper-app", "ahessian", "hessian4", "srvmgr", "groovy-patch"
++include "wrapper", "wrapper-app", "ahessian", "hessian4", "groovy-patch"
+ 
+ // build9. comment out for build8
+ //include "wrapper", "wrapper-app", "wrapper-app9", "ahessian", "hessian4", "srvmgr", "groovy-patch", "groovy-patch9"
diff --git a/dev-java/yajsw/files/yajsw-14.01-javadoc.patch b/dev-java/yajsw/files/yajsw-14.01-javadoc.patch
new file mode 100644
index 000000000000..eea705c534fb
--- /dev/null
+++ b/dev-java/yajsw/files/yajsw-14.01-javadoc.patch
@@ -0,0 +1,15 @@
+# Turn off doc checks so the docs can build
+# this works around errors in the source comments
+
+--- a/build/gradle/wrapper/build.gradle
++++ b/build/gradle/wrapper/build.gradle
+@@ -1,5 +1,9 @@
+ def projectHome = '../../..'
+ 
++tasks.named('javadoc') {
++    options.addBooleanOption('Xdoclint:none', true)
++}
++
+ // set the sources for this build
+ sourceSets.main.java.srcDirs = ["$projectHome/src/yajsw/src/main/java", "$projectHome/src/app/src/main/java"]
+ sourceSets.main.java.exclude 'com/sun/jna/Native.java', 'com/sun/jna/Platform.java', 'org/apache/commons/vfs2/impl/StandardFileSystemManager.java'
diff --git a/dev-java/yajsw/files/yajsw-14.01-keystore.patch b/dev-java/yajsw/files/yajsw-14.01-keystore.patch
new file mode 100644
index 000000000000..4a4ac429090f
--- /dev/null
+++ b/dev-java/yajsw/files/yajsw-14.01-keystore.patch
@@ -0,0 +1,13 @@
+# Build the keystore code from the source in this release
+
+--- a/build/gradle/wrapper/build.gradle
++++ b/build/gradle/wrapper/build.gradle
+@@ -5,7 +5,7 @@ tasks.named('javadoc') {
+ }
+ 
+ // set the sources for this build
+-sourceSets.main.java.srcDirs = ["$projectHome/src/yajsw/src/main/java", "$projectHome/src/app/src/main/java"]
++sourceSets.main.java.srcDirs = ["$projectHome/src/yajsw/src/main/java", "$projectHome/src/app/src/main/java", "$projectHome/src/keystore/src/main/java"]
+ sourceSets.main.java.exclude 'com/sun/jna/Native.java', 'com/sun/jna/Platform.java', 'org/apache/commons/vfs2/impl/StandardFileSystemManager.java'
+ sourceSets.main.java.exclude 'io/netty/util/internal/CleanerJava9.java', 'io/netty/util/internal/ObjectUtil.java', 'io/netty/util/internal/PlatformDependent0.java'
+ sourceSets.main.java.exclude(['AbstractInternalLogger', 'InternalLogLevel', 'InternalLogger', 'InternalLoggerFactory', 'JdkLogger', 'JdkLoggerFactory'].collect { "io/netty/util/internal/logging/${it}.java" })
diff --git a/dev-java/yajsw/files/yajsw-14.01-paths.patch b/dev-java/yajsw/files/yajsw-14.01-paths.patch
new file mode 100644
index 000000000000..3b08ceb3381b
--- /dev/null
+++ b/dev-java/yajsw/files/yajsw-14.01-paths.patch
@@ -0,0 +1,37 @@
+# Keep config in /etc and runtime files outside /usr
+
+--- a/bin/setenv.sh
++++ b/bin/setenv.sh
+@@ -33,7 +33,7 @@
+ wrapper_app_jar="$wrapper_home"/wrapperApp.jar
+ export wrapper_app_jar
+ 
+-wrapper_java_sys_options=-Djna_tmpdir="$wrapper_home"/tmp
++wrapper_java_sys_options=-Djna_tmpdir="${TMPDIR:-/tmp}"
+ export wrapper_java_sys_options
+ 
+ wrapper_java_options=-Xmx30m
+@@ -45,10 +45,10 @@
+ # show java version
+ "$java_exe" -version
+ 
+-conf_file="$wrapper_home"/conf/wrapper.conf
++conf_file="@GENTOO_PORTAGE_EPREFIX@/etc/yajsw/wrapper.conf"
+ export conf_file
+ 
+-conf_default_file="$wrapper_home"/conf/wrapper.conf.default
++conf_default_file="@GENTOO_PORTAGE_EPREFIX@/etc/yajsw/wrapper.conf.default"
+ export conf_default_file
+ 
+ echo "wrapper home : $wrapper_home"
+--- a/conf/wrapper.conf.default
++++ b/conf/wrapper.conf.default
+@@ -128,7 +128,7 @@
+ wrapper.console.loglevel=INFO
+ 
+ # Log file to use for wrapper output logging.
+-wrapper.logfile=${wrapper_home}/log/wrapper.log
++wrapper.logfile=wrapper.log
+ 
+ # Format of output for the log file.  (See docs for formats)
+ #wrapper.logfile.format=LPTM
diff --git a/dev-java/yajsw/files/yajsw-14.01-system-libs.patch b/dev-java/yajsw/files/yajsw-14.01-system-libs.patch
new file mode 100644
index 000000000000..f71767efe7e7
--- /dev/null
+++ b/dev-java/yajsw/files/yajsw-14.01-system-libs.patch
@@ -0,0 +1,112 @@
+# Use system jars in the build and the launchers
+
+--- a/build/gradle/build.gradle
++++ b/build/gradle/build.gradle
+@@ -32,7 +32,10 @@
+ 	joda_time_version 				= '2.7'
+ 	permit_version					= '0.4'
+ }
+-defaultTasks 'clean', 'build'
++ext.systemClasspath = System.getenv('GENTOO_CLASSPATH').split(File.pathSeparator)
++    .findAll { !it.endsWith('/slf4j-nop.jar') }
++
++defaultTasks 'clean', 'build'
+ 
+ // common settings for all sub-projects
+ allprojects  {
+@@ -45,26 +48,16 @@
+ 
+ 
+ 
+-// for simplicity and to avoid dependency issues which arise due to the usage of SNAPSHOT libs
+-// we use libs from local disk instead of public repository
+-repositories {
+-    flatDir { 
+-    dirs "$coreLibsDir/commons", "$coreLibsDir/jna", "$coreLibsDir/netty", "$coreLibsDir/permit", 
+-    "$coreLibsDir/yajsw", 
+-    "$extendedLibsDir/groovy", 
+-    "$extendedLibsDir/regex", 
+-    "$extendedLibsDir/cron",
+-    "$extendedLibsDir/commons",
+-    "$extendedLibsDir/abeille",
+-    "$extendedLibsDir/jgoodies",
+-    "$extendedLibsDir/slf4j",
+-    "$extendedLibsDir/velocity"
+-    
++configurations.configureEach {
++    withDependencies {
++        removeAll { it instanceof ExternalModuleDependency }
+     }
+-	}
+-    
+-
+-
++}
++dependencies {
++    implementation files(rootProject.systemClasspath)
++    implementation fileTree(dir: new File(rootProject.projectHome, 'lib'),
++        includes: ['**/*.jar'], excludes: ['**/yajsw/*.jar', '**/groovy-patch.jar'])
++}
+ 
+ java {
+ 	sourceCompatibility = JavaVersion.VERSION_11
+--- a/build/gradle/wrapper/build.gradle
++++ b/build/gradle/wrapper/build.gradle
+@@ -2,6 +2,9 @@
+ 
+ // set the sources for this build
+ sourceSets.main.java.srcDirs = ["$projectHome/src/yajsw/src/main/java", "$projectHome/src/app/src/main/java"]
++sourceSets.main.java.exclude 'com/sun/jna/Native.java', 'com/sun/jna/Platform.java', 'org/apache/commons/vfs2/impl/StandardFileSystemManager.java'
++sourceSets.main.java.exclude 'io/netty/util/internal/CleanerJava9.java', 'io/netty/util/internal/ObjectUtil.java', 'io/netty/util/internal/PlatformDependent0.java'
++sourceSets.main.java.exclude(['AbstractInternalLogger', 'InternalLogLevel', 'InternalLogger', 'InternalLoggerFactory', 'JdkLogger', 'JdkLoggerFactory'].collect { "io/netty/util/internal/logging/${it}.java" })
+ sourceSets.main.resources.srcDirs = ["$projectHome/src/yajsw/src/main/java"]
+ sourceSets.main.resources.includes  = ['resources/*']
+ 
+@@ -50,7 +53,16 @@
+ // TODO generate manifest instead of editing
+ jar {
+     manifest {
+-        from '../../MANIFEST.MF'
++        def systemJars = rootProject.systemClasspath.collect { new File(it).toURI().toString() }
++        from('../../MANIFEST.MF') {
++            eachEntry { entry ->
++                if (entry.key.startsWith('Class-Path-')) {
++                    entry.value = (entry.value.split().findAll { file("$projectHome/$it").exists() }
++                        + systemJars).unique().join(' ')
++                }
++            }
++        }
++        attributes 'Class-Path': systemJars.join(' ')
+     }
+     exclude 'org/rzo/yajsw/app/AbstractWrapperJVMMain*'
+     exclude 'org/rzo/yajsw/app/WrapperGroovyMain*'
+--- a/build/gradle/wrapper-app/build.gradle
++++ b/build/gradle/wrapper-app/build.gradle
+@@ -42,6 +42,15 @@
+ // TODO generate manifest
+ jar {
+     manifest {
+-        from '../../MANIFEST.MF'
++        def systemJars = rootProject.systemClasspath.collect { new File(it).toURI().toString() }
++        from('../../MANIFEST.MF') {
++            eachEntry { entry ->
++                if (entry.key.startsWith('Class-Path-')) {
++                    entry.value = (entry.value.split().findAll { file("$projectHome/$it").exists() }
++                        + systemJars).unique().join(' ')
++                }
++            }
++        }
++        attributes 'Class-Path': systemJars.join(' ')
+     }
+ }
+--- a/src/app/src/main/java/org/rzo/yajsw/boot/WrapperLoader.java
++++ b/src/app/src/main/java/org/rzo/yajsw/boot/WrapperLoader.java
+@@ -215,7 +215,7 @@
+ 			File myFile;
+ 			try
+ 			{
+-				myFile = new File(parent, file);
++				myFile = new File(parent.toURI().resolve(file));
+ 				if (!myFile.exists())
+ 				{
+ 					if (logErrors)
diff --git a/dev-java/yajsw/files/yajsw-14.01-system-native.patch b/dev-java/yajsw/files/yajsw-14.01-system-native.patch
new file mode 100644
index 000000000000..b5b8d7ea6d1d
--- /dev/null
+++ b/dev-java/yajsw/files/yajsw-14.01-system-native.patch
@@ -0,0 +1,26 @@
+# Use Gentoo's JNA native library
+
+--- a/src/app/src/main/java/org/rzo/yajsw/boot/WrapperLoader.java
++++ b/src/app/src/main/java/org/rzo/yajsw/boot/WrapperLoader.java
+@@ -34,6 +34,11 @@ import com.nqzero.permit.Permit;
+ 
+ public class WrapperLoader
+ {
++	static
++	{
++		System.setProperty("jna.boot.library.path", "@GENTOO_LIBDIR@/jna");
++	}
++
+ 
+ 	private static boolean checkPath(String path)
+ 	{
+--- a/src/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixProcess.java
++++ b/src/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixProcess.java
+@@ -1252,6 +1252,7 @@ public class PosixProcess extends AbstractProcess {
+ 	private String[] getSpawnCmdLine() {
+ 		ArrayList<String> cmdList = new ArrayList();
+ 		cmdList.add(getCurrentJava());
++		cmdList.add("-Djna.boot.library.path=" + System.getProperty("jna.boot.library.path"));
+ 		String tmpDir = _tmpPath;
+ 		if (tmpDir == null)
+ 			tmpDir = System.getProperty("jna_tmpdir", null);