New version 2021.12.4 and add tunnel service file

4 files changed, 42 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d17a65930d72..63458eb402e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cloudflared-bin
 	pkgdesc = An Argo Tunnel client which proxies any local webserver through the Cloudflare network
-	pkgver = 2021.12.3
-	pkgrel = 2
+	pkgver = 2021.12.4
+	pkgrel = 1
 	url = https://developers.cloudflare.com/argo-tunnel/
 	arch = x86_64
 	arch = i686
@@ -16,21 +16,23 @@ pkgbase = cloudflared-bin
 	source = cloudflared.yml
 	source = cloudflared@.service
 	source = cloudflared-dns.service
+	source = cloudflared-tunnel@.service
 	source = sysusers.d
 	b2sums = 88c2a20908e165ef79e13799549be16b577e095c6874ede50b1d7203ae9d7c3ac22d5a645e36407cba63021f4eb95c30f103df1dc51dba451a81f8b0f609f011
 	b2sums = 09ac52a248193706455b141f31da2a44f8f176b15ff062554da2c9a5e1e5a796b7d39890ed4d81e8941cedad24a0d56169251e9cb1df51097a95111165981630
-	b2sums = 58a75132893249f1a13096400019add31d997f122aaa6b282a85c6dc15fa17d842f5d7037f484d2eb88cb9214765043746a4542b1ea1dc61794a09d7b0a83ec1
+	b2sums = 10ecd693cd7b310f69dce1551a0a9299c89fffafcc67c856f340c66f45263daa1a065ab3c82005856b3ee62a85a1c921db177bf99d91db64be12e4ee3114dccc
 	b2sums = 2916ff952590b1322c84a390da01639f4e2656faa6d72c3f270b21c89a56bd5fb54fd54c6204736d61a0433b46427701de5a641bf68958dd03f551fe18b8bc7f
+	b2sums = 064c7d7bec9d6f07690297afd5e62747650ac1952359df7499641e1ff96f1fcf5bc7e4843c1371930c0f57ecac548a5348aeb64196a3794bbe35d9ce732baaac
 	b2sums = 38c9699663b667844e4236a4f33ff156ab0226f2144590d03e968dc73ae1a5be9510d979c408f5ff3205a057120cc54cf740732b36f361616f48dc269ae1a1a1
-	source_x86_64 = cloudflared-bin-x86_64-2021.12.3::https://github.com/cloudflare/cloudflared/releases/download/2021.12.3/cloudflared-linux-amd64
-	b2sums_x86_64 = 1defab4b6537794b201ee8c3ac2e0e128d5f115d3633b37e39a6826af61bead416a99c7374e355d772566fc7171d41cc8e0419a179306fde7a43bb130ee97441
-	source_i686 = cloudflared-bin-386-2021.12.3::https://github.com/cloudflare/cloudflared/releases/download/2021.12.3/cloudflared-linux-386
-	b2sums_i686 = ba7ce15d80952a65f868a6a16d7d3e82c1112cae614c53b6d605c31ad8bfe8a60061742d4be0af0c52c677fa8246abc61b9f891dbab3a49c35f536666b73f118
-	source_aarch64 = cloudflared-bin-aarch64-2021.12.3::https://github.com/cloudflare/cloudflared/releases/download/2021.12.3/cloudflared-linux-arm64
-	b2sums_aarch64 = ed060d01117b214d9cb58cb0e05ac554c64445ae7014555b6b90fa850283edf5eb797382e3fe27a4134b066c019d782232b7a162a8c1099f6dde51a266ef39aa
-	source_armv6h = cloudflared-bin-armv6h-2021.12.3::https://github.com/cloudflare/cloudflared/releases/download/2021.12.3/cloudflared-linux-arm
-	b2sums_armv6h = 5700175dd24aded2ca2f58e51465d24d878ff487aeff56d5a7d64dc67d4e3b34ce4a983b57a854bda0d1dbd44f9d43b36ca263c2299b299945be1c0bd761848c
-	source_armv7h = cloudflared-bin-armv7h-2021.12.3::https://github.com/cloudflare/cloudflared/releases/download/2021.12.3/cloudflared-linux-arm
-	b2sums_armv7h = 5700175dd24aded2ca2f58e51465d24d878ff487aeff56d5a7d64dc67d4e3b34ce4a983b57a854bda0d1dbd44f9d43b36ca263c2299b299945be1c0bd761848c
+	source_x86_64 = cloudflared-bin-x86_64-2021.12.4::https://github.com/cloudflare/cloudflared/releases/download/2021.12.4/cloudflared-linux-amd64
+	b2sums_x86_64 = f9bec016906ae8db0cbdd7ee48bf0aa2d023e5d45ef7f41b9bb70748ad95a9c522479bdc9f28797e097a4f6c4d5973879ea3eee82233965cb6a1701faccfb873
+	source_i686 = cloudflared-bin-386-2021.12.4::https://github.com/cloudflare/cloudflared/releases/download/2021.12.4/cloudflared-linux-386
+	b2sums_i686 = 9c581b8a2e3cc0fdd46c1be1f6ac452cbe7ff948c9671f252b101ab124f320bb0470e7c963611365e99f6954680c3986b04618c903ab0ced7dbc811190e6e979
+	source_aarch64 = cloudflared-bin-aarch64-2021.12.4::https://github.com/cloudflare/cloudflared/releases/download/2021.12.4/cloudflared-linux-arm64
+	b2sums_aarch64 = 029cfa0cc5f6b350659508590be25eb16d054a40d4547bcf330cdd785086b7bdaaef195d302fe5c676c73cef41242136115c53b24091e8a7709ca11f67538f8c
+	source_armv6h = cloudflared-bin-armv6h-2021.12.4::https://github.com/cloudflare/cloudflared/releases/download/2021.12.4/cloudflared-linux-arm
+	b2sums_armv6h = db13af5f094f22f0f20b2c16d8020e986d2c9ef344d495563dea48f1fbcdc78cea11ac7fde455591ea2df41995aafc6f61937e53d4bdb753cb0089323525e95e
+	source_armv7h = cloudflared-bin-armv7h-2021.12.4::https://github.com/cloudflare/cloudflared/releases/download/2021.12.4/cloudflared-linux-arm
+	b2sums_armv7h = db13af5f094f22f0f20b2c16d8020e986d2c9ef344d495563dea48f1fbcdc78cea11ac7fde455591ea2df41995aafc6f61937e53d4bdb753cb0089323525e95e
 
 pkgname = cloudflared-bin
diff --git a/PKGBUILD b/PKGBUILD
index da716589fa9f..edceef14777e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Hao Long <aur@esd.cc>
 
 pkgname=cloudflared-bin
-pkgver=2021.12.3
-pkgrel=2
+pkgver=2021.12.4
+pkgrel=1
 pkgdesc="An Argo Tunnel client which proxies any local webserver through the Cloudflare network"
 arch=("x86_64" "i686" "aarch64" "armv6h" "armv7h")
 url="https://developers.cloudflare.com/argo-tunnel/"
@@ -15,6 +15,7 @@ source=("https://raw.githubusercontent.com/cloudflare/cloudflared/master/LICENSE
         "cloudflared.yml"
         "cloudflared@.service"
         "cloudflared-dns.service"
+        "cloudflared-tunnel@.service"
         "sysusers.d")
 source_x86_64=("${pkgname}-x86_64-${pkgver}::${_url}/releases/download/${pkgver}/cloudflared-linux-amd64")
 source_i686=("${pkgname}-386-${pkgver}::${_url}/releases/download/${pkgver}/cloudflared-linux-386")
@@ -23,14 +24,15 @@ source_armv6h=("${pkgname}-armv6h-${pkgver}::${_url}/releases/download/${pkgver}
 source_armv7h=("${pkgname}-armv7h-${pkgver}::${_url}/releases/download/${pkgver}/cloudflared-linux-arm")
 b2sums=('88c2a20908e165ef79e13799549be16b577e095c6874ede50b1d7203ae9d7c3ac22d5a645e36407cba63021f4eb95c30f103df1dc51dba451a81f8b0f609f011'
         '09ac52a248193706455b141f31da2a44f8f176b15ff062554da2c9a5e1e5a796b7d39890ed4d81e8941cedad24a0d56169251e9cb1df51097a95111165981630'
-        '58a75132893249f1a13096400019add31d997f122aaa6b282a85c6dc15fa17d842f5d7037f484d2eb88cb9214765043746a4542b1ea1dc61794a09d7b0a83ec1'
+        '10ecd693cd7b310f69dce1551a0a9299c89fffafcc67c856f340c66f45263daa1a065ab3c82005856b3ee62a85a1c921db177bf99d91db64be12e4ee3114dccc'
         '2916ff952590b1322c84a390da01639f4e2656faa6d72c3f270b21c89a56bd5fb54fd54c6204736d61a0433b46427701de5a641bf68958dd03f551fe18b8bc7f'
+        '064c7d7bec9d6f07690297afd5e62747650ac1952359df7499641e1ff96f1fcf5bc7e4843c1371930c0f57ecac548a5348aeb64196a3794bbe35d9ce732baaac'
         '38c9699663b667844e4236a4f33ff156ab0226f2144590d03e968dc73ae1a5be9510d979c408f5ff3205a057120cc54cf740732b36f361616f48dc269ae1a1a1')
-b2sums_x86_64=('1defab4b6537794b201ee8c3ac2e0e128d5f115d3633b37e39a6826af61bead416a99c7374e355d772566fc7171d41cc8e0419a179306fde7a43bb130ee97441')
-b2sums_i686=('ba7ce15d80952a65f868a6a16d7d3e82c1112cae614c53b6d605c31ad8bfe8a60061742d4be0af0c52c677fa8246abc61b9f891dbab3a49c35f536666b73f118')
-b2sums_aarch64=('ed060d01117b214d9cb58cb0e05ac554c64445ae7014555b6b90fa850283edf5eb797382e3fe27a4134b066c019d782232b7a162a8c1099f6dde51a266ef39aa')
-b2sums_armv6h=('5700175dd24aded2ca2f58e51465d24d878ff487aeff56d5a7d64dc67d4e3b34ce4a983b57a854bda0d1dbd44f9d43b36ca263c2299b299945be1c0bd761848c')
-b2sums_armv7h=('5700175dd24aded2ca2f58e51465d24d878ff487aeff56d5a7d64dc67d4e3b34ce4a983b57a854bda0d1dbd44f9d43b36ca263c2299b299945be1c0bd761848c')
+b2sums_x86_64=('f9bec016906ae8db0cbdd7ee48bf0aa2d023e5d45ef7f41b9bb70748ad95a9c522479bdc9f28797e097a4f6c4d5973879ea3eee82233965cb6a1701faccfb873')
+b2sums_i686=('9c581b8a2e3cc0fdd46c1be1f6ac452cbe7ff948c9671f252b101ab124f320bb0470e7c963611365e99f6954680c3986b04618c903ab0ced7dbc811190e6e979')
+b2sums_aarch64=('029cfa0cc5f6b350659508590be25eb16d054a40d4547bcf330cdd785086b7bdaaef195d302fe5c676c73cef41242136115c53b24091e8a7709ca11f67538f8c')
+b2sums_armv6h=('db13af5f094f22f0f20b2c16d8020e986d2c9ef344d495563dea48f1fbcdc78cea11ac7fde455591ea2df41995aafc6f61937e53d4bdb753cb0089323525e95e')
+b2sums_armv7h=('db13af5f094f22f0f20b2c16d8020e986d2c9ef344d495563dea48f1fbcdc78cea11ac7fde455591ea2df41995aafc6f61937e53d4bdb753cb0089323525e95e')
 
 package() {
   # Install License
@@ -41,7 +43,7 @@ package() {
 
   # Configuration File
   install -Dm644 cloudflared.yml ${pkgdir}/etc/cloudflared/cloudflared.yml.example
-  install -Dm644 -t ${pkgdir}/usr/lib/systemd/system cloudflared{@,-dns}.service
+  install -Dm644 -t ${pkgdir}/usr/lib/systemd/system cloudflared{@,-dns,-tunnel@}.service
 
   # Post install
   install -Dm644 sysusers.d ${pkgdir}/usr/lib/sysusers.d/cloudflared.conf
diff --git a/cloudflared-tunnel@.service b/cloudflared-tunnel@.service
new file mode 100644
index 000000000000..a8a018409676
--- /dev/null
+++ b/cloudflared-tunnel@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Argo Tunnel client daemon for %i
+After=network.target
+Wants=network.target
+
+[Service]
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+User=cloudflared
+Group=cloudflared
+Type=simple
+ExecStart=/usr/bin/cloudflared --config /etc/cloudflared/%i.yml --no-autoupdate tunnel run
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/cloudflared@.service b/cloudflared@.service
index 5970803a542f..550d4332c28b 100644
--- a/cloudflared@.service
+++ b/cloudflared@.service
@@ -8,7 +8,7 @@ AmbientCapabilities=CAP_NET_BIND_SERVICE
 User=cloudflared
 Group=cloudflared
 Type=simple
-ExecStart=/usr/bin/cloudflared --config /etc/cloudflared/%i.yml --no-autoupdate tunnel run %i
+ExecStart=/usr/bin/cloudflared --config /etc/cloudflared/%i.yml --no-autoupdate
 Restart=on-failure
 
 [Install]