From 9f1b2d4e52ffb14cd995245cda3f6c05196e2333 Mon Sep 17 00:00:00 2001
From: Alexey Zagarin <zagarin@gmail.com>
Date: Sun, 14 Jul 2019 18:14:01 +0700
Subject: [PATCH] tor browser 8.5.3

* Include `armhf` and `arm64` architectures (unofficial)
---
 pom.xml                        |  6 ++-
 tor-binary-geoip/pom.xml       |  2 +-
 tor-binary-linux-arm64/pom.xml | 75 ++++++++++++++++++++++++++++++++++
 tor-binary-linux-armhf/pom.xml | 75 ++++++++++++++++++++++++++++++++++
 tor-binary-linux32/pom.xml     |  2 +-
 tor-binary-linux64/pom.xml     |  2 +-
 tor-binary-macos/pom.xml       |  2 +-
 tor-binary-resources/pom.xml   | 28 ++++++++++++-
 tor-binary-windows/pom.xml     |  2 +-
 9 files changed, 186 insertions(+), 8 deletions(-)
 create mode 100644 tor-binary-linux-arm64/pom.xml
 create mode 100644 tor-binary-linux-armhf/pom.xml

diff --git a/pom.xml b/pom.xml
index dfc091a..b2a26be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.JesusMcCloud</groupId>
     <artifactId>tor-binary</artifactId>
-    <version>0.4.0.5</version>
+    <version>8.5.3</version>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -15,7 +15,7 @@
 
         requirement are: gpg in path
         -->
-        <torbrowser.version>8.5.4</torbrowser.version>
+        <torbrowser.version>8.5.3</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>
     </properties>
@@ -59,6 +59,8 @@
         <module>tor-binary-resources</module>
         <module>tor-binary-linux32</module>
         <module>tor-binary-linux64</module>
+        <module>tor-binary-linux-armhf</module>
+        <module>tor-binary-linux-arm64</module>
         <module>tor-binary-macos</module>
         <module>tor-binary-windows</module>
         <module>tor-binary-geoip</module>
diff --git a/tor-binary-geoip/pom.xml b/tor-binary-geoip/pom.xml
index b0ade19..d5f02c2 100644
--- a/tor-binary-geoip/pom.xml
+++ b/tor-binary-geoip/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.JesusMcCloud</groupId>
         <artifactId>tor-binary</artifactId>
-        <version>0.4.0.5</version>
+        <version>8.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tor-binary-linux-arm64/pom.xml b/tor-binary-linux-arm64/pom.xml
new file mode 100644
index 0000000..2f543e0
--- /dev/null
+++ b/tor-binary-linux-arm64/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>com.github.JesusMcCloud</groupId>
+        <artifactId>tor-binary</artifactId>
+        <version>8.5.3</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tor-binary-linux-arm64</artifactId>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <version>1.6.0</version>
+                <configuration>
+                    <resourceBundles>
+                        <resourceBundle>com.github.JesusMcCloud:tor-binary-resources:${project.version}</resourceBundle>
+                    </resourceBundles>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>download-and-verify</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target>
+                                <exec executable="tar" dir="${project.build.directory}" failonerror="true">
+                                    <arg value="-xJvf"/>
+                                    <arg value="${project.remote-resource.directory}/tor-browser-linux-arm64-${torbrowser.version}_en-US.tar.xz"/>
+                                    <arg value="tor-browser_en-US/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/arm64/"/>
+                                <exec executable="tar" dir="${project.build.directory}/tor-browser_en-US/Browser/TorBrowser/Tor/" failonerror="true">
+                                    <arg line="-cJvf ${project.basedir}/src/main/resources/native/linux/arm64/tor.tar.xz ."/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/tor-binary-linux-armhf/pom.xml b/tor-binary-linux-armhf/pom.xml
new file mode 100644
index 0000000..89f06f0
--- /dev/null
+++ b/tor-binary-linux-armhf/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>com.github.JesusMcCloud</groupId>
+        <artifactId>tor-binary</artifactId>
+        <version>8.5.3</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tor-binary-linux-armhf</artifactId>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <version>1.6.0</version>
+                <configuration>
+                    <resourceBundles>
+                        <resourceBundle>com.github.JesusMcCloud:tor-binary-resources:${project.version}</resourceBundle>
+                    </resourceBundles>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>download-and-verify</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target>
+                                <exec executable="tar" dir="${project.build.directory}" failonerror="true">
+                                    <arg value="-xJvf"/>
+                                    <arg value="${project.remote-resource.directory}/tor-browser-linux-armhf-${torbrowser.version}_en-US.tar.xz"/>
+                                    <arg value="tor-browser_en-US/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/armhf/"/>
+                                <exec executable="tar" dir="${project.build.directory}/tor-browser_en-US/Browser/TorBrowser/Tor/" failonerror="true">
+                                    <arg line="-cJvf ${project.basedir}/src/main/resources/native/linux/armhf/tor.tar.xz ."/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/tor-binary-linux32/pom.xml b/tor-binary-linux32/pom.xml
index 14aeaad..324f69f 100644
--- a/tor-binary-linux32/pom.xml
+++ b/tor-binary-linux32/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.JesusMcCloud</groupId>
         <artifactId>tor-binary</artifactId>
-        <version>0.4.0.5</version>
+        <version>8.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tor-binary-linux64/pom.xml b/tor-binary-linux64/pom.xml
index 7e4679f..d78ffc7 100644
--- a/tor-binary-linux64/pom.xml
+++ b/tor-binary-linux64/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.JesusMcCloud</groupId>
         <artifactId>tor-binary</artifactId>
-        <version>0.4.0.5</version>
+        <version>8.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tor-binary-macos/pom.xml b/tor-binary-macos/pom.xml
index e094fb4..e357b8c 100644
--- a/tor-binary-macos/pom.xml
+++ b/tor-binary-macos/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.JesusMcCloud</groupId>
         <artifactId>tor-binary</artifactId>
-        <version>0.4.0.5</version>
+        <version>8.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tor-binary-resources/pom.xml b/tor-binary-resources/pom.xml
index d44a326..5eefd93 100644
--- a/tor-binary-resources/pom.xml
+++ b/tor-binary-resources/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.JesusMcCloud</groupId>
         <artifactId>tor-binary</artifactId>
-        <version>0.4.0.5</version>
+        <version>8.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -61,6 +61,22 @@
                                         src="https://dist.torproject.org/torbrowser/${torbrowser.version}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz.asc"
                                         dest="${project.source.directory}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz.asc"
                                         skipexisting="true"/>
+                                    <get
+                                        src="https://sourceforge.net/projects/tor-browser-ports/files/${torbrowser.version}-armhf/tor-browser-linux-armhf-${torbrowser.version}_en-US.tar.xz/download"
+                                        dest="${project.source.directory}/tor-browser-linux-armhf-${torbrowser.version}_en-US.tar.xz"
+                                        skipexisting="true"/>
+                                    <get
+                                        src="https://sourceforge.net/projects/tor-browser-ports/files/${torbrowser.version}-armhf/sha256sums-unsigned-build.txt/download"
+                                        dest="${project.source.directory}/tor-browser-linux-armhf-${torbrowser.version}_sha256sums-unsigned-build.txt"
+                                        skipexisting="true"/>
+                                    <get
+                                        src="https://sourceforge.net/projects/tor-browser-ports/files/${torbrowser.version}-arm64/tor-browser-linux-arm64-${torbrowser.version}_en-US.tar.xz/download"
+                                        dest="${project.source.directory}/tor-browser-linux-arm64-${torbrowser.version}_en-US.tar.xz"
+                                        skipexisting="true"/>
+                                    <get
+                                        src="https://sourceforge.net/projects/tor-browser-ports/files/${torbrowser.version}-arm64/sha256sums-unsigned-build.txt/download"
+                                        dest="${project.source.directory}/tor-browser-linux-arm64-${torbrowser.version}_sha256sums-unsigned-build.txt"
+                                        skipexisting="true"/>
                                     <get
                                         src="https://sourceforge.net/projects/p7zip/files/p7zip/16.02/p7zip_16.02_x86_linux_bin.tar.bz2/download"
                                         dest="${project.source.directory}/p7zip.tar.bz2"
@@ -86,6 +102,16 @@
                                     <arg
                                         line="--auto-key-locate keyserver --keyserver pool.sks-keyservers.net --keyserver-options auto-key-retrieve --verify ${project.source.directory}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz.asc ${project.source.directory}/tor-browser-linux64-${torbrowser.version}_en-US.tar.xz"></arg>
                                 </exec>
+                                <echo message="checking linux-armhf binary sha256sum"/>
+                                <exec executable="sh" failonerror="true">
+                                    <arg
+                                        line="-c 'cd ${project.source.directory}; grep tor-browser-linux-armhf-${torbrowser.version}_en-US.tar.xz tor-browser-linux-armhf-${torbrowser.version}_sha256sums-unsigned-build.txt | shasum -a 256 -c'"></arg>
+                                </exec>
+                                <echo message="checking linux-arm64 binary sha256sum"/>
+                                <exec executable="sh" failonerror="true">
+                                    <arg
+                                        line="-c 'cd ${project.source.directory}; grep tor-browser-linux-arm64-${torbrowser.version}_en-US.tar.xz tor-browser-linux-arm64-${torbrowser.version}_sha256sums-unsigned-build.txt | shasum -a 256 -c'"></arg>
+                                </exec>
                                 <bunzip2 src="${project.source.directory}/p7zip.tar.bz2"
                                     dest="${project.source.directory}/p7zip.tar" />
                                 <untar src="${project.source.directory}/p7zip.tar"
diff --git a/tor-binary-windows/pom.xml b/tor-binary-windows/pom.xml
index cc04026..3bb6798 100644
--- a/tor-binary-windows/pom.xml
+++ b/tor-binary-windows/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.JesusMcCloud</groupId>
         <artifactId>tor-binary</artifactId>
-        <version>0.4.0.5</version>
+        <version>8.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>