Updated to 69.4.102

6 files changed, 45 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70b4c40020c8..6a7a27de8425 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu Apr  4 14:40:31 UTC 2019
 pkgbase = dropbox
 	pkgdesc = A free service that lets you bring your photos, docs, and videos anywhere and share them easily.
-	pkgver = 68.4.102
-	pkgrel = 2
+	pkgver = 69.4.102
+	pkgrel = 1
 	url = https://www.dropbox.com
 	arch = i686
 	arch = x86_64
@@ -21,22 +23,21 @@ pkgbase = dropbox
 	optdepends = xdg-utils: for "Launch Dropbox Website" and file manager integration
 	optdepends = libappindicator-gtk3: make tray icons themed under some desktop environments like KDE plasma
 	options = !strip
-	source = DropboxGlyph_Blue.svg
+	source = DropboxGlyph_Blue.svg::https://uc3135348e74c66f0669fcde8300.dl.dropboxusercontent.com/cd/0/get/AeYRisQv-6SKLfc95CgynP5ZP_DyMV9YC331Th6iimSA9YFsQiTzZl3lg_osmwitILJ5H9MPDlgVpfI0O2CzvZUEGcJdyA7jfEiX6cckYH7W4Q/file?_download_id=385426155243517642556452976793408572138269034287425082593540433136&_notify_domain=www.dropbox.com&dl=1
 	source = terms.txt
 	source = dropbox.service
 	source = dropbox@.service
-	validpgpkeys = 1C61A2656FB57B7E4DE0F4C1FC918B335044912E
 	sha256sums = 9ba76205ec5838db85d822f23cfd7e2112fd2757e8031d8374709f102143c548
 	sha256sums = 34605b2f36fe6b4bde9b858da3f73ac1505986af57be78bbb1c2c9cf1a611578
 	sha256sums = 6c67a9c8c95c08fafafd2f1d828074b13e3347b05d2e4f4bf4e62746115d7477
 	sha256sums = 98581e65a91ae1f19ed42edcdaaa52e102298b5da0d71b50089393d364474d3d
-	source_i686 = https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-68.4.102.tar.gz
-	source_i686 = https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-68.4.102.tar.gz.asc
-	sha256sums_i686 = de0198b609005794f5b274ef773a40d67f91acedda282bb2f9e8ed957a90838d
+	source_i686 = https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-69.4.102.tar.gz
+	source_i686 = https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-69.4.102.tar.gz.asc
+	sha256sums_i686 = ebab4471d9379309c3d5c1269e4e837ddebded0d85ed17c072ce445098db8835
 	sha256sums_i686 = SKIP
-	source_x86_64 = https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-68.4.102.tar.gz
-	source_x86_64 = https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-68.4.102.tar.gz.asc
-	sha256sums_x86_64 = 9ec145cb9341a3ef5c2c076b3b350a14e021f8e95e3b86c1bfe7b35d7cefaa32
+	source_x86_64 = https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-69.4.102.tar.gz
+	source_x86_64 = https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-69.4.102.tar.gz.asc
+	sha256sums_x86_64 = ce7130b0c5d4015fa1b5db309215eb96389f988b3c86f32f6020ff1e9ee108e2
 	sha256sums_x86_64 = SKIP
 
 pkgname = dropbox
diff --git a/DropboxGlyph_Blue.svg b/DropboxGlyph_Blue.svg
deleted file mode 100644
index 8c46b7f7abde..000000000000
--- a/DropboxGlyph_Blue.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 235.45 200"><defs><style>.cls-1{fill:#0061ff;}</style></defs><title>DropboxGlyph</title><polygon class="cls-1" points="58.86 0 0 37.5 58.86 75 117.73 37.5 58.86 0"/><polygon class="cls-1" points="176.59 0 117.73 37.5 176.59 75 235.45 37.5 176.59 0"/><polygon class="cls-1" points="0 112.5 58.86 150 117.73 112.5 58.86 75 0 112.5"/><polygon class="cls-1" points="176.59 75 117.73 112.5 176.59 150 235.45 112.5 176.59 75"/><polygon class="cls-1" points="58.86 162.5 117.73 200 176.59 162.5 117.73 125 58.86 162.5"/></svg>
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index c17c978dfbc3..9a8e8c4ad5f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Chih-Hsuan Yen <yan12125@gmail.com>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Chih-Hsuan Yen <yan12125@gmail.com>
 # Contributor: Tom < tomgparchaur at gmail dot com >
 # Contributor: David Manouchehri <d@32t.ca>
 
 pkgname=dropbox
-pkgver=68.4.102
-pkgrel=2
+pkgver=69.4.102
+pkgrel=1
 pkgdesc="A free service that lets you bring your photos, docs, and videos anywhere and share them easily."
 arch=("i686" "x86_64")
 url="https://www.dropbox.com"
@@ -13,17 +13,18 @@ license=(custom)
 depends=("libsm" "libxslt" "libxmu" "libxdamage" "libxrender" "libxxf86vm" "libxcomposite" "fontconfig" "dbus")
 makedepends=("gendesk")
 optdepends=(
-    'ufw-extras: ufw rules for dropbox'
-    'perl-file-mimeinfo: opening dropbox folder on some desktop environments'
-    'xdg-utils: for "Launch Dropbox Website" and file manager integration'
-    'libappindicator-gtk3: make tray icons themed under some desktop environments like KDE plasma'
+  'ufw-extras: ufw rules for dropbox'
+  'perl-file-mimeinfo: opening dropbox folder on some desktop environments'
+  'xdg-utils: for "Launch Dropbox Website" and file manager integration'
+  'libappindicator-gtk3: make tray icons themed under some desktop environments like KDE plasma'
 )
 options=('!strip')
 
-# DropboxGlyph_Blue.svg is downloaded from https://www.dropbox.com/scl/fo/0eu2dsn07fy5k0gt5fy74/AABelaoobzsW8ZKJ2u9vnINGa/Glyph/Dropbox/SVG,
-# and this folder is retrieved from https://www.dropbox.com/branding
-# TODO: find a way to download the icon directly from dropbox.com
-source=("DropboxGlyph_Blue.svg" "terms.txt" "dropbox.service" "dropbox@.service")
+# https://www.dropbox.com/scl/fo/0eu2dsn07fy5k0gt5fy74/AABbXqKHbY_mobVJhqgfOXYja/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+source=("DropboxGlyph_Blue.svg::https://uc3135348e74c66f0669fcde8300.dl.dropboxusercontent.com/cd/0/get/AeYRisQv-6SKLfc95CgynP5ZP_DyMV9YC331Th6iimSA9YFsQiTzZl3lg_osmwitILJ5H9MPDlgVpfI0O2CzvZUEGcJdyA7jfEiX6cckYH7W4Q/file?_download_id=385426155243517642556452976793408572138269034287425082593540433136&_notify_domain=www.dropbox.com&dl=1"
+        "terms.txt"
+        "dropbox.service"
+        "dropbox@.service")
 source_i686=("https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-$pkgver.tar.gz"{,.asc})
 source_x86_64=("https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-$pkgver.tar.gz"{,.asc})
 
@@ -31,9 +32,9 @@ sha256sums=('9ba76205ec5838db85d822f23cfd7e2112fd2757e8031d8374709f102143c548'
             '34605b2f36fe6b4bde9b858da3f73ac1505986af57be78bbb1c2c9cf1a611578'
             '6c67a9c8c95c08fafafd2f1d828074b13e3347b05d2e4f4bf4e62746115d7477'
             '98581e65a91ae1f19ed42edcdaaa52e102298b5da0d71b50089393d364474d3d')
-sha256sums_i686=('de0198b609005794f5b274ef773a40d67f91acedda282bb2f9e8ed957a90838d'
+sha256sums_i686=('ebab4471d9379309c3d5c1269e4e837ddebded0d85ed17c072ce445098db8835'
                  'SKIP')
-sha256sums_x86_64=('9ec145cb9341a3ef5c2c076b3b350a14e021f8e95e3b86c1bfe7b35d7cefaa32'
+sha256sums_x86_64=('ce7130b0c5d4015fa1b5db309215eb96389f988b3c86f32f6020ff1e9ee108e2'
                    'SKIP')
 # The PGP key fingerprint should match the one on https://www.dropbox.com/help/desktop-web/linux-commands
 validpgpkeys=(
@@ -45,21 +46,21 @@ prepare() {
 }
 
 package() {
-	if [ "$CARCH" = "x86_64" ]; then
-		_source_arch="x86_64"
-	else
-		_source_arch="x86"
-	fi
+  if [ "$CARCH" = "x86_64" ]; then
+    _source_arch="x86_64"
+  else
+    _source_arch="x86"
+  fi
 
-	install -d "$pkgdir"/opt
-	cp -dr --no-preserve=ownership "$srcdir"/.dropbox-dist/dropbox-lnx.$_source_arch-$pkgver "$pkgdir"/opt/dropbox
+  install -d "$pkgdir"/opt
+  cp -dr --no-preserve=ownership "$srcdir"/.dropbox-dist/dropbox-lnx.$_source_arch-$pkgver "$pkgdir"/opt/dropbox
 
-	install -d "$pkgdir"/usr/bin
-	ln -s ../../opt/dropbox/dropbox "$pkgdir"/usr/bin/dropbox
+  install -d "$pkgdir"/usr/bin
+  ln -s ../../opt/dropbox/dropbox "$pkgdir"/usr/bin/dropbox
 
-	install -Dm644 "$srcdir"/dropbox.desktop -t "$pkgdir"/usr/share/applications
-	install -Dm644 "$srcdir"/DropboxGlyph_Blue.svg "$pkgdir"/usr/share/pixmaps/dropbox.svg
-	install -Dm644 "$srcdir"/terms.txt -t "$pkgdir"/usr/share/licenses/$pkgname
-	install -Dm644 "$srcdir"/dropbox.service -t "$pkgdir"/usr/lib/systemd/user
-	install -Dm644 "$srcdir"/dropbox@.service -t "$pkgdir"/usr/lib/systemd/system
+  install -Dm644 "$srcdir"/dropbox.desktop -t "$pkgdir"/usr/share/applications
+  install -Dm644 "$srcdir"/DropboxGlyph_Blue.svg "$pkgdir"/usr/share/pixmaps/dropbox.svg
+  install -Dm644 "$srcdir"/terms.txt -t "$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 "$srcdir"/dropbox.service -t "$pkgdir"/usr/lib/systemd/user
+  install -Dm644 "$srcdir"/dropbox@.service -t "$pkgdir"/usr/lib/systemd/system
 }
diff --git a/check_ver.py b/check_ver.py
deleted file mode 100755
index 7381107a904f..000000000000
--- a/check_ver.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python3
-import re
-import sys
-
-import requests
-import requests_toolbelt.utils.dump
-
-resp = requests.get(
-    'https://www.dropbox.com/download?plat=lnx.x86_64', allow_redirects=False)
-raw_resp = requests_toolbelt.utils.dump.dump_all(resp).decode('ascii')
-print(raw_resp, file=sys.stderr)
-print(re.search(r'(\d+\.4\.\d+)\.tar\.gz', resp.headers['Location']).group(1))
diff --git a/namcap-dropbox.patch b/namcap-dropbox.patch
deleted file mode 100644
index 7c58525c2626..000000000000
--- a/namcap-dropbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Namcap/rules/rpath.py b/Namcap/rules/rpath.py
-index 4da040c..504d77c 100644
---- a/Namcap/rules/rpath.py
-+++ b/Namcap/rules/rpath.py
-@@ -39,6 +39,7 @@ def get_rpaths(fileobj):
- 			rpaths = rpaths.split(':')
- 			for path in rpaths:
- 				yield path
-+	yield '/opt/dropbox'
- 
- class package(TarballRule):
- 	name = "rpath"
diff --git a/update.sh b/update.sh
new file mode 100755
index 000000000000..9a38305341f7
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+pkgver=$(curl -I "https://www.dropbox.com/download?plat=lnx.x86_64" | grep -iP '^Location:' | grep -Po '\d+\.4\.\d+(?=\.tar\.gz)')
+sed "s/^pkgver=.*/pkgver=$pkgver/" -i PKGBUILD
+updpkgsums