upgpkg: cloudflared 2021.8.5-1

* New upstream release.
* Skip previous release due to quic-go dependency mismatch.
  Ref: https://github.com/cloudflare/cloudflared/issues/444

5 files changed, 35 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 103b4c9048ac..2e31e3fb1a4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cloudflared
 	pkgdesc = Argo Tunnel client
-	pkgver = 2021.8.2
+	pkgver = 2021.8.5
 	pkgrel = 1
 	url = https://github.com/cloudflare/cloudflared
 	arch = x86_64
@@ -11,12 +11,12 @@ pkgbase = cloudflared
 	depends = glibc
 	conflicts = cloudflared-bin
 	backup = etc/cloudflared/config.yml
-	source = cloudflared-2021.8.2.tar.gz::https://github.com/cloudflare/cloudflared/archive/2021.8.2.tar.gz
+	source = cloudflared-2021.8.5.tar.gz::https://github.com/cloudflare/cloudflared/archive/2021.8.5.tar.gz
 	source = config.yml
-	source = cloudflared.service
-	source = sysusers.d.conf
-	source = tmpfiles.d.conf
-	b2sums = 7afe80c240fc12f081d35bcedd7360f3fc33d44113126cb03181eb54dfd9de1af9fc099c6947d8bf90576682e2a627c8b7e33e51b2a2c578e2a212e50bd86ae6
+	source = systemd.service
+	source = sysusers.conf
+	source = tmpfiles.conf
+	b2sums = 6c2378d1737d6d7485e344c9340039d8f0a3736f714000c73df3dba2deee7d3af1743bd344fc14f41a89dc086b9b698fea94ab5ff77c9de176f9a47ae831d12c
 	b2sums = 887218db3b5e7cdbb90c86b60aac1597d70b59fccece18c8c5e6e2357d04aa219b2438436f23f913a0c8dc6eb425ef3e22901e28fd30e5130d17e414e67ec4af
 	b2sums = 0fa4ac918b4c72e2b1a1bd36e025fdb6078364363cba167e6d91e7815c8bd6f5c4b412f0651d1a75991ef7e069da6e81917f22bd40ef87fd1ccd41171e64e0b2
 	b2sums = 7a15fc73f02cc74e2cea55ba51632724bae16f140e07904a88daa3179ed320e9e6efa9a1901d8249fd1618a2a91f93384a93bfaba6eba6990457b7c2d2155f58
diff --git a/PKGBUILD b/PKGBUILD
index 67059d2667a8..4335c4dac32c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: George Rawlinson <george@rawlinson.net.nz>
 
 pkgname=cloudflared
-pkgver=2021.8.2
+pkgver=2021.8.5
 pkgrel=1
 pkgdesc="Argo Tunnel client"
 arch=('x86_64' 'armv7h' 'aarch64')
@@ -11,12 +11,14 @@ depends=('glibc')
 makedepends=('go')
 conflicts=('cloudflared-bin')
 backup=("etc/$pkgname/config.yml")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/cloudflare/cloudflared/archive/$pkgver.tar.gz"
-        "config.yml"
-        "$pkgname.service"
-        "sysusers.d.conf"
-        "tmpfiles.d.conf")
-b2sums=('7afe80c240fc12f081d35bcedd7360f3fc33d44113126cb03181eb54dfd9de1af9fc099c6947d8bf90576682e2a627c8b7e33e51b2a2c578e2a212e50bd86ae6'
+source=(
+  "$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+  'config.yml'
+  'systemd.service'
+  'sysusers.conf'
+  'tmpfiles.conf'
+)
+b2sums=('6c2378d1737d6d7485e344c9340039d8f0a3736f714000c73df3dba2deee7d3af1743bd344fc14f41a89dc086b9b698fea94ab5ff77c9de176f9a47ae831d12c'
         '887218db3b5e7cdbb90c86b60aac1597d70b59fccece18c8c5e6e2357d04aa219b2438436f23f913a0c8dc6eb425ef3e22901e28fd30e5130d17e414e67ec4af'
         '0fa4ac918b4c72e2b1a1bd36e025fdb6078364363cba167e6d91e7815c8bd6f5c4b412f0651d1a75991ef7e069da6e81917f22bd40ef87fd1ccd41171e64e0b2'
         '7a15fc73f02cc74e2cea55ba51632724bae16f140e07904a88daa3179ed320e9e6efa9a1901d8249fd1618a2a91f93384a93bfaba6eba6990457b7c2d2155f58'
@@ -24,17 +26,26 @@ b2sums=('7afe80c240fc12f081d35bcedd7360f3fc33d44113126cb03181eb54dfd9de1af9fc099
 
 prepare() {
   cd "$pkgname-$pkgver"
+
+  # create directory for build output
   mkdir build
+
+  # download dependencies
+  rm -rf vendor go.sum
+  sed "s/go 1.15/go 1.17/" -i go.mod
+  go mod tidy
+  go mod vendor
 }
 
 build() {
   cd "$pkgname-$pkgver"
 
   # define buildtime for use in man page & binary
-  local build_time="$(date --iso-8601=seconds --utc)"
+  local build_time="$(date -d@"$SOURCE_DATE_EPOCH" +%Y%m%d-%H:%M:%S)"
 
   # generate man page
-  sed -e "s/\${VERSION}/${pkgver}/; s/\${DATE}/${build_time}/" \
+  sed -e "s/\${VERSION}/${pkgver}/" \
+      -e "s/\${DATE}/${build_time}/" \
     cloudflared_man_template > "build/$pkgname.1"
 
   go build -v \
@@ -42,8 +53,11 @@ build() {
     -trimpath \
     -mod=vendor \
     -modcacherw \
-    -ldflags "-extldflags $LDFLAGS -X "main.Version=${pkgver}" -X "main.BuildTime=${build_time}"" \
-    -o build ./cmd/...
+    -ldflags "-extldflags ${LDFLAGS} \
+      -X main.Version=${pkgver} \
+      -X main.BuildTime=${build_time}" \
+    -o build \
+    ./cmd/...
 }
 
 check() {
@@ -52,10 +66,10 @@ check() {
 }
 
 package() {
-  # systemd files
-  install -vDm644 -t "$pkgdir/usr/lib/systemd/system" "$pkgname.service"
-  install -vDm644 sysusers.d.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -vDm644 tmpfiles.d.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+  # systemd integration
+  install -vDm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 
   # config
   install -vDm644 -t "$pkgdir/etc/$pkgname" config.yml
diff --git a/cloudflared.service b/systemd.service
index 08dc89503416..08dc89503416 100644
--- a/cloudflared.service
+++ b/systemd.service
diff --git a/sysusers.d.conf b/sysusers.conf
index dff81a09e5e8..dff81a09e5e8 100644
--- a/sysusers.d.conf
+++ b/sysusers.conf
diff --git a/tmpfiles.d.conf b/tmpfiles.conf
index 1fa99c03fe24..1fa99c03fe24 100644
--- a/tmpfiles.d.conf
+++ b/tmpfiles.conf