setup-apt-repo: Remove PPA and packagecloud repository.

We no longer use tsearch_extras, and the camo patch is irrelevant on
systemd systems (Xenial and newer).  So we no longer need to
provide/install a PPA at all.

Closes #13027.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>

docs/subsystems/dependencies.md

@@ -113,12 +113,6 @@ few places:
   install other dependencies, and (2) because that list is shared
   between development and production.
 
-We maintain a [PPA (personal package archive)][ppa] with some packages
-unique to Zulip (e.g the `tsearch_extras` postgres extension) and
-backported versions of other dependencies (e.g. `camo`, to fix a buggy
-`init` script).  Our goal is to shrink or eliminate this PPA where
-possible by getting issues addressed in the upstream distributions.
-
 We also rely on the `pgroonga` PPA for the `pgroonga` postgres
 extension, used by our [full-text search](full-text-search.html).
 
@@ -358,6 +352,5 @@ usually one needs to think about making changes in 3 places:
 [virtualenv-clone]: https://github.com/edwardgeorge/virtualenv-clone/
 [yarn]: https://yarnpkg.com/
 [npm]: https://npmjs.com/
-[ppa]: https://launchpad.net/~tabbott/+archive/ubuntu/zulip
 [iamcal]: https://github.com/iamcal/emoji-data
 [pygments]: http://pygments.org/

scripts/lib/setup-apt-repo

@@ -36,18 +36,7 @@ apt-get -y install "${pre_setup_deps[@]}"
 SCRIPTS_PATH="$(dirname "$(dirname "$0")")"
 
 release=$(lsb_release -sc)
-if [ "$release" = "xenial" ] || [ "$release" = "bionic" ]; then
-    apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc
-    apt-key add "$SCRIPTS_PATH"/setup/zulip-ppa.asc
-    cat >$SOURCES_FILE <<EOF
-deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
-deb http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
-deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
-deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
-EOF
-elif [ "$release" = "cosmic" ] || [ "$release" = "disco" ]; then
-    # This case will eventually merge with the above, if/when we add
-    # tsearch_extras packages to the Zulip PPA.
+if [ "$release" = "xenial" ] || [ "$release" = "bionic" ] || [ "$release" = "cosmic" ] || [ "$release" = "disco" ]; then
     apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc
     cat >$SOURCES_FILE <<EOF
 deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
@@ -55,10 +44,8 @@ deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
 EOF
 elif [ "$release" = "stretch" ] || [ "$release" = "buster" ]; then
     apt-get install -y debian-archive-keyring
-    apt-key add "$SCRIPTS_PATH"/setup/packagecloud.asc
     apt-key add "$SCRIPTS_PATH"/setup/pgroonga-debian.asc
     cat >$SOURCES_FILE <<EOF
-deb https://packagecloud.io/zulip/server/debian/ $release main
 deb https://packages.groonga.org/debian/ $release main
 deb-src https://packages.groonga.org/debian/ $release main
 EOF

scripts/setup/packagecloud.asc

@@ -1,64 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-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
-=gvzA
------END PGP PUBLIC KEY BLOCK-----

scripts/setup/zulip-ppa.asc

@@ -1,27 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: SKS 1.1.5
-Comment: Hostname: keyserver.ubuntu.com
-
-mQINBFYFDSEBEAC3VnqG3OCOjL3wQ41taBnmrRZoTW6kBBZXY7Ts3o4/vWvleW0QOxUP5u2n
-qZ5qKL4e63e46M/6iroCI0c/M72lv8atCn8gyrGL3lLGB+pvfBeDAhMUFWQ0Rwkm0vxBceGS
-FwusblXgiTo7oa1ShTBwLG59Ej2MeTGYQnS5DqoppJZonJ6DSOMKf7Qf4m/9uiYu7LVSYeHQ
-l89o/0CR1fQtRRwwkoHHLvpUV18ZYllJxEPjbkKVjoXJHylXrYxhuKs+H5iIDmaDpwgvuVnd
-+BnXXfylN7lbrDq7nMyx5tU1sSQwfKqyoWXxvIMSwUUWaNuc5Vkh0O0AMYh5YykcB1PEXmxy
-UUK9yOkvl5XIziBvZBSXRd4WLkYEE6+3Ipj2RqWCM9maHV5AgxrxJYv3VhzYRN1/WNGJ7bHD
-IV2/3qYUOSSFrG8JyHyf2+JllEkYKbLve+f7mOnDiCNn7AyUK0jEJh7ZavDg2wICIr8gJgqD
-YUBOCYQS4wWCBAJWYxAzn0yWSc0MbWTsm/3uAkmC//inF1T75s6buThphq3sQJU9SoXCyS8H
-qsc8fzVnBzTy6dM4mgDxucpQFiEOH/VR9aEf6RB+63HNfnkMc3cDlQCfqimifM/hd5TVZR2+
-XE5FNwNvEDNnrmau7zZvOMcVbUhbKCITv+TUiT/ihb39T0I/jQARAQABtBxMYXVuY2hwYWQg
-UFBBIGZvciBUaW0gQWJib3R0iQI4BBMBAgAiBQJWBQ0hAhsDBgsJCAcDAgYVCAIJCgsEFgID
-AQIeAQIXgAAKCRDoQkBHTiauR7iMEACFAA0+Ixxz5vRqJBF8IQt1LtnWJPqtPpab+SwBLHNx
-UdITDkuBilu1AzRvjl/lbo2nL4FpvQhhggB5KLDpM1sAiSpj5A3AMPEh3iFXOMzPi1igTyVv
-ZPo86NR1moMesIO3UmdIp6+w7le1SnOfpyjOCRUk/MjFm9tBCpF6Xcz19Cdm+0pKa8eW/Lvf
-aXboR0HP1lgiBiza97OxXtsv6olKhEOVF/QAGzZRKCN76hIYAw+Rjj1+PNLCWX3+Oa9Dq272
-g6ftdMSJym0E4Jzoic08zif0re9d4giFeoAV6T+COKAdUpxh5lr/LPTd/0DVJ1Q5SykvJ9C6
-1QqaRv2hBbQZKQ0SjyutfQeLkT0Ulb84qWRab5a4ip2p1F2ybT0Ka2k8wAbb4jI7TtqzlRix
-q5n7/O65JsWNEyhuUhM+QHacdD0aA3+NrKFDYN0dWtRu7ZkkjMDkt+345zyNy0nTUrsYYZ0O
-w19huWntqGwVpZK9xjAZNIC68HWoP0qJaDAuKiK0Pd/cc5zxS1Kuq165MT2flJwYkPJdhDGd
-sY37eu7hjSxvybjQKEV9TXyFR6C45MYnC+NUQAOB6Rno0GKSOmszgzPz5cdmPiV3QIQ9JXZ6
-Ij+kzTENAQJv1yl2/AINajY9mf0znT/j2YI0hEiM34wtM3Wda+wZtZrLPOdeqC/lrg==
-=t8gH
------END PGP PUBLIC KEY BLOCK-----

tools/lib/provision.py

@@ -99,8 +99,7 @@ else:
     logging.critical("Only x86 is supported;"
                      " ask on chat.zulip.org if you want another architecture.")
     # Note: It's probably actually not hard to add additional
-    # architectures; the main problem is that we may not have
-    # tsearch_extras binaries compiled (and some testing is required).
+    # architectures.
     sys.exit(1)
 
 # Ideally we wouldn't need to install a dependency here, before we

version.py

@@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea
 #   historical commits sharing the same major version, in which case a
 #   minor version bump suffices.
 
-PROVISION_VERSION = '52.0'
+PROVISION_VERSION = '53.0'