From: AsamK Date: Sun, 14 Nov 2021 10:24:13 +0000 (+0100) Subject: Update hypfvieh dbus-java 4.0 beta which uses native java unix sockets X-Git-Tag: v0.10.0~45 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/fa5c09d23b830f2999a52421c189a3e4661da99f Update hypfvieh dbus-java 4.0 beta which uses native java unix sockets Fixes #673 Fixes #632 --- diff --git a/build.gradle.kts b/build.gradle.kts index baba4b68..12854c97 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,12 +30,15 @@ graalvmNative { repositories { mavenLocal() mavenCentral() + maven { + url = uri("https://raw.github.com/AsamK/maven/master/releases/") + } } dependencies { implementation("org.bouncycastle:bcprov-jdk15on:1.69") implementation("net.sourceforge.argparse4j:argparse4j:0.9.0") - implementation("com.github.hypfvieh:dbus-java:3.3.1") + implementation("com.github.hypfvieh:dbus-java-transport-native-unixsocket:4.0.0-beta") implementation("org.slf4j:slf4j-simple:1.7.32") implementation("org.slf4j", "jul-to-slf4j", "1.7.32") implementation(project(":lib")) diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json index 9ffcf9ea..7209e355 100644 --- a/graalvm-config-dir/jni-config.json +++ b/graalvm-config-dir/jni-config.json @@ -1,4 +1,13 @@ [ +{ + "name":"com.sun.security.auth.module.UnixSystem", + "fields":[ + {"name":"gid"}, + {"name":"groups"}, + {"name":"uid"}, + {"name":"username"} + ]} +, { "name":"java.lang.Boolean", "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]} diff --git a/graalvm-config-dir/proxy-config.json b/graalvm-config-dir/proxy-config.json index be8f8d3c..8f5752fe 100644 --- a/graalvm-config-dir/proxy-config.json +++ b/graalvm-config-dir/proxy-config.json @@ -2,6 +2,9 @@ { "interfaces":["org.asamk.Signal"]} , + { + "interfaces":["org.asamk.Signal$Group"]} + , { "interfaces":["org.freedesktop.dbus.interfaces.DBus"]} diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index d254d85f..c4b6d498 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -61,26 +61,6 @@ "name":"com.google.protobuf.PrimitiveNonBoxingCollection", "allDeclaredMethods":true} , -{ - "name":"com.kenai.jffi.Invoker", - "methods":[ - {"name":"invokeI6","parameterTypes":["com.kenai.jffi.CallContext","long","int","int","int","int","int","int"] }, - {"name":"invokeL6","parameterTypes":["com.kenai.jffi.CallContext","long","long","long","long","long","long","long"] }, - {"name":"invokeN6","parameterTypes":["com.kenai.jffi.CallContext","long","long","long","long","long","long","long"] } - ]} -, -{ - "name":"com.kenai.jffi.Version", - "fields":[ - {"name":"MAJOR"}, - {"name":"MICRO"}, - {"name":"MINOR"} - ]} -, -{ - "name":"com.kenai.jffi.internal.StubLoader", - "methods":[{"name":"isLoaded","parameterTypes":[] }]} -, { "name":"com.sun.crypto.provider.AESCipher$General", "methods":[{"name":"","parameterTypes":[] }]} @@ -288,90 +268,6 @@ "name":"javax.security.auth.x500.X500Principal", "methods":[{"name":"","parameterTypes":["sun.security.x509.X500Name"] }]} , -{ - "name":"jnr.constants.platform.linux.ProtocolFamily"} -, -{ - "name":"jnr.constants.platform.linux.Shutdown"} -, -{ - "name":"jnr.constants.platform.linux.Sock"} -, -{ - "name":"jnr.constants.platform.linux.SocketLevel"} -, -{ - "name":"jnr.constants.platform.linux.SocketOption"} -, -{ - "name":"jnr.enxio.channels.Native$LibC", - "allPublicMethods":true} -, -{ - "name":"jnr.enxio.channels.Native$LibC$jnr$ffi$1", - "methods":[{"name":"","parameterTypes":["jnr.ffi.Runtime","jnr.ffi.provider.jffi.NativeLibrary","java.lang.Object[]"] }]} -, -{ - "name":"jnr.ffi.Pointer", - "allDeclaredMethods":true, - "allPublicMethods":true} -, -{ - "name":"jnr.ffi.StructLayout$gid_t", - "methods":[{"name":"","parameterTypes":["jnr.ffi.StructLayout"] }]} -, -{ - "name":"jnr.ffi.byref.IntByReference", - "allPublicMethods":true} -, -{ - "name":"jnr.ffi.provider.converters.ByReferenceParameterConverter", - "methods":[{"name":"nativeType","parameterTypes":[] }]} -, -{ - "name":"jnr.ffi.provider.converters.ByReferenceParameterConverter$Out", - "allPublicMethods":true} -, -{ - "name":"jnr.ffi.provider.converters.StringResultConverter", - "allPublicMethods":true} -, -{ - "name":"jnr.ffi.provider.converters.StructByReferenceToNativeConverter", - "allPublicMethods":true} -, -{ - "name":"jnr.ffi.provider.jffi.BufferParameterStrategy", - "methods":[{"name":"address","parameterTypes":["java.nio.Buffer"] }]} -, -{ - "name":"jnr.ffi.provider.jffi.PointerParameterStrategy", - "methods":[{"name":"address","parameterTypes":["jnr.ffi.Pointer"] }]} -, -{ - "name":"jnr.ffi.provider.jffi.Provider", - "methods":[{"name":"","parameterTypes":[] }]} -, -{ - "name":"jnr.ffi.provider.jffi.platform.x86_64.linux.TypeAliases", - "fields":[{"name":"ALIASES"}]} -, -{ - "name":"jnr.posix.Timeval", - "allPublicMethods":true} -, -{ - "name":"jnr.unixsocket.Native$LibC", - "allPublicMethods":true} -, -{ - "name":"jnr.unixsocket.Native$LibC$jnr$ffi$0", - "methods":[{"name":"","parameterTypes":["jnr.ffi.Runtime","jnr.ffi.provider.jffi.NativeLibrary","java.lang.Object[]"] }]} -, -{ - "name":"jnr.unixsocket.SockAddrUnix", - "allPublicMethods":true} -, { "name":"long", "allDeclaredMethods":true, @@ -408,7 +304,8 @@ { "name":"org.asamk.Signal$MessageReceivedV2", "queryAllDeclaredConstructors":true, - "queryAllPublicConstructors":true} + "queryAllPublicConstructors":true, + "methods":[{"name":"","parameterTypes":["java.lang.String","long","java.lang.String","byte[]","java.lang.String","java.util.Map"] }]} , { "name":"org.asamk.Signal$ReceiptReceived", @@ -418,7 +315,8 @@ { "name":"org.asamk.Signal$ReceiptReceivedV2", "queryAllDeclaredConstructors":true, - "queryAllPublicConstructors":true} + "queryAllPublicConstructors":true, + "methods":[{"name":"","parameterTypes":["java.lang.String","long","java.lang.String","java.lang.String","java.util.Map"] }]} , { "name":"org.asamk.Signal$StructDevice", @@ -759,7 +657,6 @@ "queryAllDeclaredConstructors":true, "methods":[ {"name":"","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }, - {"name":"","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }, {"name":"linkPreviews","parameterTypes":[] }, {"name":"phoneNumberSharingMode","parameterTypes":[] }, {"name":"phoneNumberUnlisted","parameterTypes":[] }, @@ -796,11 +693,6 @@ "allDeclaredMethods":true, "allDeclaredConstructors":true} , -{ - "name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$Group", - "allDeclaredFields":true, - "allDeclaredMethods":true} -, { "name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$GroupV1", "allDeclaredFields":true, @@ -1322,6 +1214,10 @@ "name":"org.freedesktop.dbus.errors.ServiceUnknown", "methods":[{"name":"","parameterTypes":["java.lang.String"] }]} , +{ + "name":"org.freedesktop.dbus.errors.UnknownMethod", + "methods":[{"name":"","parameterTypes":["java.lang.String"] }]} +, { "name":"org.freedesktop.dbus.errors.UnknownObject", "methods":[{"name":"","parameterTypes":["java.lang.String"] }]} @@ -1349,9 +1245,6 @@ "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged", "allPublicConstructors":true} , -{ - "name":"org.objectweb.asm.util.TraceMethodVisitor"} -, { "name":"org.signal.storageservice.protos.groups.AccessControl", "fields":[ diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json index fed77a01..510878df 100644 --- a/graalvm-config-dir/resource-config.json +++ b/graalvm-config-dir/resource-config.json @@ -1,6 +1,9 @@ { "resources":{ "includes":[ + { + "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E" + }, { "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E" }, @@ -97,24 +100,6 @@ { "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E" }, - { - "pattern":"\\Qjnr/constants/ConstantSet.class\\E" - }, - { - "pattern":"\\Qjnr/constants/platform/linux/ProtocolFamily.class\\E" - }, - { - "pattern":"\\Qjnr/constants/platform/linux/Shutdown.class\\E" - }, - { - "pattern":"\\Qjnr/constants/platform/linux/Sock.class\\E" - }, - { - "pattern":"\\Qjnr/constants/platform/linux/SocketLevel.class\\E" - }, - { - "pattern":"\\Qjnr/constants/platform/linux/SocketOption.class\\E" - }, { "pattern":"\\Qlibsignal_jni.so\\E" },