Revert "Merge branch 'master' into libressl"

This reverts commit 11a05be4ac3bb1271762b1de1336124e7f7883e9, reversing
changes made to 83e38c53034aa640d582fa9598a34d4e33b031a4.

34 files changed, 33 insertions, 42 deletions

diff --git a/extra/ccache/checksums b/extra/ccache/checksums
index 2287edfb..03c4feb6 100644
--- a/extra/ccache/checksums
+++ b/extra/ccache/checksums
@@ -1 +1 @@
-9d6ba1cdefdc690401f404b747d81a9a1802b17af4235815866b7620d980477e  ccache-4.2.1.tar.xz
+2f14b11888c39778c93814fc6843fc25ad60ff6ba4eeee3dff29a1bad67ba94f  ccache-4.2.tar.xz
diff --git a/extra/ccache/sources b/extra/ccache/sources
index bd6c252e..12557478 100644
--- a/extra/ccache/sources
+++ b/extra/ccache/sources
@@ -1 +1 @@
-https://github.com/ccache/ccache/releases/download/v4.2.1/ccache-4.2.1.tar.xz
+https://github.com/ccache/ccache/releases/download/v4.2/ccache-4.2.tar.xz
diff --git a/extra/ccache/version b/extra/ccache/version
index 6b405ab7..39a6e920 100644
--- a/extra/ccache/version
+++ b/extra/ccache/version
@@ -1 +1 @@
-4.2.1 1
+4.2 1
diff --git a/extra/file/checksums b/extra/file/checksums
index 2fc253f1..45c47391 100644
--- a/extra/file/checksums
+++ b/extra/file/checksums
@@ -1 +1 @@
-167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57  file-5.40.tar.gz
+f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1  file-5.39.tar.gz
diff --git a/extra/file/sources b/extra/file/sources
index ea998011..1f2ea15d 100644
--- a/extra/file/sources
+++ b/extra/file/sources
@@ -1 +1 @@
-http://astron.com/pub/file/file-5.40.tar.gz
+https://fossies.org/linux/misc/file-5.39.tar.gz
diff --git a/extra/file/version b/extra/file/version
index cc2c3dc0..04d2b1de 100644
--- a/extra/file/version
+++ b/extra/file/version
@@ -1 +1 @@
-5.40 1
+5.39 1
diff --git a/extra/gcr/checksums b/extra/gcr/checksums
index 60e04d35..707c43e8 100644
--- a/extra/gcr/checksums
+++ b/extra/gcr/checksums
@@ -1 +1 @@
-b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5  gcr-3.40.0.tar.xz
+17fcaf9c4a93a65fb1c72b82643bb102c13344084687d5886ea66313868d9ec9  gcr-3.38.1.tar.xz
diff --git a/extra/gcr/sources b/extra/gcr/sources
index 6f6c88cb..650f4be7 100644
--- a/extra/gcr/sources
+++ b/extra/gcr/sources
@@ -1 +1 @@
-https://download.gnome.org/sources/gcr/3.40/gcr-3.40.0.tar.xz
+http://ftp.gnome.org/pub/gnome/sources/gcr/3.38/gcr-3.38.1.tar.xz
diff --git a/extra/gcr/version b/extra/gcr/version
index d3da22db..556663a6 100644
--- a/extra/gcr/version
+++ b/extra/gcr/version
@@ -1 +1 @@
-3.40.0 1
+3.38.1 1
diff --git a/extra/gtk+3/checksums b/extra/gtk+3/checksums
index 926b847b..dedc4afe 100644
--- a/extra/gtk+3/checksums
+++ b/extra/gtk+3/checksums
@@ -1 +1 @@
-b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6  gtk+-3.24.28.tar.xz
+f71c067570339f9f8efac7bb87717a2c52279cb50223fb8b5ba7085930757a26  gtk+-3.24.27.tar.xz
diff --git a/extra/gtk+3/sources b/extra/gtk+3/sources
index c38dabb0..baedf670 100644
--- a/extra/gtk+3/sources
+++ b/extra/gtk+3/sources
@@ -1 +1 @@
-https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.28.tar.xz
+https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.27.tar.xz
diff --git a/extra/gtk+3/version b/extra/gtk+3/version
index 8fb9faa6..2a7cb903 100644
--- a/extra/gtk+3/version
+++ b/extra/gtk+3/version
@@ -1 +1 @@
-3.24.28 1
+3.24.27 1
diff --git a/extra/gtk4/checksums b/extra/gtk4/checksums
index 0450c0d9..482c0471 100644
--- a/extra/gtk4/checksums
+++ b/extra/gtk4/checksums
@@ -1 +1 @@
-e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072  gtk-4.2.0.tar.xz
+d7c9893725790b50bd9a3bb278856d9d543b44b6b9b951d7b60e7bdecc131890  gtk-4.0.3.tar.xz
diff --git a/extra/gtk4/sources b/extra/gtk4/sources
index d4b7af61..28d9dcd5 100644
--- a/extra/gtk4/sources
+++ b/extra/gtk4/sources
@@ -1 +1 @@
-https://download.gnome.org/sources/gtk/4.2/gtk-4.2.0.tar.xz
+https://download.gnome.org/sources/gtk/4.0/gtk-4.0.3.tar.xz
diff --git a/extra/gtk4/version b/extra/gtk4/version
index 0cdd4873..b585b2fe 100644
--- a/extra/gtk4/version
+++ b/extra/gtk4/version
@@ -1 +1 @@
-4.2.0 1
+4.0.3 1
diff --git a/extra/imagemagick/checksums b/extra/imagemagick/checksums
index 7395eb6d..187d0a62 100644
--- a/extra/imagemagick/checksums
+++ b/extra/imagemagick/checksums
@@ -1 +1 @@
-9d2f65d6ee86a7c2a09c451b6d2635e44da3bc4ed3aa03241e011d04537eadf8  ImageMagick-7.0.11-5.tar.xz
+9ac056692065ddf485d85bf6698d3eef5aa29e76d353ae721e1e5b80ffaa9dc4  ImageMagick-7.0.11-4.tar.xz
diff --git a/extra/imagemagick/sources b/extra/imagemagick/sources
index a30df72f..b257667a 100644
--- a/extra/imagemagick/sources
+++ b/extra/imagemagick/sources
@@ -1 +1 @@
-https://imagemagick.org/download/releases/ImageMagick-7.0.11-5.tar.xz
+https://imagemagick.org/download/releases/ImageMagick-7.0.11-4.tar.xz
diff --git a/extra/imagemagick/version b/extra/imagemagick/version
index c5e7b25e..295927a3 100644
--- a/extra/imagemagick/version
+++ b/extra/imagemagick/version
@@ -1 +1 @@
-7.0.11-5 1
+7.0.11-4 1
diff --git a/extra/mesa/build b/extra/mesa/build
index e640260e..9d8984da 100755
--- a/extra/mesa/build
+++ b/extra/mesa/build
@@ -29,14 +29,6 @@ python3 bin/git_sha1_gen.py --output include/git_sha1.h
 platforms=x11
 cpt l wayland-protocols >/dev/null 2>&1 && platforms=$platforms,wayland
 
-# Fix broken radeon object links
-(
-    cd src/mesa/drivers/dri/r200
-    find . -type l | while read -r link; do
-        ln -sf "$PWD/../radeon/$link" "$link"
-    done
-)
-
 meson \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -44,7 +36,6 @@ meson \
     --localstatedir=/var \
     --buildtype=release \
     -Dplatforms="$platforms" \
-    -Dzstd=false \
     . output
 
 ninja -C output
diff --git a/extra/mesa/checksums b/extra/mesa/checksums
index d9a5158f..ebfd6ca7 100644
--- a/extra/mesa/checksums
+++ b/extra/mesa/checksums
@@ -1,2 +1,2 @@
-abe673eb92c62156f708ced5a9607573ba524eca2b6609d5fc16698ba5a09ed7  mesa-21.0.1.tar.gz
+9c899b165497ccf816042a271ec9931d548c0a7734fb08e9945f0e9c31188b15  mesa-20.3.4.tar.gz
 2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4  Mako-1.1.1.tar.gz
diff --git a/extra/mesa/sources b/extra/mesa/sources
index f8b2041f..c5d4df2f 100644
--- a/extra/mesa/sources
+++ b/extra/mesa/sources
@@ -1,2 +1,2 @@
-https://github.com/mesa3d/mesa/archive/mesa-21.0.1.tar.gz
+https://github.com/mesa3d/mesa/archive/mesa-20.3.4.tar.gz
 https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako
diff --git a/extra/mesa/version b/extra/mesa/version
index 8ffdbf95..971bebb1 100644
--- a/extra/mesa/version
+++ b/extra/mesa/version
@@ -1 +1 @@
-21.0.1 1
+20.3.4 1
diff --git a/extra/nodejs/checksums b/extra/nodejs/checksums
index 93023627..1948ce99 100644
--- a/extra/nodejs/checksums
+++ b/extra/nodejs/checksums
@@ -1 +1 @@
-95670646bb3a21d40ef7583dac42a09daf63d38ac7ea3bce099f0ee48d278f55  v15.13.0.tar.gz
+5ebbbe5024787a45134c4fbd77f50ae494c9cd49c87ce2c9f327af77d8af1a31  node-v15.12.0.tar.xz
diff --git a/extra/nodejs/sources b/extra/nodejs/sources
index 0a4da9b7..086d5c7a 100644
--- a/extra/nodejs/sources
+++ b/extra/nodejs/sources
@@ -1 +1 @@
-https://github.com/nodejs/node/archive/v15.13.0.tar.gz
+https://nodejs.org/download/release/latest-v15.x/node-v15.12.0.tar.xz
diff --git a/extra/nodejs/version b/extra/nodejs/version
index af7953de..b5a67278 100644
--- a/extra/nodejs/version
+++ b/extra/nodejs/version
@@ -1 +1 @@
-15.13.0 1
+15.12.0 1
diff --git a/extra/pango/checksums b/extra/pango/checksums
index bb822595..bbd38996 100644
--- a/extra/pango/checksums
+++ b/extra/pango/checksums
@@ -1 +1 @@
-418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a  pango-1.48.4.tar.xz
+36ea145c82217c8efc954d02aa577391b1d9a5da205e0aef7ffe0461349b4b46  pango-1.48.3.tar.xz
diff --git a/extra/pango/sources b/extra/pango/sources
index 9147591e..ea78b9e9 100644
--- a/extra/pango/sources
+++ b/extra/pango/sources
@@ -1 +1 @@
-https://download.gnome.org/sources/pango/1.48/pango-1.48.4.tar.xz
+https://download.gnome.org/sources/pango/1.48/pango-1.48.3.tar.xz
diff --git a/extra/pango/version b/extra/pango/version
index 4687f78c..a0aff0b8 100644
--- a/extra/pango/version
+++ b/extra/pango/version
@@ -1 +1 @@
-1.48.4 1
+1.48.3 1
diff --git a/extra/sqlite/checksums b/extra/sqlite/checksums
index 33846fed..7b4f435e 100644
--- a/extra/sqlite/checksums
+++ b/extra/sqlite/checksums
@@ -1 +1 @@
-ecbccdd440bdf32c0e1bb3611d635239e3b5af268248d130d0445a32daf0274b  sqlite-autoconf-3350300.tar.gz
+1269ed81f41f9015223fbd7285b2db12685fd9c1ab1fbe43e6cc1b00cafeccad  sqlite-autoconf-3350200.tar.gz
diff --git a/extra/sqlite/sources b/extra/sqlite/sources
index 953d38a6..730a81f2 100644
--- a/extra/sqlite/sources
+++ b/extra/sqlite/sources
@@ -1 +1 @@
-https://sqlite.org/2021/sqlite-autoconf-3350300.tar.gz
+https://sqlite.org/2021/sqlite-autoconf-3350200.tar.gz
diff --git a/extra/sqlite/version b/extra/sqlite/version
index dab75b33..66b67d0e 100644
--- a/extra/sqlite/version
+++ b/extra/sqlite/version
@@ -1 +1 @@
-3.35.3 1
+3.35.2 1
diff --git a/extra/squashfs-tools-ng/checksums b/extra/squashfs-tools-ng/checksums
index 13c22ab8..95334f60 100644
--- a/extra/squashfs-tools-ng/checksums
+++ b/extra/squashfs-tools-ng/checksums
@@ -1 +1 @@
-01f02a4dbc32a0016c57c7a214b9bed8659768fcb2213886b0dfc55d114cb653  v1.1.0.tar.gz
+addcd60f94971b7f7d7f65a973efa19714d273515a4f4bfc90138b0db0a4c9e9  v1.0.4.tar.gz
diff --git a/extra/squashfs-tools-ng/sources b/extra/squashfs-tools-ng/sources
index d73b6bd8..f274f32b 100644
--- a/extra/squashfs-tools-ng/sources
+++ b/extra/squashfs-tools-ng/sources
@@ -1 +1 @@
-https://github.com/AgentD/squashfs-tools-ng/archive/v1.1.0.tar.gz
+https://github.com/AgentD/squashfs-tools-ng/archive/v1.0.4.tar.gz
diff --git a/extra/squashfs-tools-ng/version b/extra/squashfs-tools-ng/version
index 7281bb52..b4b1ce2a 100644
--- a/extra/squashfs-tools-ng/version
+++ b/extra/squashfs-tools-ng/version
@@ -1 +1 @@
-1.1.0 1
+1.0.4 1