Merge branch 'master' into libressl

69 files changed, 117 insertions, 59 deletions

diff --git a/extra/cmake/checksums b/extra/cmake/checksums
index 39edfbf5..ab4c5901 100644
--- a/extra/cmake/checksums
+++ b/extra/cmake/checksums
@@ -1 +1 @@
-58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e  cmake-3.19.7.tar.gz
+9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755  cmake-3.20.0.tar.gz
diff --git a/extra/cmake/sources b/extra/cmake/sources
index 9f287edc..4676d5f0 100644
--- a/extra/cmake/sources
+++ b/extra/cmake/sources
@@ -1 +1 @@
-https://github.com/Kitware/CMake/releases/download/v3.19.7/cmake-3.19.7.tar.gz
+https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0.tar.gz
diff --git a/extra/cmake/version b/extra/cmake/version
index cebb2192..d9a98f5b 100644
--- a/extra/cmake/version
+++ b/extra/cmake/version
@@ -1 +1 @@
-3.19.7 1
+3.20.0 1
diff --git a/extra/cvs/build b/extra/cvs/build
new file mode 100755
index 00000000..79ff6467
--- /dev/null
+++ b/extra/cvs/build
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+export LDFLAGS="$LDFLAGS -static"
+
+./configure \
+    --prefix=/usr \
+    --infodir=/usr/share/info \
+    --mandir=/usr/share/man \
+    --with-editor=/usr/bin/vi \
+    --with-external-zlib
+
+make
+make -j1 DESTDIR="$1" install
+
+# Remove unsupported/untested cvs junk
+rm -r "$1/usr/share/cvs"
diff --git a/extra/cvs/checksums b/extra/cvs/checksums
new file mode 100644
index 00000000..964f7b82
--- /dev/null
+++ b/extra/cvs/checksums
@@ -0,0 +1 @@
+78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e  cvs-1.12.13.tar.bz2
diff --git a/extra/cvs/depends b/extra/cvs/depends
new file mode 100644
index 00000000..3fb34ed3
--- /dev/null
+++ b/extra/cvs/depends
@@ -0,0 +1,2 @@
+openssh
+zlib make
diff --git a/extra/cvs/sources b/extra/cvs/sources
new file mode 100644
index 00000000..fb83fa58
--- /dev/null
+++ b/extra/cvs/sources
@@ -0,0 +1 @@
+http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2
diff --git a/extra/cvs/version b/extra/cvs/version
new file mode 100644
index 00000000..5e5a2839
--- /dev/null
+++ b/extra/cvs/version
@@ -0,0 +1 @@
+1.12.13 1
diff --git a/extra/expat/checksums b/extra/expat/checksums
index 3644ee2f..f286a009 100644
--- a/extra/expat/checksums
+++ b/extra/expat/checksums
@@ -1 +1 @@
-5dfe538f8b5b63f03e98edac520d7d9a6a4d22e482e5c96d4d06fcc5485c25f2  expat-2.2.10.tar.xz
+caa34f99b6e3bcea8502507eb6549a0a84510b244a748dfb287271b2d47467a9  expat-2.3.0.tar.xz
diff --git a/extra/expat/sources b/extra/expat/sources
index c001b7c8..f2425765 100644
--- a/extra/expat/sources
+++ b/extra/expat/sources
@@ -1 +1 @@
-https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.xz
+https://github.com/libexpat/libexpat/releases/download/R_2_3_0/expat-2.3.0.tar.xz
diff --git a/extra/expat/version b/extra/expat/version
index fcf6e966..fbf76438 100644
--- a/extra/expat/version
+++ b/extra/expat/version
@@ -1 +1 @@
-2.2.10 1
+2.3.0 1
diff --git a/extra/ffmpeg/version b/extra/ffmpeg/version
index ed7dfa45..1138feb1 100644
--- a/extra/ffmpeg/version
+++ b/extra/ffmpeg/version
@@ -1 +1 @@
-4.3.2 1
+4.3.2 3
diff --git a/extra/fossil/checksums b/extra/fossil/checksums
index e449b0bd..99625134 100644
--- a/extra/fossil/checksums
+++ b/extra/fossil/checksums
@@ -1 +1 @@
-b8d0c920196dd8ae29152fa7448e513a1fa7c588871b785e3fbfc07b42a05fb9  fossil-src-2.14.tar.gz
+671edda9a014474d0f07b4c616b37222e218275b3c8e5414657830c6f351877b  fossil-src-2.15.tar.gz
diff --git a/extra/fossil/sources b/extra/fossil/sources
index c050d9f3..4aa702d8 100644
--- a/extra/fossil/sources
+++ b/extra/fossil/sources
@@ -1 +1 @@
-https://fossil-scm.org/index.html/uv/fossil-src-2.14.tar.gz
+https://fossil-scm.org/index.html/uv/fossil-src-2.15.tar.gz
diff --git a/extra/fossil/version b/extra/fossil/version
index 461a29e0..2698b409 100644
--- a/extra/fossil/version
+++ b/extra/fossil/version
@@ -1 +1 @@
-2.14 1
+2.15 1
diff --git a/extra/glib-networking/checksums b/extra/glib-networking/checksums
index 6dba86e4..ed27abcc 100644
--- a/extra/glib-networking/checksums
+++ b/extra/glib-networking/checksums
@@ -1 +1 @@
-c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099  glib-networking-2.66.0.tar.xz
+0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e  glib-networking-2.68.0.tar.xz
diff --git a/extra/glib-networking/sources b/extra/glib-networking/sources
index 50fe44ba..59c2bb17 100644
--- a/extra/glib-networking/sources
+++ b/extra/glib-networking/sources
@@ -1 +1 @@
-https://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.tar.xz
+https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.0.tar.xz
diff --git a/extra/glib-networking/version b/extra/glib-networking/version
index 39990324..6da37bee 100644
--- a/extra/glib-networking/version
+++ b/extra/glib-networking/version
@@ -1 +1 @@
-2.66.0 1
+2.68.0 1
diff --git a/extra/glib/checksums b/extra/glib/checksums
index 551d4c33..b1faa259 100644
--- a/extra/glib/checksums
+++ b/extra/glib/checksums
@@ -1 +1 @@
-97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b  glib-2.66.8.tar.xz
+67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea  glib-2.68.0.tar.xz
diff --git a/extra/glib/sources b/extra/glib/sources
index 4d406f89..728cf34a 100644
--- a/extra/glib/sources
+++ b/extra/glib/sources
@@ -1 +1 @@
-https://download.gnome.org/sources/glib/2.66/glib-2.66.8.tar.xz
+https://download.gnome.org/sources/glib/2.68/glib-2.68.0.tar.xz
diff --git a/extra/glib/version b/extra/glib/version
index b1fa9c3e..6da37bee 100644
--- a/extra/glib/version
+++ b/extra/glib/version
@@ -1 +1 @@
-2.66.8 1
+2.68.0 1
diff --git a/extra/gnutls/build b/extra/gnutls/build
new file mode 100755
index 00000000..4958284a
--- /dev/null
+++ b/extra/gnutls/build
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --disable-nls \
+    --with-nettle-mini \
+    --with-included-libtasn1 \
+    --with-included-unistring \
+    --enable-static
+
+make
+make DESTDIR="$1" install
diff --git a/extra/gnutls/checksums b/extra/gnutls/checksums
new file mode 100644
index 00000000..4cf6c73e
--- /dev/null
+++ b/extra/gnutls/checksums
@@ -0,0 +1 @@
+0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558  gnutls-3.6.15.tar.xz
diff --git a/extra/gnutls/depends b/extra/gnutls/depends
new file mode 100644
index 00000000..9dafebcb
--- /dev/null
+++ b/extra/gnutls/depends
@@ -0,0 +1,2 @@
+nettle
+p11-kit
diff --git a/extra/gnutls/sources b/extra/gnutls/sources
new file mode 100644
index 00000000..b21d9cdf
--- /dev/null
+++ b/extra/gnutls/sources
@@ -0,0 +1 @@
+https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.15.tar.xz
diff --git a/extra/gnutls/version b/extra/gnutls/version
new file mode 100644
index 00000000..50c5c4bb
--- /dev/null
+++ b/extra/gnutls/version
@@ -0,0 +1 @@
+3.6.15 2
diff --git a/extra/gst-plugins-base/build b/extra/gst-plugins-base/build
index 7c9b1336..8ea0f48e 100755
--- a/extra/gst-plugins-base/build
+++ b/extra/gst-plugins-base/build
@@ -5,7 +5,6 @@ export DESTDIR="$1"
 meson \
     --prefix=/usr \
     -Dtremor=disabled \
-    -Dgl=disabled \
     -Dexamples=disabled \
     -Dgtk_doc=disabled \
     -Dcdparanoia=disabled \
diff --git a/extra/gst-plugins-base/checksums b/extra/gst-plugins-base/checksums
index d394b340..bc3d9f5d 100644
--- a/extra/gst-plugins-base/checksums
+++ b/extra/gst-plugins-base/checksums
@@ -1 +1,2 @@
 29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323  gst-plugins-base-1.18.4.tar.xz
+e4f58313482a0bb96c65c9501313513275549e99137acbcd654c369904705000  gl-headers-5c8c7c0d.tar.gz
diff --git a/extra/gst-plugins-base/sources b/extra/gst-plugins-base/sources
index 7faedcc5..c9b146bf 100644
--- a/extra/gst-plugins-base/sources
+++ b/extra/gst-plugins-base/sources
@@ -1 +1,2 @@
 https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.4.tar.xz
+https://gitlab.freedesktop.org/gstreamer/meson-ports/gl-headers/-/archive/5c8c7c0d/gl-headers-5c8c7c0d.tar.gz subprojects/gl-headers
diff --git a/extra/gst-plugins-base/version b/extra/gst-plugins-base/version
index e13698db..871d42e8 100644
--- a/extra/gst-plugins-base/version
+++ b/extra/gst-plugins-base/version
@@ -1 +1 @@
-1.18.4 1
+1.18.4 2
diff --git a/extra/gst-plugins/checksums b/extra/gst-plugins/checksums
index afc5ca3b..a56478d0 100644
--- a/extra/gst-plugins/checksums
+++ b/extra/gst-plugins/checksums
@@ -1,4 +1,4 @@
-9b3b8e05d4d6073bf929fb33e2d8f74dd81ff21fa5b50c3273c78dfa2ab9c5cb  gst-plugins-good-1.18.3.tar.xz
-b7e34b6b86272588fbd8b314dadfa6ceff895198cfb59e2950378e9e31ff22e0  gst-plugins-bad-1.18.3.tar.xz
-70f7429b25dd2f714eb18e80af61b1363b1f63019e16cd28e086e3a619eaa992  gst-plugins-ugly-1.18.3.tar.xz
-ad20546bcd78ac1e7cf194666d73c4f33efeb62647d2b6af22993b540699e91c  gst-libav-1.18.3.tar.xz
+b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0  gst-plugins-good-1.18.4.tar.xz
+74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f  gst-plugins-bad-1.18.4.tar.xz
+218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c  gst-plugins-ugly-1.18.4.tar.xz
+344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396  gst-libav-1.18.4.tar.xz
diff --git a/extra/gst-plugins/sources b/extra/gst-plugins/sources
index 614f7320..f4a78a2e 100644
--- a/extra/gst-plugins/sources
+++ b/extra/gst-plugins/sources
@@ -1,4 +1,4 @@
-https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.3.tar.xz good
-https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.3.tar.xz bad
-https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.3.tar.xz ugly
-https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.3.tar.xz libav
+https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz good
+https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz bad
+https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz ugly
+https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.4.tar.xz libav
diff --git a/extra/gst-plugins/version b/extra/gst-plugins/version
index 868463e8..e13698db 100644
--- a/extra/gst-plugins/version
+++ b/extra/gst-plugins/version
@@ -1 +1 @@
-1.18.3 1
+1.18.4 1
diff --git a/extra/imagemagick/checksums b/extra/imagemagick/checksums
index a9dfb4ce..187d0a62 100644
--- a/extra/imagemagick/checksums
+++ b/extra/imagemagick/checksums
@@ -1 +1 @@
-3a970d1afd5e8fa08754ee8e097af4b7b088e6cd17cf55f1d3a9999d20018bc5  ImageMagick-7.0.11-3.tar.xz
+9ac056692065ddf485d85bf6698d3eef5aa29e76d353ae721e1e5b80ffaa9dc4  ImageMagick-7.0.11-4.tar.xz
diff --git a/extra/imagemagick/sources b/extra/imagemagick/sources
index 66761753..b257667a 100644
--- a/extra/imagemagick/sources
+++ b/extra/imagemagick/sources
@@ -1 +1 @@
-https://imagemagick.org/download/releases/ImageMagick-7.0.11-3.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 150c953d..295927a3 100644
--- a/extra/imagemagick/version
+++ b/extra/imagemagick/version
@@ -1 +1 @@
-7.0.11-3 1
+7.0.11-4 1
diff --git a/extra/libassuan/checksums b/extra/libassuan/checksums
index a3b44e0a..d34a2c0d 100644
--- a/extra/libassuan/checksums
+++ b/extra/libassuan/checksums
@@ -1 +1 @@
-c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0  libassuan-2.5.4.tar.bz2
+8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4  libassuan-2.5.5.tar.bz2
diff --git a/extra/libassuan/sources b/extra/libassuan/sources
index 71aa2e1c..f9faaa14 100644
--- a/extra/libassuan/sources
+++ b/extra/libassuan/sources
@@ -1 +1 @@
-https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.4.tar.bz2
+https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2
diff --git a/extra/libassuan/version b/extra/libassuan/version
index 919d8f6d..f64c830a 100644
--- a/extra/libassuan/version
+++ b/extra/libassuan/version
@@ -1 +1 @@
-2.5.4 1
+2.5.5 1
diff --git a/extra/libgpg-error/checksums b/extra/libgpg-error/checksums
index d246c91a..3607f63d 100644
--- a/extra/libgpg-error/checksums
+++ b/extra/libgpg-error/checksums
@@ -1 +1 @@
-64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742  libgpg-error-1.41.tar.bz2
+fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23  libgpg-error-1.42.tar.bz2
diff --git a/extra/libgpg-error/sources b/extra/libgpg-error/sources
index d17d92c8..2be693a0 100644
--- a/extra/libgpg-error/sources
+++ b/extra/libgpg-error/sources
@@ -1 +1 @@
-https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.41.tar.bz2
+https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2
diff --git a/extra/libgpg-error/version b/extra/libgpg-error/version
index ea947234..8fce8e69 100644
--- a/extra/libgpg-error/version
+++ b/extra/libgpg-error/version
@@ -1 +1 @@
-1.41 1
+1.42 1
diff --git a/extra/libinput/checksums b/extra/libinput/checksums
index 07f1df87..3b23f622 100644
--- a/extra/libinput/checksums
+++ b/extra/libinput/checksums
@@ -1 +1 @@
-c560cfca14cb5c50d2a1b7551df06bc5d4306e32c128f3e3d37e137285dedbad  libinput-1.17.0.tar.xz
+e51c50f3ce253961bed452d9f93102cc26128406975ab88ff9ec9e6c3b875137  libinput-1.17.1.tar.xz
diff --git a/extra/libinput/sources b/extra/libinput/sources
index c74cd4ce..f9b318a7 100644
--- a/extra/libinput/sources
+++ b/extra/libinput/sources
@@ -1 +1 @@
-https://www.freedesktop.org/software/libinput/libinput-1.17.0.tar.xz
+https://www.freedesktop.org/software/libinput/libinput-1.17.1.tar.xz
diff --git a/extra/libinput/version b/extra/libinput/version
index 8aac6e6e..14d73f99 100644
--- a/extra/libinput/version
+++ b/extra/libinput/version
@@ -1 +1 @@
-1.17.0 1
+1.17.1 1
diff --git a/extra/libva-utils/checksums b/extra/libva-utils/checksums
index bdacfbba..684735b2 100644
--- a/extra/libva-utils/checksums
+++ b/extra/libva-utils/checksums
@@ -1 +1 @@
-cbb7f9f6eae21d772e31b67bc8c311be6e35fe9c65e63acc57f9b16d72bf8dc0  2.10.0.tar.gz
+4046dc73b498950e838d40ace46c82d034b04f81e4fcf7c5e3ebed5d2697e1ab  2.11.0.tar.gz
diff --git a/extra/libva-utils/sources b/extra/libva-utils/sources
index c6b5cbb8..0e757e8b 100644
--- a/extra/libva-utils/sources
+++ b/extra/libva-utils/sources
@@ -1 +1 @@
-https://github.com/intel/libva-utils/archive/2.10.0.tar.gz
+https://github.com/intel/libva-utils/archive/2.11.0.tar.gz
diff --git a/extra/libva-utils/version b/extra/libva-utils/version
index ddcee052..5c3c8552 100644
--- a/extra/libva-utils/version
+++ b/extra/libva-utils/version
@@ -1 +1 @@
-2.10.0 1
+2.11.0 1
diff --git a/extra/libva/checksums b/extra/libva/checksums
index 4e883ac5..d24ebff5 100644
--- a/extra/libva/checksums
+++ b/extra/libva/checksums
@@ -1 +1 @@
-f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5  2.10.0.tar.gz
+ee2bd79bad5e2404143f089360685f5da63a32dd551b54ccd61d2d49c041178a  2.11.0.tar.gz
diff --git a/extra/libva/sources b/extra/libva/sources
index 13cfbed9..ac6b4ab1 100644
--- a/extra/libva/sources
+++ b/extra/libva/sources
@@ -1 +1 @@
-https://github.com/intel/libva/archive/2.10.0.tar.gz
+https://github.com/intel/libva/archive/2.11.0.tar.gz
diff --git a/extra/libva/version b/extra/libva/version
index ddcee052..5c3c8552 100644
--- a/extra/libva/version
+++ b/extra/libva/version
@@ -1 +1 @@
-2.10.0 1
+2.11.0 1
diff --git a/extra/libvpx/checksums b/extra/libvpx/checksums
index 20c89823..b61b83bb 100644
--- a/extra/libvpx/checksums
+++ b/extra/libvpx/checksums
@@ -1,2 +1,2 @@
-d279c10e4b9316bf11a570ba16c3d55791e1ad6faa4404c67422eb631782c80a  v1.9.0.tar.gz
+85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a  v1.10.0.tar.gz
 ce802d64bcbeb4230527aea2b4284d9844fb12fa5aca868a94e03982f85ec45b  fix-busybox-diff.patch
diff --git a/extra/libvpx/sources b/extra/libvpx/sources
index 4d569e98..26dad794 100644
--- a/extra/libvpx/sources
+++ b/extra/libvpx/sources
@@ -1,2 +1,2 @@
-https://github.com/webmproject/libvpx/archive/v1.9.0.tar.gz
+https://github.com/webmproject/libvpx/archive/v1.10.0.tar.gz
 patches/fix-busybox-diff.patch
diff --git a/extra/libvpx/version b/extra/libvpx/version
index 67fe23c8..ac83b38b 100644
--- a/extra/libvpx/version
+++ b/extra/libvpx/version
@@ -1 +1 @@
-1.9.0 1
+1.10.0 1
diff --git a/extra/man-pages/checksums b/extra/man-pages/checksums
index 5c61a1f6..67fba6ba 100644
--- a/extra/man-pages/checksums
+++ b/extra/man-pages/checksums
@@ -1 +1 @@
-75102535ba119f2f223f674d84e1dcdaebf0a5ffd639b3c2e6cb0a0e34768762  man-pages-5.10.tar.xz
+3eda5dce5184599ec37dae3494cf964c550362e9a41fb724792da610bdb13caa  man-pages-5.11.tar.xz
diff --git a/extra/man-pages/sources b/extra/man-pages/sources
index 847d463a..e946ede4 100644
--- a/extra/man-pages/sources
+++ b/extra/man-pages/sources
@@ -1 +1 @@
-https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/man-pages-5.10.tar.xz
+https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/man-pages-5.11.tar.xz
diff --git a/extra/man-pages/version b/extra/man-pages/version
index a0236a8a..20584615 100644
--- a/extra/man-pages/version
+++ b/extra/man-pages/version
@@ -1 +1 @@
-5.10 1
+5.11 1
diff --git a/extra/nettle/build b/extra/nettle/build
new file mode 100755
index 00000000..32a77951
--- /dev/null
+++ b/extra/nettle/build
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --enable-shared \
+    --enable-static \
+    --enable-mini-gmp \
+    --disable-documentation
+
+make
+make DESTDIR="$1" install
diff --git a/extra/nettle/checksums b/extra/nettle/checksums
new file mode 100644
index 00000000..3fb8cd8c
--- /dev/null
+++ b/extra/nettle/checksums
@@ -0,0 +1 @@
+8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162  nettle-3.7.2.tar.gz
diff --git a/extra/nettle/sources b/extra/nettle/sources
new file mode 100644
index 00000000..b409b3ff
--- /dev/null
+++ b/extra/nettle/sources
@@ -0,0 +1 @@
+https://ftp.gnu.org/gnu/nettle/nettle-3.7.2.tar.gz
diff --git a/extra/nettle/version b/extra/nettle/version
new file mode 100644
index 00000000..9cab2d63
--- /dev/null
+++ b/extra/nettle/version
@@ -0,0 +1 @@
+3.7.2 1
diff --git a/extra/samurai/build b/extra/samurai/build
index 1dd11b38..547d1464 100755
--- a/extra/samurai/build
+++ b/extra/samurai/build
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-make PREFIX=/usr
+make PREFIX=/usr LDFLAGS="$LDFLAGS -static"
 make PREFIX=/usr DESTDIR="$1" install
 
-ln -s samu "$1/usr/bin/ninja"
+ln -s samu   "$1/usr/bin/ninja"
+ln -s samu.1 "$1/usr/share/man/man1/ninja.1"
diff --git a/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums
index 55dfdea3..6f63c260 100644
--- a/extra/webkit2gtk/checksums
+++ b/extra/webkit2gtk/checksums
@@ -1,2 +1,2 @@
-7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f  webkitgtk-2.30.5.tar.xz
+50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e  webkitgtk-2.30.6.tar.xz
 bca30f52651c0a890a7aa928d8524bfd22fab293761d022815f2226a13626ad1  fix-musl.patch
diff --git a/extra/webkit2gtk/sources b/extra/webkit2gtk/sources
index 0508d8c5..87dd46d4 100644
--- a/extra/webkit2gtk/sources
+++ b/extra/webkit2gtk/sources
@@ -1,2 +1,2 @@
-https://webkitgtk.org/releases/webkitgtk-2.30.5.tar.xz
+https://webkitgtk.org/releases/webkitgtk-2.30.6.tar.xz
 patches/fix-musl.patch
diff --git a/extra/webkit2gtk/version b/extra/webkit2gtk/version
index de7fc92a..e016b50b 100644
--- a/extra/webkit2gtk/version
+++ b/extra/webkit2gtk/version
@@ -1 +1 @@
-2.30.5 1
+2.30.6 1
diff --git a/extra/x265/build b/extra/x265/build
index 2bc1c919..063d4bce 100755
--- a/extra/x265/build
+++ b/extra/x265/build
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+export CFLAGS="$CFLAGS -static-libgcc"
+export CXXFLAGS="$CXXFLAGS -static-libstdc++ -static-libgcc"
 export DESTDIR="$1"
 
 cmake source \
diff --git a/extra/x265/checksums b/extra/x265/checksums
index 62afa5db..698ea2e8 100644
--- a/extra/x265/checksums
+++ b/extra/x265/checksums
@@ -1 +1 @@
-c2047f23a6b729e5c70280d23223cb61b57bfe4ad4e8f1471eeee2a61d148672  x265_3.4.tar.gz
+e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8  x265_3.5.tar.gz
diff --git a/extra/x265/sources b/extra/x265/sources
index 36ee791b..48dd3502 100644
--- a/extra/x265/sources
+++ b/extra/x265/sources
@@ -1 +1,3 @@
-https://bitbucket.org/multicoreware/x265/downloads/x265_3.4.tar.gz
+# You can't download the tarball from certain locations.
+# https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
+https://dl.carbslinux.org/distfiles/x265/x265_3.5.tar.gz
diff --git a/extra/x265/version b/extra/x265/version
index 5647cc28..5b90d060 100644
--- a/extra/x265/version
+++ b/extra/x265/version
@@ -1 +1 @@
-3.4 1
+3.5 2