diff --git a/pom.xml b/pom.xml index 63cc895..d249b39 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.berndpruenster.netlayer parent - 0.3.1 + 0.3.2 pom Netlayer @@ -18,7 +18,7 @@ 3.7.0 0.3 - 7.0.6 + 7.0.7 @@ -48,9 +48,9 @@ 567e1cd - com.github.MicroUtils + io.github.microutils kotlin-logging - -SNAPSHOT + 1.4.6 diff --git a/tor.native/pom.xml b/tor.native/pom.xml index 5a3ecb9..c057eb3 100644 --- a/tor.native/pom.xml +++ b/tor.native/pom.xml @@ -6,19 +6,13 @@ org.berndpruenster.netlayer parent - 0.3.1 + 0.3.2 tor.native jar Tor Native Files - - - test - file:///home/jesus/Documents/tuGraz/DISS/ext/tor-binary/release - - org.berndpruenster.netlayer @@ -29,29 +23,21 @@ com.cedricwalter tor-binary-macos ${tor-binary.version} - tar.xz - bin com.cedricwalter tor-binary-linux32 ${tor-binary.version} - tar.xz - bin com.cedricwalter tor-binary-linux64 ${tor-binary.version} - tar.xz - bin com.cedricwalter tor-binary-windows ${tor-binary.version} - tar.xz - bin com.beust @@ -69,67 +55,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - generate-resources - - copy - - - - - com.cedricwalter - tor-binary-linux32 - ${tor-binary.version} - tar.xz - bin - false - ${project.build.directory}/classes/native/linux/x86 - - tor.tar.xz - - - com.cedricwalter - tor-binary-linux64 - ${tor-binary.version} - tar.xz - bin - false - ${project.build.directory}/classes/native/linux/x64 - - tor.tar.xz - - - com.cedricwalter - tor-binary-macos - ${tor-binary.version} - tar.xz - bin - false - ${project.build.directory}/classes/native/osx/x64 - tor.tar.xz - - - com.cedricwalter - tor-binary-windows - ${tor-binary.version} - tar.xz - bin - false - ${project.build.directory}/classes/native/windows/x86 - - tor.tar.xz - - - - - - - kotlin-maven-plugin org.jetbrains.kotlin diff --git a/tor/pom.xml b/tor/pom.xml index 0f230da..72bc3db 100644 --- a/tor/pom.xml +++ b/tor/pom.xml @@ -6,7 +6,7 @@ org.berndpruenster.netlayer parent - 0.3.1 + 0.3.2 tor @@ -19,8 +19,6 @@ com.cedricwalter tor-binary-geoip ${tor-binary.version} - zip - zip com.github.JesusMcCloud @@ -41,33 +39,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-resources - - unpack - - - - - com.cedricwalter - tor-binary-geoip - ${tor-binary.version} - zip - zip - false - ${project.build.directory}/classes - geoip,geoip6 - - - - - - kotlin-maven-plugin org.jetbrains.kotlin diff --git a/tor/src/main/kotlin/org/berndpruenster/netlayer/tor/FileUtilities.kt b/tor/src/main/kotlin/org/berndpruenster/netlayer/tor/FileUtilities.kt index 89a5058..d1ed09e 100644 --- a/tor/src/main/kotlin/org/berndpruenster/netlayer/tor/FileUtilities.kt +++ b/tor/src/main/kotlin/org/berndpruenster/netlayer/tor/FileUtilities.kt @@ -128,6 +128,9 @@ fun extractContentFromArchive(destinationDirectory: File, archiveInputStream: In if ((mode and 64) > 0) { f.setExecutable(true, (mode and 1) == 0) } + if(OsType.current==OsType.MACOS){ + f.setExecutable(true,true) + } } } entry = tarIn.nextTarEntry diff --git a/tor/src/main/kotlin/org/berndpruenster/netlayer/tor/TorContext.kt b/tor/src/main/kotlin/org/berndpruenster/netlayer/tor/TorContext.kt index 99cb23e..86b2e36 100644 --- a/tor/src/main/kotlin/org/berndpruenster/netlayer/tor/TorContext.kt +++ b/tor/src/main/kotlin/org/berndpruenster/netlayer/tor/TorContext.kt @@ -250,7 +250,6 @@ abstract class TorContext protected constructor(val workingDirectory: File) { val cookieObserver = generateWriteObserver(cookieFile) // Start a new Tor process val torPath = torExecutableFile.absolutePath - torExecutableFile.setExecutable(true, true) val configPath = torrcFile.absolutePath val pid = processId val cmd = listOf(torPath, "-f", configPath, OWNER, pid)