From af3813135a9438c2945a4aada4f2c659c179e826 Mon Sep 17 00:00:00 2001
From: Weston Blieden <111699155+Mo3he@users.noreply.github.com>
Date: Wed, 21 Feb 2024 08:46:15 +0100
Subject: [PATCH] Updated to version 1.60.0, add Auto Update version

Updated Tailscale binaries to 1.60.0 and added version that automatically keeps tailscale up to date.
---
 README.md                                     |  3 +-
 aarch64 Auto Update/Dockerfile                | 12 ++++++++
 aarch64 Auto Update/README.md                 |  5 ++++
 aarch64 Auto Update/app/LICENSE               | 29 +++++++++++++++++++
 aarch64 Auto Update/app/Makefile              |  1 +
 .../app/Tailscale_VPN_Auto_Update             | 11 +++++++
 aarch64 Auto Update/app/html/index.html       | 19 ++++++++++++
 aarch64 Auto Update/app/manifest.json         | 21 ++++++++++++++
 aarch64/app/manifest.json                     |  2 +-
 arm Auto Update/Dockerfile                    | 12 ++++++++
 arm Auto Update/README.md                     |  5 ++++
 arm Auto Update/app/LICENSE                   | 29 +++++++++++++++++++
 arm Auto Update/app/Makefile                  |  1 +
 arm Auto Update/app/Tailscale_VPN_Auto_Update | 11 +++++++
 arm Auto Update/app/html/index.html           | 19 ++++++++++++
 arm Auto Update/app/manifest.json             | 21 ++++++++++++++
 arm/app/manifest.json                         |  2 +-
 17 files changed, 200 insertions(+), 3 deletions(-)
 create mode 100644 aarch64 Auto Update/Dockerfile
 create mode 100644 aarch64 Auto Update/README.md
 create mode 100644 aarch64 Auto Update/app/LICENSE
 create mode 100644 aarch64 Auto Update/app/Makefile
 create mode 100755 aarch64 Auto Update/app/Tailscale_VPN_Auto_Update
 create mode 100644 aarch64 Auto Update/app/html/index.html
 create mode 100644 aarch64 Auto Update/app/manifest.json
 create mode 100644 arm Auto Update/Dockerfile
 create mode 100644 arm Auto Update/README.md
 create mode 100644 arm Auto Update/app/LICENSE
 create mode 100644 arm Auto Update/app/Makefile
 create mode 100755 arm Auto Update/app/Tailscale_VPN_Auto_Update
 create mode 100644 arm Auto Update/app/html/index.html
 create mode 100644 arm Auto Update/app/manifest.json

diff --git a/README.md b/README.md
index 1e7e458..1d1475d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 This ACAP packages the scripts and files required to install the Tailscale VPN client on Axis Cameras.
 
-Current version 1.56.1
+Current version 1.60.0
+There is also now a version called "Auto Update" that will automatically keep tailscale up to date.
 
 https://tailscale.com/changelog/
 
diff --git a/aarch64 Auto Update/Dockerfile b/aarch64 Auto Update/Dockerfile
new file mode 100644
index 0000000..eb1938e
--- /dev/null
+++ b/aarch64 Auto Update/Dockerfile	
@@ -0,0 +1,12 @@
+ARG ARCH=aarch64
+ARG VERSION=1.3
+ARG UBUNTU_VERSION=22.04
+ARG REPO=axisecp
+ARG SDK=acap-native-sdk
+
+FROM ${REPO}/${SDK}:${VERSION}-${ARCH}-ubuntu${UBUNTU_VERSION}
+
+# Building the ACAP application
+COPY ./app /opt/app/
+WORKDIR /opt/app
+RUN . /opt/axis/acapsdk/environment-setup* && acap-build ./
diff --git a/aarch64 Auto Update/README.md b/aarch64 Auto Update/README.md
new file mode 100644
index 0000000..6e0fc02
--- /dev/null
+++ b/aarch64 Auto Update/README.md	
@@ -0,0 +1,5 @@
+To build, from main directory
+
+docker build --tag aarch64 . 
+
+docker cp $(docker create aarch64):/opt/app ./build 
\ No newline at end of file
diff --git a/aarch64 Auto Update/app/LICENSE b/aarch64 Auto Update/app/LICENSE
new file mode 100644
index 0000000..9241b06
--- /dev/null
+++ b/aarch64 Auto Update/app/LICENSE	
@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2020 Tailscale & AUTHORS.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/aarch64 Auto Update/app/Makefile b/aarch64 Auto Update/app/Makefile
new file mode 100644
index 0000000..74caba9
--- /dev/null
+++ b/aarch64 Auto Update/app/Makefile	
@@ -0,0 +1 @@
+nop:
\ No newline at end of file
diff --git a/aarch64 Auto Update/app/Tailscale_VPN_Auto_Update b/aarch64 Auto Update/app/Tailscale_VPN_Auto_Update
new file mode 100755
index 0000000..2c24bb3
--- /dev/null
+++ b/aarch64 Auto Update/app/Tailscale_VPN_Auto_Update	
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+    echo "Starting Service"
+    chmod 777 /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale
+    chmod 777 /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscaled
+    /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscaled &
+    echo "Service Started"
+    echo "Scroll to Bottom for link"
+    /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale up
+    /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale set --auto-update
+    wait
\ No newline at end of file
diff --git a/aarch64 Auto Update/app/html/index.html b/aarch64 Auto Update/app/html/index.html
new file mode 100644
index 0000000..f0888d3
--- /dev/null
+++ b/aarch64 Auto Update/app/html/index.html	
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<body>
+<head>
+    <h1 style="color:red;">Scroll to the bottom to find authentication URL</h1>
+    <script>
+        function refreshIFrame() {
+            var x = document.getElementById("*Your_iframe_id*");
+            x.contentWindow.location.reload();
+            var t = setTimeout(refreshIFrame, 5000);
+        }
+    </script>
+</head>
+<body onload="refreshIFrame()"> 
+    <iframe id="*Your_iframe_id*" src= "/axis-cgi/admin/systemlog.cgi?appname=Tailscale_VPN" style="height:600px;width:100%;border: none;" ></iframe>
+</body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/aarch64 Auto Update/app/manifest.json b/aarch64 Auto Update/app/manifest.json
new file mode 100644
index 0000000..8d83761
--- /dev/null
+++ b/aarch64 Auto Update/app/manifest.json	
@@ -0,0 +1,21 @@
+{
+  "schemaVersion": "1.3",
+  "acapPackageConf": {
+      "setup": {
+          "appName": "Tailscale_VPN_Auto_Update",
+          "friendlyName": "Tailscale VPN Auto Update",
+          "vendor": "Tailscale - Packaged by Mo3he",
+          "embeddedSdkVersion": "3.0",
+          "user": {
+              "group": "root",
+              "username": "root"
+          },
+          "vendorUrl": "https://www.tailscale.com",
+          "runMode": "once",
+          "version": "1.0.0"
+        },
+        "configuration":  {
+          "settingPage": "index.html"
+        }
+      }
+  }
diff --git a/aarch64/app/manifest.json b/aarch64/app/manifest.json
index 99e4e86..a11a07a 100644
--- a/aarch64/app/manifest.json
+++ b/aarch64/app/manifest.json
@@ -12,7 +12,7 @@
           },
           "vendorUrl": "https://www.tailscale.com",
           "runMode": "once",
-          "version": "1.56.1"
+          "version": "1.60.0"
         },
         "configuration":  {
           "settingPage": "index.html"
diff --git a/arm Auto Update/Dockerfile b/arm Auto Update/Dockerfile
new file mode 100644
index 0000000..3b4b59c
--- /dev/null
+++ b/arm Auto Update/Dockerfile	
@@ -0,0 +1,12 @@
+ARG ARCH=armv7hf
+ARG VERSION=1.3
+ARG UBUNTU_VERSION=22.04
+ARG REPO=axisecp
+ARG SDK=acap-native-sdk
+
+FROM ${REPO}/${SDK}:${VERSION}-${ARCH}-ubuntu${UBUNTU_VERSION}
+
+# Building the ACAP application
+COPY ./app /opt/app/
+WORKDIR /opt/app
+RUN . /opt/axis/acapsdk/environment-setup* && acap-build ./
diff --git a/arm Auto Update/README.md b/arm Auto Update/README.md
new file mode 100644
index 0000000..adf52d5
--- /dev/null
+++ b/arm Auto Update/README.md	
@@ -0,0 +1,5 @@
+To build from main directory
+
+docker build --tag arm . 
+
+docker cp $(docker create arm):/opt/app ./build 
\ No newline at end of file
diff --git a/arm Auto Update/app/LICENSE b/arm Auto Update/app/LICENSE
new file mode 100644
index 0000000..9241b06
--- /dev/null
+++ b/arm Auto Update/app/LICENSE	
@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2020 Tailscale & AUTHORS.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/arm Auto Update/app/Makefile b/arm Auto Update/app/Makefile
new file mode 100644
index 0000000..74caba9
--- /dev/null
+++ b/arm Auto Update/app/Makefile	
@@ -0,0 +1 @@
+nop:
\ No newline at end of file
diff --git a/arm Auto Update/app/Tailscale_VPN_Auto_Update b/arm Auto Update/app/Tailscale_VPN_Auto_Update
new file mode 100755
index 0000000..2c24bb3
--- /dev/null
+++ b/arm Auto Update/app/Tailscale_VPN_Auto_Update	
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+    echo "Starting Service"
+    chmod 777 /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale
+    chmod 777 /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscaled
+    /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscaled &
+    echo "Service Started"
+    echo "Scroll to Bottom for link"
+    /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale up
+    /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale set --auto-update
+    wait
\ No newline at end of file
diff --git a/arm Auto Update/app/html/index.html b/arm Auto Update/app/html/index.html
new file mode 100644
index 0000000..f0888d3
--- /dev/null
+++ b/arm Auto Update/app/html/index.html	
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<body>
+<head>
+    <h1 style="color:red;">Scroll to the bottom to find authentication URL</h1>
+    <script>
+        function refreshIFrame() {
+            var x = document.getElementById("*Your_iframe_id*");
+            x.contentWindow.location.reload();
+            var t = setTimeout(refreshIFrame, 5000);
+        }
+    </script>
+</head>
+<body onload="refreshIFrame()"> 
+    <iframe id="*Your_iframe_id*" src= "/axis-cgi/admin/systemlog.cgi?appname=Tailscale_VPN" style="height:600px;width:100%;border: none;" ></iframe>
+</body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/arm Auto Update/app/manifest.json b/arm Auto Update/app/manifest.json
new file mode 100644
index 0000000..8d83761
--- /dev/null
+++ b/arm Auto Update/app/manifest.json	
@@ -0,0 +1,21 @@
+{
+  "schemaVersion": "1.3",
+  "acapPackageConf": {
+      "setup": {
+          "appName": "Tailscale_VPN_Auto_Update",
+          "friendlyName": "Tailscale VPN Auto Update",
+          "vendor": "Tailscale - Packaged by Mo3he",
+          "embeddedSdkVersion": "3.0",
+          "user": {
+              "group": "root",
+              "username": "root"
+          },
+          "vendorUrl": "https://www.tailscale.com",
+          "runMode": "once",
+          "version": "1.0.0"
+        },
+        "configuration":  {
+          "settingPage": "index.html"
+        }
+      }
+  }
diff --git a/arm/app/manifest.json b/arm/app/manifest.json
index 99e4e86..a11a07a 100644
--- a/arm/app/manifest.json
+++ b/arm/app/manifest.json
@@ -12,7 +12,7 @@
           },
           "vendorUrl": "https://www.tailscale.com",
           "runMode": "once",
-          "version": "1.56.1"
+          "version": "1.60.0"
         },
         "configuration":  {
           "settingPage": "index.html"