Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Tor Browser to 13.0.6, binary to 0.4.8.9 #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Tor Browser to 13.0.6, binary to 0.4.8.9 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.github.bisq-network.tor-binary</groupId>
<artifactId>tor-binary</artifactId>
<version>0.4.7.10</version>
<version>0.4.8.9</version>

<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Expand All @@ -17,7 +17,7 @@
- gpg in path
- osx: 7z in path (can be installed with "brew install p7zip")
-->
<torbrowser.version>11.5.2</torbrowser.version>
<torbrowser.version>13.0.6</torbrowser.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.remote-resource.directory>${project.build.directory}/maven-shared-archive-resources</project.remote-resource.directory>
Expand Down
8 changes: 4 additions & 4 deletions tor-binary-geoip/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.bisq-network.tor-binary</groupId>
<artifactId>tor-binary</artifactId>
<version>0.4.7.10</version>
<version>0.4.8.9</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -52,15 +52,15 @@
classpathref="maven.plugin.classpath"/>

<unxz
src="${project.remote-resource.directory}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz"
src="${project.remote-resource.directory}/tor-browser-linux-x86_64-${torbrowser.version}.tar.xz"
dest="${project.build.directory}/linuxx64.tar"

/>
<untar src="${project.build.directory}/linuxx64.tar"
dest="${project.basedir}/src/main/resources">
<patternset>
<include name="tor-browser_en-US/Browser/TorBrowser/Data/Tor/geoip"/>
<include name="tor-browser_en-US/Browser/TorBrowser/Data/Tor/geoip6"/>
<include name="tor-browser/Browser/TorBrowser/Data/Tor/geoip"/>
<include name="tor-browser/Browser/TorBrowser/Data/Tor/geoip6"/>
</patternset>
<mapper type="flatten"/>
</untar>
Expand Down
8 changes: 4 additions & 4 deletions tor-binary-linux32/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.bisq-network.tor-binary</groupId>
<artifactId>tor-binary</artifactId>
<version>0.4.7.10</version>
<version>0.4.8.9</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -43,15 +43,15 @@
<target>
<exec executable="tar" dir="${project.build.directory}" failonerror="true">
<arg value="-xJvf"/>
<arg value="${project.remote-resource.directory}/tor-browser-linux32-${torbrowser.version}_en-US.tar.xz"/>
<arg value="tor-browser_en-US/Browser/TorBrowser/Tor/"/>
<arg value="${project.remote-resource.directory}/tor-browser-linux-i686-${torbrowser.version}.tar.xz"/>
<arg value="tor-browser/Browser/TorBrowser/Tor/"/>
</exec>

<delete dir="${project.basedir}/src/" failonerror="false" />
<delete dir="${project.remote-resource.directory}" />

<mkdir dir="${project.basedir}/src/main/resources/native/linux/x86/"/>
<exec executable="tar" dir="${project.build.directory}/tor-browser_en-US/Browser/TorBrowser/Tor/" failonerror="true">
<exec executable="tar" dir="${project.build.directory}/tor-browser/Browser/TorBrowser/Tor/" failonerror="true">
<arg line="-cJvf ${project.basedir}/src/main/resources/native/linux/x86/tor.tar.xz ."/>
</exec>
</target>
Expand Down
11 changes: 5 additions & 6 deletions tor-binary-linux64/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
<parent>
<groupId>com.github.bisq-network.tor-binary</groupId>
<artifactId>tor-binary</artifactId>
<version>0.4.7.10</version>
<version>0.4.8.9</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>tor-binary-linux64</artifactId>
<packaging>jar</packaging>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -41,18 +40,18 @@
<phase>generate-resources</phase>
<configuration>
<target>
<delete dir="${project.build.directory}/tor-browser-linux32-${torbrowser.version}_en-US/" failonerror="false" />
<delete dir="${project.build.directory}/tor-browser-linux-i686-${torbrowser.version}/" failonerror="false" />

<exec executable="tar" dir="${project.build.directory}" failonerror="true">
<arg value="-xJvf"/>
<arg value="${project.remote-resource.directory}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz"/>
<arg value="tor-browser_en-US/Browser/TorBrowser/Tor/"/>
<arg value="${project.remote-resource.directory}/tor-browser-linux-x86_64-${torbrowser.version}.tar.xz"/>
<arg value="tor-browser/Browser/TorBrowser/Tor/"/>
</exec>

<delete dir="${project.remote-resource.directory}" />
<delete dir="${project.basedir}/src/" failonerror="false" />
<mkdir dir="${project.basedir}/src/main/resources/native/linux/x64/"/>
<exec executable="tar" dir="${project.build.directory}/tor-browser_en-US/Browser/TorBrowser/Tor/" failonerror="true">
<exec executable="tar" dir="${project.build.directory}/tor-browser/Browser/TorBrowser/Tor/" failonerror="true">
<arg line="-cJvf ${project.basedir}/src/main/resources/native/linux/x64/tor.tar.xz ."/>
</exec>
</target>
Expand Down
6 changes: 3 additions & 3 deletions tor-binary-macos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.bisq-network.tor-binary</groupId>
<artifactId>tor-binary</artifactId>
<version>0.4.7.10</version>
<version>0.4.8.9</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -56,11 +56,11 @@
-->
<exec executable="${7z_executable}" failonerror="true">
<arg
line="x ${project.remote-resource.directory}/TorBrowser-${torbrowser.version}-osx64_en-US.dmg -o${project.build.directory}/osx -aoa *"></arg>
line="x ${project.remote-resource.directory}/tor-browser-macos-${torbrowser.version}.dmg -o${project.build.directory}/osx -aoa *"></arg>
</exec>

<!-- tor 8 changed the directory structure of its osx binaries... -->
<property name="path" value="${project.build.directory}/osx/Tor Browser.app/Contents/MacOS/Tor/"/>
<property name="path" value="${project.build.directory}/osx/Tor Browser/Tor Browser.app/Contents/MacOS/Tor/"/>
<!-- in case we want tor pre version 8, check for directory structure and set appropriate path -->
<available file="${project.build.directory}/osx/TorBrowser.app" type="dir" property="path" value="${project.build.directory}/osx/TorBrowser.app/Contents/MacOS/Tor/"/>

Expand Down
1 change: 0 additions & 1 deletion tor-binary-resources/checksums/TorBrowser-11.5.2-osx64_en-US.dmg.SHA-256
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tor-binary-resources/checksums/tor-browser-linux-i686-13.0.6.tar.xz.SHA-256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9cf87352ed4160d8a3deda0d454145c4d54b676267cc3045565ce8e1ccac9236
1 change: 1 addition & 0 deletions tor-binary-resources/checksums/tor-browser-linux-x86_64-13.0.6.tar.xz.SHA-256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed3f8f244b062207be2493b3e86886f3def59679db40bda37477e574d993e234
1 change: 0 additions & 1 deletion tor-binary-resources/checksums/tor-browser-linux32-11.5.2_en-US.tar.xz.SHA-256
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tor-binary-resources/checksums/tor-browser-linux64-11.5.2_en-US.tar.xz.SHA-256
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tor-binary-resources/checksums/tor-browser-macos-13.0.6.dmg.SHA-256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c77af1f2cc1985980dcdac260bff34184d73cb08efff3f1f9fe6db84c5467de2
1 change: 1 addition & 0 deletions tor-binary-resources/checksums/tor-browser-windows-i686-portable-13.0.6.exe.SHA-256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
956892d0009c590c67bf6f0a91e9fdd5bc4ed25e92a934bd2a914b2d152635ee
1 change: 0 additions & 1 deletion tor-binary-resources/checksums/torbrowser-install-11.5.2_en-US.exe.SHA-256
View file
Open in desktop

This file was deleted.

26 changes: 13 additions & 13 deletions tor-binary-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.bisq-network.tor-binary</groupId>
<artifactId>tor-binary</artifactId>
<version>0.4.7.10</version>
<version>0.4.8.9</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -30,20 +30,20 @@
<mkdir dir="${project.source.directory}"/>
<parallel>
<get
src="https://dist.torproject.org/torbrowser/${torbrowser.version}/torbrowser-install-${torbrowser.version}_en-US.exe"
dest="${project.source.directory}/torbrowser-install-${torbrowser.version}_en-US.exe"
src="https://dist.torproject.org/torbrowser/${torbrowser.version}/tor-browser-windows-i686-portable-${torbrowser.version}.exe"
dest="${project.source.directory}/tor-browser-windows-i686-portable-${torbrowser.version}.exe"
skipexisting="true"/>
<get
src="https://dist.torproject.org/torbrowser/${torbrowser.version}/TorBrowser-${torbrowser.version}-osx64_en-US.dmg"
dest="${project.source.directory}/TorBrowser-${torbrowser.version}-osx64_en-US.dmg"
src="https://dist.torproject.org/torbrowser/${torbrowser.version}/tor-browser-macos-${torbrowser.version}.dmg"
dest="${project.source.directory}/tor-browser-macos-${torbrowser.version}.dmg"
skipexisting="true"/>
<get
src="https://dist.torproject.org/torbrowser/${torbrowser.version}/tor-browser-linux32-${torbrowser.version}_en-US.tar.xz"
dest="${project.source.directory}/tor-browser-linux32-${torbrowser.version}_en-US.tar.xz"
src="https://dist.torproject.org/torbrowser/${torbrowser.version}/tor-browser-linux-i686-${torbrowser.version}.tar.xz"
dest="${project.source.directory}/tor-browser-linux-i686-${torbrowser.version}.tar.xz"
skipexisting="true"/>
<get
src="https://dist.torproject.org/torbrowser/${torbrowser.version}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz"
dest="${project.source.directory}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz"
src="https://dist.torproject.org/torbrowser/${torbrowser.version}/tor-browser-linux-x86_64-${torbrowser.version}.tar.xz"
dest="${project.source.directory}/tor-browser-linux-x86_64-${torbrowser.version}.tar.xz"
skipexisting="true"/>
</parallel>

Expand All @@ -53,10 +53,10 @@

<condition property="checksumsMatch">
<and>
<checksum algorithm="SHA-256" file="${project.source.directory}/torbrowser-install-${torbrowser.version}_en-US.exe" />
<checksum algorithm="SHA-256" file="${project.source.directory}/TorBrowser-${torbrowser.version}-osx64_en-US.dmg" />
<checksum algorithm="SHA-256" file="${project.source.directory}/tor-browser-linux32-${torbrowser.version}_en-US.tar.xz" />
<checksum algorithm="SHA-256" file="${project.source.directory}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz" />
<checksum algorithm="SHA-256" file="${project.source.directory}/tor-browser-windows-i686-portable-${torbrowser.version}.exe" />
<checksum algorithm="SHA-256" file="${project.source.directory}/tor-browser-macos-${torbrowser.version}.dmg" />
<checksum algorithm="SHA-256" file="${project.source.directory}/tor-browser-linux-i686-${torbrowser.version}.tar.xz" />
<checksum algorithm="SHA-256" file="${project.source.directory}/tor-browser-linux-x86_64-${torbrowser.version}.tar.xz" />
</and>
</condition>
<fail unless="checksumsMatch" />
Expand Down
4 changes: 2 additions & 2 deletions tor-binary-windows/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.bisq-network.tor-binary</groupId>
<artifactId>tor-binary</artifactId>
<version>0.4.7.10</version>
<version>0.4.8.9</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -66,7 +66,7 @@
-->
<exec executable="${7z_executable}" failonerror="true">
<arg
line="x ${project.remote-resource.directory}/torbrowser-install-${torbrowser.version}_en-US.exe -o${project.build.directory}/windows -aoa Browser/TorBrowser/Tor/*"></arg>
line="x ${project.remote-resource.directory}/tor-browser-windows-i686-portable-${torbrowser.version}.exe -o${project.build.directory}/windows -aoa Browser/TorBrowser/Tor/*"></arg>
</exec>

<tar destfile="${project.build.directory}/win32.tar">
Expand Down