From 65c0a23d67467f85497603d6e8315e2b4b5050a1 Mon Sep 17 00:00:00 2001 From: axismarco Date: Mon, 24 Jun 2024 12:59:40 -0400 Subject: [PATCH 1/2] no root suport. Tailscale version 1.68.1 --- aarch64/Dockerfile | 2 +- aarch64/app/manifest.json | 12 ++++-------- arm/Dockerfile | 2 +- arm/app/Tailscale_VPN | 4 ++-- arm/app/manifest.json | 12 ++++-------- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile index eb1938e..f1ad66d 100644 --- a/aarch64/Dockerfile +++ b/aarch64/Dockerfile @@ -1,5 +1,5 @@ ARG ARCH=aarch64 -ARG VERSION=1.3 +ARG VERSION=1.14 ARG UBUNTU_VERSION=22.04 ARG REPO=axisecp ARG SDK=acap-native-sdk diff --git a/aarch64/app/manifest.json b/aarch64/app/manifest.json index 0b7ae75..7726558 100644 --- a/aarch64/app/manifest.json +++ b/aarch64/app/manifest.json @@ -1,21 +1,17 @@ { - "schemaVersion": "1.3", + "schemaVersion": "1.6.0", "acapPackageConf": { "setup": { "appName": "Tailscale_VPN", "friendlyName": "Tailscale VPN", "vendor": "Tailscale - Packaged by Mo3he", - "embeddedSdkVersion": "3.0", - "user": { - "group": "root", - "username": "root" - }, + "embeddedSdkVersion": "3.0", "vendorUrl": "https://www.tailscale.com", "runMode": "once", - "version": "1.62.0" + "version": "1.63.0" }, "configuration": { "settingPage": "index.html" } } - } + } \ No newline at end of file diff --git a/arm/Dockerfile b/arm/Dockerfile index 3b4b59c..5522f14 100644 --- a/arm/Dockerfile +++ b/arm/Dockerfile @@ -1,5 +1,5 @@ ARG ARCH=armv7hf -ARG VERSION=1.3 +ARG VERSION=1.14 ARG UBUNTU_VERSION=22.04 ARG REPO=axisecp ARG SDK=acap-native-sdk diff --git a/arm/app/Tailscale_VPN b/arm/app/Tailscale_VPN index b610861..063aa9c 100755 --- a/arm/app/Tailscale_VPN +++ b/arm/app/Tailscale_VPN @@ -3,8 +3,8 @@ echo "Starting Service" chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscale chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscaled - /usr/local/packages/Tailscale_VPN/lib/tailscaled & + /usr/local/packages/Tailscale_VPN/lib/tailscaled --tun=userspace-networking --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock & echo "Service Started" echo "Scroll to Bottom for link" - /usr/local/packages/Tailscale_VPN/lib/tailscale up + /usr/local/packages/Tailscale_VPN/lib/tailscale --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock up wait \ No newline at end of file diff --git a/arm/app/manifest.json b/arm/app/manifest.json index 0b7ae75..7726558 100644 --- a/arm/app/manifest.json +++ b/arm/app/manifest.json @@ -1,21 +1,17 @@ { - "schemaVersion": "1.3", + "schemaVersion": "1.6.0", "acapPackageConf": { "setup": { "appName": "Tailscale_VPN", "friendlyName": "Tailscale VPN", "vendor": "Tailscale - Packaged by Mo3he", - "embeddedSdkVersion": "3.0", - "user": { - "group": "root", - "username": "root" - }, + "embeddedSdkVersion": "3.0", "vendorUrl": "https://www.tailscale.com", "runMode": "once", - "version": "1.62.0" + "version": "1.63.0" }, "configuration": { "settingPage": "index.html" } } - } + } \ No newline at end of file From b648bc2425ab7481ce91fe245235bd7519c66167 Mon Sep 17 00:00:00 2001 From: paromarc Date: Mon, 24 Jun 2024 15:15:33 -0400 Subject: [PATCH 2/2] added script inside main.c file --- aarch64/app/Makefile | 24 ++++++++++++++++++- aarch64/app/Tailscale_VPN | Bin 491 -> 6056 bytes aarch64/app/app.h | 1 + aarch64/app/main.c | 43 ++++++++++++++++++++++++++++++++++ aarch64/app/manifest.json | 2 +- aarch64/app/package.conf | 22 +++++++++++++++++ aarch64/app/package.conf.orig | 10 ++++++++ aarch64/app/param.conf | 0 arm/app/Makefile | 24 ++++++++++++++++++- arm/app/Tailscale_VPN | Bin 491 -> 5532 bytes arm/app/app.h | 1 + arm/app/main.c | 43 ++++++++++++++++++++++++++++++++++ arm/app/package.conf | 22 +++++++++++++++++ arm/app/package.conf.orig | 10 ++++++++ arm/app/param.conf | 0 15 files changed, 199 insertions(+), 3 deletions(-) create mode 100644 aarch64/app/app.h create mode 100644 aarch64/app/main.c create mode 100644 aarch64/app/package.conf create mode 100644 aarch64/app/package.conf.orig create mode 100644 aarch64/app/param.conf create mode 100644 arm/app/app.h create mode 100644 arm/app/main.c create mode 100644 arm/app/package.conf create mode 100644 arm/app/package.conf.orig create mode 100644 arm/app/param.conf diff --git a/aarch64/app/Makefile b/aarch64/app/Makefile index 74caba9..13dca69 100644 --- a/aarch64/app/Makefile +++ b/aarch64/app/Makefile @@ -1 +1,23 @@ -nop: \ No newline at end of file +#//Version=Native +AXIS_USABLE_LIBS = UCLIBC GLIBC + +PROG = tailscale_vpn + +CFLAGS += -Wall + +PKGS += glib-2.0 gio-2.0 +CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS)) +LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs $(PKGS)) + +SRCS += main.c +OBJS += $(SRCS:.c=.o) + +all: $(PROG) $(OBJS) + +$(PROG): $(OBJS) + $(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@ + $(STRIP) $@ + +clean: + #rm -f $(PROG) $(OBJS) + diff --git a/aarch64/app/Tailscale_VPN b/aarch64/app/Tailscale_VPN index 063aa9ca804640ad43bf80db60247e2f402ba6d7..d0750031b5894d42a2a2715759fe7efe6721feb9 100755 GIT binary patch literal 6056 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 literal 491 zcmbu5Jr2S!425@2VT!~SGIr|10T5CVD@qg7Mor@?aq0Ex4eAYz_ama|mBli^Q@hc%B=^8m(Ui$gL97Yf9zbVadV4{U)hV%lc g133pwa3p4G;7$RY_4PcoeD{ann!sH +#include +#include +#include +#include +#include +#include +#include +#include "app.h" + +#define TAILSCALE_VPN "\ +#!/bin/sh \n\ +echo \"Starting Service\" \n\ +chmod 777 /usr/local/packages/tailscale_vpn/lib/tailscale \n\ +chmod 777 /usr/local/packages/tailscale_vpn/lib/tailscaled \n\ +/usr/local/packages/tailscale_vpn/lib/tailscaled --tun=userspace-networking --socket=/usr/local/packages/tailscale_vpn/tailscaled.sock & \n\ +echo \"Service Started\" \n\ +echo \"Scroll to Bottom for link\" \n\ +/usr/local/packages/tailscale_vpn/lib/tailscale --socket=/usr/local/packages/tailscale_vpn/tailscaled.sock up \n\ +wait \n\ +" + +//****************/ +/* main function */ +//****************/ + +int main() { +/* Loop main (keeps the app running. without this part the app will start and stop right after) */ + GMainLoop *main_loop; + main_loop = g_main_loop_new(NULL, FALSE); + +/* LOG app name (appname) */ + syslog(LOG_INFO, "Starting %s", APP_NAME); + g_message("Starting %s",APP_NAME); + + system(TAILSCALE_VPN); + +/* calling main loop */ + g_main_loop_run(main_loop); + +//exit + return 0; +} diff --git a/aarch64/app/manifest.json b/aarch64/app/manifest.json index 7726558..32abb95 100644 --- a/aarch64/app/manifest.json +++ b/aarch64/app/manifest.json @@ -2,7 +2,7 @@ "schemaVersion": "1.6.0", "acapPackageConf": { "setup": { - "appName": "Tailscale_VPN", + "appName": "tailscale_vpn", "friendlyName": "Tailscale VPN", "vendor": "Tailscale - Packaged by Mo3he", "embeddedSdkVersion": "3.0", diff --git a/aarch64/app/package.conf b/aarch64/app/package.conf new file mode 100644 index 0000000..3019d90 --- /dev/null +++ b/aarch64/app/package.conf @@ -0,0 +1,22 @@ +PACKAGENAME="Tailscale VPN" +APPTYPE="aarch64" +APPNAME="tailscale_vpn" +APPID="" +LICENSENAME="Available" +LICENSEPAGE="none" +VENDOR="Tailscale - Packaged by Mo3he" +REQEMBDEVVERSION="3.0" +APPMAJORVERSION="1" +APPMINORVERSION="63" +APPMICROVERSION="0" +APPGRP="sdk" +APPUSR="sdk" +APPOPTS="" +OTHERFILES="" +SETTINGSPAGEFILE="index.html" +SETTINGSPAGETEXT="" +VENDORHOMEPAGELINK='www.tailscale.com' +PREUPGRADESCRIPT="" +POSTINSTALLSCRIPT="" +STARTMODE="once" +HTTPCGIPATHS="" diff --git a/aarch64/app/package.conf.orig b/aarch64/app/package.conf.orig new file mode 100644 index 0000000..4b174ca --- /dev/null +++ b/aarch64/app/package.conf.orig @@ -0,0 +1,10 @@ +APPNAME="tailscale_vpn" +PACKAGENAME="Tailscale VPN" +VENDOR="Tailscale - Packaged by Mo3he" +REQEMBDEVVERSION="3.0" +VENDORHOMEPAGELINK='www.tailscale.com' +STARTMODE="once" +APPMAJORVERSION="1" +APPMINORVERSION="63" +APPMICROVERSION="0" +SETTINGSPAGEFILE="index.html" diff --git a/aarch64/app/param.conf b/aarch64/app/param.conf new file mode 100644 index 0000000..e69de29 diff --git a/arm/app/Makefile b/arm/app/Makefile index 74caba9..13dca69 100644 --- a/arm/app/Makefile +++ b/arm/app/Makefile @@ -1 +1,23 @@ -nop: \ No newline at end of file +#//Version=Native +AXIS_USABLE_LIBS = UCLIBC GLIBC + +PROG = tailscale_vpn + +CFLAGS += -Wall + +PKGS += glib-2.0 gio-2.0 +CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS)) +LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs $(PKGS)) + +SRCS += main.c +OBJS += $(SRCS:.c=.o) + +all: $(PROG) $(OBJS) + +$(PROG): $(OBJS) + $(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@ + $(STRIP) $@ + +clean: + #rm -f $(PROG) $(OBJS) + diff --git a/arm/app/Tailscale_VPN b/arm/app/Tailscale_VPN index 063aa9ca804640ad43bf80db60247e2f402ba6d7..a5eea3a0e36d1678c0f34e84dac1a66029b74c2b 100755 GIT binary patch literal 5532 zcmeHLU2GiH6~41;JL?T~3^>6gw3-+Qp|G=dViEd7WjovT20OF`Q$DF@Gw3=tE0dHOd1IB!~wd=nIljgX9p2RuolHm8yu+3aJ)k1(Ztm1K@}tmhYRH zYbF6Ttx%;t_(xp(i}d-vXX(MNx#5q}VR#jdTk!3SGVuk1o+YDpb*n z*cP#w@y2wo5E3a+h^`1d(5x$=q5>h~NyKL0OI!<|U>wB(pjKrc+9J>;h!Vu-`-GV9 zQvxv0K7j2qp1^Yf@dd<*ph6UveQ3a!$bnDD*bmx%8SdwV`TK#p5s$Y&ja&rlLy2t7 zDrRftOwF>Jt&HK;tNS(2(RLyfa0Z|`29tN)E0(LHk9|LTV&xB~CT~0TR{f?IT=69H zupQ|-)WQmhY+e%7SFNz8>M!SgCSYcYQacE}71Rj6NtX7D8c zt1(}N{iB%Ac>WUqhnM(IT;ksv^HtbKV?Of#qxa9o!Ps)=Gf+pQLLFl z*DH0$);-^FeO(W!Ur4Ozb;Gjtn&UKdw`q$C%nF{LmD=V(q${-yeZOTJHR~|5|_e>5V}woM$vJ7gyABMUaHOtFe^Z2hc?XDKFop=t=q)p^qz^``VMV$)!NBL5=a8? zLnnVFFTrNn{I8B-S|-F91|eJ%*Fc|)^!W{;--Y+i@_)hK zh&i!LjRo~S^*SLwroKXmSD-gxvYnv@?<_T1c$FHw*Qv4C-=M~tT%=A5agG{O>>X=f+A^I~h?-c-JC`k`EBdk_ zeW|C=0%u`qINw=0vn15UDRKHWbaxT>6Y#xdu^#A4EIg3!npfukaenYb_tQ`0P?k*1 zcNOkCFGOeMmrI?M7ngpVR>Ze4<^#jW+XL$Hc5?X0VnY4(+t@+g`dTNeyxi&hvjEQR z;Pe#MO|84Lm7B{Q&OJ7fJlj3>mwn0S1}7Vn;`9M5?k+PPKBqch2RuY(AX( z+Xm&mrZcA(Sg5r>ySUwM)%5JvUo(kSp6TO0!1A z^s*Oa54QK!k}pxUtfv3V#>#3Y<2UU)nx5%;=$)CdP5+?d&hnRLGM-bKHT^p-pLDhN zW$a6(S#{g$$bExZ$@B0QXcXh-8lH=C$CVh>bhDPP&O*pBnOpimCcFklp*EoN=^}) zSM_|?H;O{DY+T?PLbDy;)GBsUD>f}$nXPhEG(NE>;~Nzb#Hxl@6Ggq;#y}RBYzVayI81=Q8J4{M(4E z#~6k43Rkg!C%<9bz(6GO)oz0?c}G#1P$dak@_48C5Oa_1ay<~7vs@Px@(7;8*+=rY zPKZU=TsK@BeAYz_ama|mBli^Q@hc%B=^8m(Ui$gL97Yf9zbVadV4{U)hV%lc g133pwa3p4G;7$RY_4PcoeD{ann!sH +#include +#include +#include +#include +#include +#include +#include +#include "app.h" + +#define TAILSCALE_VPN "\ +#!/bin/sh \n\ +echo \"Starting Service\" \n\ +chmod 777 /usr/local/packages/tailscale_vpn/lib/tailscale \n\ +chmod 777 /usr/local/packages/tailscale_vpn/lib/tailscaled \n\ +/usr/local/packages/tailscale_vpn/lib/tailscaled --tun=userspace-networking --socket=/usr/local/packages/tailscale_vpn/tailscaled.sock & \n\ +echo \"Service Started\" \n\ +echo \"Scroll to Bottom for link\" \n\ +/usr/local/packages/tailscale_vpn/lib/tailscale --socket=/usr/local/packages/tailscale_vpn/tailscaled.sock up \n\ +wait \n\ +" + +//****************/ +/* main function */ +//****************/ + +int main() { +/* Loop main (keeps the app running. without this part the app will start and stop right after) */ + GMainLoop *main_loop; + main_loop = g_main_loop_new(NULL, FALSE); + +/* LOG app name (appname) */ + syslog(LOG_INFO, "Starting %s", APP_NAME); + g_message("Starting %s",APP_NAME); + + system(TAILSCALE_VPN); + +/* calling main loop */ + g_main_loop_run(main_loop); + +//exit + return 0; +} diff --git a/arm/app/package.conf b/arm/app/package.conf new file mode 100644 index 0000000..3191451 --- /dev/null +++ b/arm/app/package.conf @@ -0,0 +1,22 @@ +PACKAGENAME="Tailscale VPN" +APPTYPE="armv7hf" +APPNAME="Tailscale_VPN" +APPID="" +LICENSENAME="Available" +LICENSEPAGE="none" +VENDOR="Tailscale - Packaged by Mo3he" +REQEMBDEVVERSION="3.0" +APPMAJORVERSION="1" +APPMINORVERSION="63" +APPMICROVERSION="0" +APPGRP="sdk" +APPUSR="sdk" +APPOPTS="" +OTHERFILES="" +SETTINGSPAGEFILE="index.html" +SETTINGSPAGETEXT="" +VENDORHOMEPAGELINK='www.tailscale.com' +PREUPGRADESCRIPT="" +POSTINSTALLSCRIPT="" +STARTMODE="once" +HTTPCGIPATHS="" diff --git a/arm/app/package.conf.orig b/arm/app/package.conf.orig new file mode 100644 index 0000000..7e083b9 --- /dev/null +++ b/arm/app/package.conf.orig @@ -0,0 +1,10 @@ +APPNAME="Tailscale_VPN" +PACKAGENAME="Tailscale VPN" +VENDOR="Tailscale - Packaged by Mo3he" +REQEMBDEVVERSION="3.0" +VENDORHOMEPAGELINK='www.tailscale.com' +STARTMODE="once" +APPMAJORVERSION="1" +APPMINORVERSION="63" +APPMICROVERSION="0" +SETTINGSPAGEFILE="index.html" diff --git a/arm/app/param.conf b/arm/app/param.conf new file mode 100644 index 0000000..e69de29