--- gplaycli-3.29+dfsg.orig/debian/.gitignore +++ gplaycli-3.29+dfsg/debian/.gitignore @@ -0,0 +1,2 @@ +gplaycli.debhelper.log +gplaycli/ --- gplaycli-3.29+dfsg.orig/debian/README.Debian +++ gplaycli-3.29+dfsg/debian/README.Debian @@ -0,0 +1,49 @@ +The default configuration for GPlayCLI allows you to search and download +(free) apks from the Google Play store without a Google account. + +In order to accomplish this, it queries a third party site that's running a +token generator. Once it gets that token, it can access Google. However, +Google sometimes changes their API or blacklists the token generator site, +breaking this process. Something has broken if you get a message such as: + + Multiple attempts to fetch anonymous token failed. + Try setting 'token=False' and adding Google credentials to gplaycli.conf + +If you're seeing this message, you can either wait (the breakage could be temporary; file a bug if it lasts more than a day), or do the following: + +1) Create a Google account if you don't already have one. + +2) Go to google.com in your browser. Sign in if you're not already signed in. + +3) Click on the account circle on the upper right hand side of the screen. +The pull-down will have your name and email address. Make a note of your +email address, as you will need it later. Then click on +"Manage your Google Account" below the email address. + +4) Click on "Security". + +5) Enable "2-Step Verification" if it's not already enabled. + +6) Once "2-Step Verification" is enabled, click on "App passwords". + +7) On the "Select app" pull-down, pick "Other (Custom name)" and fill in +a name (such as "gplaycli"). Then click the "GENERATE" button. + +8) A popup screen will say "Your app password for your device", with a +random string of 16 characters. + +9) Copy /etc/gplaycli/gplaycli.conf to your working directory, and open it +in your favorite editor. You could also edit the file in /etc/gplaycli, +but you'll want to modify ownership and permissions of the file so that +other users on the system can't see your credentials. + +10) Change "token=True" to "token=False". + +11) Where it says "gmail_address=", append the email address that you +noted in step 3. + +12) Where it says "gmail_password=", copy and paste the random 16 character +string from step 8. + +13) Save gplaycli.conf, and you should be good to go! + --- gplaycli-3.29+dfsg.orig/debian/changelog +++ gplaycli-3.29+dfsg/debian/changelog @@ -1,29 +1,48 @@ -gplaycli (3.29-1) unstable; urgency=medium +gplaycli (3.29+dfsg-3) unstable; urgency=low - * New upstream release. - * Use new way of authenticate on Google Play - * Fix lots of authentication errors - * Fix token dispenser errors + * Switch from python3-crypto to python3-pycryptodome (closes: #971317). - -- Matlink Mon, 7 Mar 2020 00:13:00 +0000 + -- Andres Salomon Fri, 01 Jan 2021 22:48:52 +0000 - gplaycli (3.28-1) unstable; urgency=low +gplaycli (3.29+dfsg-2) unstable; urgency=medium - * New upstream release. + * The latest python3-gpapi has important token auth fixes; tighten up + the versioned dep to ensure everyone's using it. - -- Matlink Mon, 23 Feb 2020 00:07:00 +0000 + -- Andres Salomon Mon, 20 Apr 2020 03:33:25 +0000 -gplaycli (3.27-1) unstable; urgency=low +gplaycli (3.29+dfsg-1) unstable; urgency=medium * New upstream release. + * Remove /etc/gplaycli/cronjob during the upgrade (closes: #952532). + * Delete 0001-conf-install-path.patch and fix gplaycli.conf installation + with PYBUILD_INSTALL_ARGS. + * New version fixes gateway issues and provides instructions in a + README.Debian in case the token dispenser goes down (closes: #950112). + + -- Andres Salomon Thu, 02 Apr 2020 23:32:06 +0000 + +gplaycli (3.27+dfsg-1) unstable; urgency=medium + + * New upstream release (closes: #950114, #950116). + * Bump versioned build-dep on gpapi. + * Drop workarounds needed for cron script, which upstream removed. + * Upstream's token dispenser no longer works, so upstream's default + conf file assumes you're supplying a username & password. Backport + a fix from upstream reminding users to add those credentials to + the config file. - -- Matlink Mon, 10 Feb 2020 10:00:00 +0000 + -- Andres Salomon Tue, 18 Feb 2020 06:26:38 +0000 -gplaycli (3.26-1) unstable; urgency=low +gplaycli (3.26+dfsg-1) unstable; urgency=low * New upstream release. + * Rename package from +ds to +dfsg, and simplify debian/rules and + debian/watch with newer uscan features. + * Bump debhelper compat version and versioned dep. + * Bump standards-version. - -- Matlink Mon, 09 Sep 2019 10:00:00 +0000 + -- Andres Salomon Wed, 13 Nov 2019 17:13:40 +0000 gplaycli (3.25+ds-1) unstable; urgency=low --- gplaycli-3.29+dfsg.orig/debian/compat +++ gplaycli-3.29+dfsg/debian/compat @@ -1 +1 @@ -9 +12 --- gplaycli-3.29+dfsg.orig/debian/control +++ gplaycli-3.29+dfsg/debian/control @@ -3,20 +3,20 @@ Priority: optional Maintainer: Matlink Uploaders: Andres Salomon -Build-Depends: debhelper (>= 9.0~), +Build-Depends: debhelper (>= 12.0~), dh-python, python3, python3-setuptools, python3-pyaxmlparser, - python3-matlink-gpapi (>= 0.4.4.4) -Standards-Version: 4.1.0 + python3-gpapi (>= 0.4.4+git20200310-2) +Standards-Version: 4.4.1.1 Homepage: https://github.com/matlink/gplaycli Package: gplaycli Architecture: all Depends: ${python3:Depends}, ${misc:Depends}, - python3-crypto + python3-pycryptodome Recommends: fdroidserver, dummydroid Description: Google Play downloader command line interface GPlayCli is a command line tool to search, install, update Android --- gplaycli-3.29+dfsg.orig/debian/copyright +++ gplaycli-3.29+dfsg/debian/copyright @@ -2,6 +2,7 @@ Upstream-Name: gplaycli Upstream-Contact: Matlink (Matlink - Sysadmin matlink.fr) Source: https://github.com/matlink/gplaycli +Files-Excluded: tests/*.apk Files: * Copyright: 2015-2020, Matlink --- gplaycli-3.29+dfsg.orig/debian/maintscript +++ gplaycli-3.29+dfsg/debian/maintscript @@ -0,0 +1,2 @@ +mv_conffile /etc/gplaycli/credentials.conf /etc/gplaycli/gplaycli.conf +rm_conffile /etc/gplaycli/cronjob 3.29+dfsg-1~ --- gplaycli-3.29+dfsg.orig/debian/rules +++ gplaycli-3.29+dfsg/debian/rules @@ -2,24 +2,14 @@ include /usr/share/dpkg/default.mk +export PYBUILD_INSTALL_ARGS=--install-data=. + %: dh $@ --with python3 --buildsystem=pybuild -override_dh_auto_install: - dh_auto_install - override_dh_clean: dh_clean - rm -rf GPlayCli.egg-info/ + rm -rf gplaycli.egg-info/ -COMMIT_TO_DOWNLOAD = 0.2.10 -newtarball = new$(COMMIT_TO_DOWNLOAD).tar.gz get-orig-source: - wget --continue -O $(newtarball) \ - https://github.com/matlink/gplaycli/archive/$(COMMIT_TO_DOWNLOAD).tar.gz - mk-origtargz \ - --rename \ - --repack \ - --exclude-file debian \ - --exclude-file ext_libs/androguard \ - $(newtarball) + uscan --force-download --repack --verbose --- gplaycli-3.29+dfsg.orig/debian/source/format +++ gplaycli-3.29+dfsg/debian/source/format @@ -0,0 +1 @@ +1.0 --- gplaycli-3.29+dfsg.orig/debian/upstream/signing-key.asc +++ gplaycli-3.29+dfsg/debian/upstream/signing-key.asc @@ -0,0 +1,176 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 +Comment: GPG for Android - https://guardianproject.info/code/gnupg/ + +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 +7wqAXdAbZggPJQeadrJMQWx7ZWoEa61bF+4CmlIuE7KqM84d90T4S9cgyKDbYv7O +r+duXMzakIgFmwhsmK5zCUlngenSQlUMxOvpB9QkC5ygPhRSCTu74576zd8agpta +JnBdFyn64UOCVfMfNYznv79JSR37jF7HKz12N/G1Fi0pfsEdgtal5qf8T5/5Uoso ++YJExqn8xc+voPQnTiOOKD3MvPjy7pi2vDvrn087U/EHE9fKKWOoFhuNH2pi8eH1 +bdFB7MF36GOrmYCTfyMR9yLb+fOCL+i5YBWXDqvBuft3tdxcwXiZZaHkVqZyLOmo +PodsYkAVAAAIgREVrAlqLk5tdJC6JN+TZ4S3faLn1nTQnGIXrIAO4rHm1IvcdrwD +FxI5yFySilFuYaZXrUdywzKZ23tbUElT/695o0tk1MzP5TokN1Q6a7WMoM6Uw+uU +ivk8BY0O1//vNI7ke1p//ac/LhAqWksFt7pzHNJaTdcVNG5XgjA/8BjBXjVJjH2D +3nseQTvtK6kIqoFdT+/1DVnxvM9tbHm9/uuJdnRgu7TBXIOcrkQxMMk73xdV6JI7 +frfLix6sZLVJW620IXJvb3RAbWF0bGluay5mciA8cm9vdEBtYXRsaW5rLmZyPokC +OAQTAQIAIgIbIwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlS9VXEACgkQghlY +Mxhrs8qtew//bU0uUxDlVYl9U7WPfCCsVeOXybXN1DcwUgHNNm9yNCqyAcIfJq3x +GFBPnXVZ3mhlcDZR292Id8IgrT2PzXISsfZ4AAzyDNh3HQiN5MWF0nwxn/3GEZ/R +XXlYkQWBtbg79DUKgcVoKLdC6rY69G7jHw7K1VD1LQL4S18tISyCe7E73WaudMnG +ih1fkcJuKYuTMMn19epvWx6Goizj29N/lpJzwI+nTd2Fc7g+wzy4jRyuIQmd3hnn +iG5n1xTGOhOuJvcL196K7+a+HDOjeIusix6tF1zNI3xKSU4+DvExIFZ/GJjIJ0Yt +0i+5A4PWpUOa1tMJYbRh2stfw/mlvtLiiKJCc5gBRXcnffkm5/9XvItnacjYpsNo +y+UWad+N3X6clkxYKXTgTyo3Z2YXVfNv4ouh3fQlHniTGdBwImM2+Sjra47jKA4e +EZW6KyaeNW8mo36y3KcaM4otnKQZaQ81+GaQ/jRQEc+cCk0snjxTiJrIKw9J6PM6 +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 +=VDm/ +-----END PGP PUBLIC KEY BLOCK----- --- gplaycli-3.29+dfsg.orig/debian/watch +++ gplaycli-3.29+dfsg/debian/watch @@ -1,3 +1,4 @@ -version=3 -opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/,dversionmangle=s/\.ds// \ -https://pypi.debian.net/GPlayCli/GPlayCli-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +version=4 +opts="dversionmangle=auto, repacksuffix=+dfsg" \ + https://github.com/matlink/gplaycli/releases \ + .*/(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) --- gplaycli-3.29+dfsg.orig/gplaycli/gplaycli.py +++ gplaycli-3.29+dfsg/gplaycli/gplaycli.py @@ -93,6 +93,7 @@ self.api = None self.token_passed = False + self.token_attempts = 0 config = configparser.ConfigParser() @@ -343,7 +344,7 @@ """ try: results = self.api.search(search_string) - except IndexError: + except (IndexError, RequestError): results = [] if not results: logger.info("No result") @@ -424,11 +425,17 @@ else: logger.info("Using auto retrieved token to connect to API") try: + self.token_attempts += 1 self.api.login(authSubToken=self.token, gsfId=int(self.gsfid, 16)) except (ValueError, IndexError, LoginError, DecodeError, SystemError, RequestError): - logger.info("Token has expired or is invalid. Retrieving a new one...") - self.retrieve_token(force_new=True) - self.connect() + if self.token_attempts < 5: + logger.info("Token has expired or is invalid. Retrieving a new one...") + self.retrieve_token(force_new=True) + self.connect() + else: + logger.error("Multiple attempts to fetch anonymous token failed.") + logger.error("Try setting 'token=False' and adding Google credentials to gplaycli.conf") + return True, None def connect_credentials(self): --- gplaycli-3.29+dfsg.orig/setup.py +++ gplaycli-3.29+dfsg/setup.py @@ -29,7 +29,7 @@ ['etc/gplaycli', ['gplaycli.conf']], ], install_requires=[ - 'matlink-gpapi>=0.4.4.4', + 'gpapi>=0.4.4+git', 'pyaxmlparser', ], )