diff options
| author | George Rawlinson | 2020-03-22 09:46:59 +1300 |
|---|---|---|
| committer | George Rawlinson | 2020-03-22 09:46:59 +1300 |
| commit | b3de5398ddcabc76a6750e552346f5dbc5503dfe (patch) | |
| tree | dbaa919a9ac62d18ebc0e4a41dd8b5e32cfd5a21 | |
| parent | 71d05dbf0cd4cde7c10ae40128e9549828eb6767 (diff) | |
| download | aur-b3de5398ddcabc76a6750e552346f5dbc5503dfe.tar.gz | |
upgpkg: cloudflared 2020.2.1-3
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | cloudflared.service | 2 | ||||
| -rw-r--r-- | config.yml (renamed from cloudflared.yml) | 0 |
4 files changed, 14 insertions, 11 deletions
@@ -1,21 +1,21 @@ pkgbase = cloudflared pkgdesc = Argo Tunnel client pkgver = 2020.2.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/cloudflare/cloudflared arch = x86_64 license = custom:cloudflared makedepends = go conflicts = cloudflared-bin - backup = etc/cloudflared/cloudflared.yml + backup = etc/cloudflared/config.yml source = cloudflared-2020.2.1.tar.gz::https://github.com/cloudflare/cloudflared/archive/2020.2.1.tar.gz - source = cloudflared.yml + source = config.yml source = cloudflared.service source = sysusers.d.conf source = tmpfiles.d.conf sha512sums = 79bafdeeed0d12eac93dab225a9c7628267e5b25b6968bbec19cde2c899b0b0205d71f757302a452240ab22c76e7166538032872eac2558f3bd7578057bdfff8 sha512sums = 52a8e1a71b7195047ea490ade1caae8f82c7c332d9473611853b6cc21c31eb4403a94b66e9efc800faa4a1d3c0d8b5ad01d60896728161eeb4bf2a69ac58b95a - sha512sums = 1ece7ff041d7f44f40f1f4e76bd16e4d9c97b08324fbdef930ec7c168c33ad4f47adfe4bfd15cd1067bf99449060fc286189108633299bf31445b913f91525c2 + sha512sums = 8ce1641505bb0daa68fb1bc7ea733c505a5424e663ceccd6e05900acf25428c6b05caa9ed1d7a1b2883e5bf6203ef890d4141c3cda56451482ebf0db6268ef1b sha512sums = 019e8bf95390d8f4815cf6118d419dba677967a22d9e68c245c71b32b198f188756e213ccada3f00b44a11b1486ef08780702ea0226086fc7e79e6c4466a26ae sha512sums = 6454925c07fd2ea737ac88d2275e5ca55debcdd675f47f7f2a640357591547b96631993cfb210bc31efe793536173b8d878e381fc18e7f6e80262cde81db0ab9 @@ -2,28 +2,31 @@ pkgname=cloudflared pkgver=2020.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Argo Tunnel client" arch=(x86_64) url=""https://github.com/cloudflare/cloudflared license=('custom:cloudflared') makedepends=(go) conflicts=(cloudflared-bin) -backup=("etc/$pkgname/$pkgname.yml") +backup=("etc/$pkgname/config.yml") source=("$pkgname-$pkgver.tar.gz::https://github.com/cloudflare/cloudflared/archive/$pkgver.tar.gz" - "$pkgname.yml" + "config.yml" "$pkgname.service" "sysusers.d.conf" "tmpfiles.d.conf") sha512sums=('79bafdeeed0d12eac93dab225a9c7628267e5b25b6968bbec19cde2c899b0b0205d71f757302a452240ab22c76e7166538032872eac2558f3bd7578057bdfff8' '52a8e1a71b7195047ea490ade1caae8f82c7c332d9473611853b6cc21c31eb4403a94b66e9efc800faa4a1d3c0d8b5ad01d60896728161eeb4bf2a69ac58b95a' - '1ece7ff041d7f44f40f1f4e76bd16e4d9c97b08324fbdef930ec7c168c33ad4f47adfe4bfd15cd1067bf99449060fc286189108633299bf31445b913f91525c2' + '8ce1641505bb0daa68fb1bc7ea733c505a5424e663ceccd6e05900acf25428c6b05caa9ed1d7a1b2883e5bf6203ef890d4141c3cda56451482ebf0db6268ef1b' '019e8bf95390d8f4815cf6118d419dba677967a22d9e68c245c71b32b198f188756e213ccada3f00b44a11b1486ef08780702ea0226086fc7e79e6c4466a26ae' '6454925c07fd2ea737ac88d2275e5ca55debcdd675f47f7f2a640357591547b96631993cfb210bc31efe793536173b8d878e381fc18e7f6e80262cde81db0ab9') prepare() { cd "$pkgname-$pkgver" - go mod vendor + # update mismatched vendor directory, which is fixed upstream + # go: inconsistent vendoring in /build/cloudflared/src/cloudflared-2020.2.1: + # github.com/gorilla/websocket@v1.4.0: is explicitly required in go.mod, but vendor/modules.txt indicates github.com/gorilla/websocket@v1.2.0 + go mod vendor } build() { @@ -50,7 +53,7 @@ package() { install -Dm644 tmpfiles.d.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" # config - install -Dm644 -t "$pkgdir/etc/$pkgname" "$pkgname.yml" + install -Dm644 -t "$pkgdir/etc/$pkgname" config.yml } # vim:set ts=2 sw=2 et: diff --git a/cloudflared.service b/cloudflared.service index 1fffabec1c71..f61ec943d2f0 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/cloudflared.yml --no-autoupdate +ExecStart=/usr/bin/cloudflared --no-autoupdate Restart=on-failure PrivateTmp=true ProtectSystem=full diff --git a/cloudflared.yml b/config.yml index 86a51a784b3d..86a51a784b3d 100644 --- a/cloudflared.yml +++ b/config.yml |