Skip to content
This repository has been archived by the owner on Aug 5, 2024. It is now read-only.

Commit

Permalink
update tor dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@JesusMcCloud
JesusMcCloud committed Oct 28, 2017
1 parent 496b75d commit 1c4e68f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 111 deletions.
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.berndpruenster.netlayer</groupId>
<artifactId>parent</artifactId>
<version>0.3.1</version>
<version>0.3.2</version>
<packaging>pom</packaging>

<name>Netlayer</name>
Expand All @@ -18,7 +18,7 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<netlayer.version>0.3</netlayer.version>
<tor-binary.version>7.0.6</tor-binary.version>
<tor-binary.version>7.0.7</tor-binary.version>
</properties>

<modules>
Expand Down Expand Up @@ -48,9 +48,9 @@
<version>567e1cd</version>
</dependency>
<dependency>
<groupId>com.github.MicroUtils</groupId>
<groupId>io.github.microutils</groupId>
<artifactId>kotlin-logging</artifactId>
<version>-SNAPSHOT</version>
<version>1.4.6</version>
</dependency>
</dependencies>
</project>
77 changes: 1 addition & 76 deletions tor.native/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,13 @@
<parent>
<groupId>org.berndpruenster.netlayer</groupId>
<artifactId>parent</artifactId>
<version>0.3.1</version>
<version>0.3.2</version>
</parent>

<artifactId>tor.native</artifactId>
<packaging>jar</packaging>
<name>Tor Native Files</name>

<repositories>
<repository>
<id>test</id>
<url>file:///home/jesus/Documents/tuGraz/DISS/ext/tor-binary/release</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.berndpruenster.netlayer</groupId>
Expand All @@ -29,29 +23,21 @@
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-macos</artifactId>
<version>${tor-binary.version}</version>
<type>tar.xz</type>
<classifier>bin</classifier>
</dependency>
<dependency>
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-linux32</artifactId>
<version>${tor-binary.version}</version>
<type>tar.xz</type>
<classifier>bin</classifier>
</dependency>
<dependency>
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-linux64</artifactId>
<version>${tor-binary.version}</version>
<type>tar.xz</type>
<classifier>bin</classifier>
</dependency>
<dependency>
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-windows</artifactId>
<version>${tor-binary.version}</version>
<type>tar.xz</type>
<classifier>bin</classifier>
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand All @@ -69,67 +55,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-linux32</artifactId>
<version>${tor-binary.version}</version>
<type>tar.xz</type>
<classifier>bin</classifier>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes/native/linux/x86
</outputDirectory>
<destFileName>tor.tar.xz</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-linux64</artifactId>
<version>${tor-binary.version}</version>
<type>tar.xz</type>
<classifier>bin</classifier>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes/native/linux/x64
</outputDirectory>
<destFileName>tor.tar.xz</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-macos</artifactId>
<version>${tor-binary.version}</version>
<type>tar.xz</type>
<classifier>bin</classifier>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes/native/osx/x64</outputDirectory>
<destFileName>tor.tar.xz</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-windows</artifactId>
<version>${tor-binary.version}</version>
<type>tar.xz</type>
<classifier>bin</classifier>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes/native/windows/x86
</outputDirectory>
<destFileName>tor.tar.xz</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down
31 changes: 1 addition & 30 deletions tor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.berndpruenster.netlayer</groupId>
<artifactId>parent</artifactId>
<version>0.3.1</version>
<version>0.3.2</version>
</parent>

<artifactId>tor</artifactId>
Expand All @@ -19,8 +19,6 @@
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-geoip</artifactId>
<version>${tor-binary.version}</version>
<type>zip</type>
<classifier>zip</classifier>
</dependency>
<dependency>
<groupId>com.github.JesusMcCloud</groupId>
Expand All @@ -41,33 +39,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.cedricwalter</groupId>
<artifactId>tor-binary-geoip</artifactId>
<version>${tor-binary.version}</version>
<type>zip</type>
<classifier>zip</classifier>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<includes>geoip,geoip6</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down
3 changes: 3 additions & 0 deletions tor/src/main/kotlin/org/berndpruenster/netlayer/tor/FileUtilities.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tor/src/main/kotlin/org/berndpruenster/netlayer/tor/TorContext.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>(torPath, "-f", configPath, OWNER, pid)
Expand Down

0 comments on commit 1c4e68f

Please sign in to comment.