community/exim/CVE-2020-12783-2.patch

+From 5a41d2c2cd2b28a0d1aea21edeaea02bd6db4984 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris <jgh146exb@wizmail.org>
+Date: Wed, 6 May 2020 22:31:25 +0100
+Subject: [PATCH 45/46] Rework SPA fix to avoid overflows.  Bug 2571
+
+Amends: 6a7edbf660
+(cherry picked from commit a04174dc2a84ae1008c23b6a7109e7fa3fb7b8b0)
+---
+ src/auths/spa.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/auths/spa.c b/src/auths/spa.c
+index ed9aff23b..4e3aef808 100644
+--- a/src/auths/spa.c
++++ b/src/auths/spa.c
+@@ -140,6 +140,7 @@ SPAAuthResponse  response;
+ SPAAuthResponse  *responseptr = &response;
+ uschar msgbuf[2048];
+ uschar *clearpass, *s;
++unsigned off;
+ 
+ /* send a 334, MS Exchange style, and grab the client's request,
+ unless we already have it via an initial response. */
+@@ -194,10 +195,13 @@ that causes failure if the size of msgbuf is exceeded. ****/
+ 
+   {
+   int i;
+-  char *p = ((char*)responseptr) + IVAL(&responseptr->uUser.offset,0);
++  char * p;
+   int len = SVAL(&responseptr->uUser.len,0)/2;
+ 
+-  if (p + len*2 >= CS (responseptr+1))
++  if (  (off = IVAL(&responseptr->uUser.offset,0)) >= sizeof(SPAAuthResponse)
++     || len >= sizeof(responseptr->buffer)/2
++     || (p = (CS responseptr) + off) + len*2 >= CS (responseptr+1)
++     )
+     {
+     DEBUG(D_auth)
+       debug_printf("auth_spa_server(): bad uUser spec in response\n");
+@@ -252,13 +256,14 @@ spa_smb_nt_encrypt (clearpass, challenge.challengeData, ntRespData);
+ 
+ /* compare NT hash (LM may not be available) */
+ 
+-s = (US responseptr) + IVAL(&responseptr->ntResponse.offset,0);
+-if (s + 24 >= US (responseptr+1))
++off = IVAL(&responseptr->ntResponse.offset,0);
++if (off >= sizeof(SPAAuthResponse) - 24)
+   {
+   DEBUG(D_auth)
+     debug_printf("auth_spa_server(): bad ntRespData spec in response\n");
+   return FAIL;
+   }
++s = (US responseptr) + off;
+ 
+ if (memcmp(ntRespData, s, 24) == 0)
+   return auth_check_serv_cond(ablock);	/* success. we have a winner. */
+-- 
+2.26.2
+

community/falkon/APKBUILD

@@ -2,15 +2,16 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=falkon
 pkgver=3.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Cross-platform Qt Web Browser"
 url="https://github.com/KDE/falkon"
-arch="all !ppc64le !s390x !armhf !mips !mips64" # mips, ppc64le and s390x blocked by qt5-qtwebengine, armhf blocked by qt5-qtdeclarative
+# mips, ppc64le and s390x blocked by qt5-qtwebengine, armhf blocked by qt5-qtdeclarative
+arch="all !ppc64le !s390x !armhf !mips !mips64"
 license="GPL-3.0-or-later"
 depends="qt5-qtbase-sqlite"
 makedepends="cmake python3 qt5-qtbase-dev extra-cmake-modules qt5-qtdeclarative-dev
- qt5-qtwebengine-dev xcb-util-dev libxcb-dev qt5-qtx11extras-dev qt5-qttools-dev
- ki18n-dev karchive-dev kwallet-dev kio-dev kcrash-dev kcoreaddons-dev purpose-dev"
+	qt5-qtwebengine-dev xcb-util-dev libxcb-dev qt5-qtx11extras-dev qt5-qttools-dev
+	ki18n-dev karchive-dev kwallet-dev kio-dev kcrash-dev kcoreaddons-dev purpose-dev"
 checkdepends="xvfb-run"
 subpackages="$pkgname-lang $pkgname-bash-completion:bashcomp:noarch"
 source="https://download.kde.org/stable/falkon/3.1/falkon-$pkgver.tar.xz
@@ -25,7 +26,7 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=RelWithDefInfo \
+		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DBUILD_TESTING=ON \

community/fd/APKBUILD

 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Leo <thinkabit.ukim@gmail.com>
 pkgname=fd
-pkgver=8.0.0
+pkgver=8.1.1
 pkgrel=0
 pkgdesc="Simple, fast, user-friendly alternative to find"
 url="https://github.com/sharkdp/fd"
@@ -38,4 +38,4 @@ package() {
 	find "$builddir"/target/release/build/fd-find-* -type f -iname fd.fish \
 		-exec install -Dm644 '{}' "$pkgdir"/usr/share/fish/completions/fd.fish \;
 }
-sha512sums="01f7caee8edd7ce45bdcc041dd39b4adc58d89750ea7de624911b0a64a303269f588356a4ffe64f27fe04527970b7eef1e4f31f6c4f36eec349af6df9ce74800  fd-8.0.0.tar.gz"
+sha512sums="71c078deacd498ebd9e52e32c4208c35383035ec7b87513b4127319c0294b598ce8fd9ad1acb7d665f6b64024b69f6f9fe3ace93da9f1504b7d5875018204352  fd-8.1.1.tar.gz"

community/feh/APKBUILD

 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=feh
-pkgver=3.4
+pkgver=3.4.1
 pkgrel=0
 pkgdesc="Fast, lightweight image viewer which uses imlib2"
 options="!check" # Requires unpackaged 'perl-test-command'
@@ -31,4 +31,4 @@ package() {
 		install
 }
 
-sha512sums="50cb7fd33b583ee802cbbba8ed7a74e9eb72a141ffa28ab998a196f9f8d030a8192420fc084136f699cb33b1b8c4d8c2c111fa90695dd82a1366330a428383ce  feh-3.4.tar.bz2"
+sha512sums="d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66  feh-3.4.1.tar.bz2"

community/fennel/APKBUILD

 # Contributor: Will Sinatra <wpsinatra@gmail.com>
 # Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=fennel
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=0
 pkgdesc="A Lua Lisp Language"
 url="https://fennel-lang.org"
@@ -40,4 +40,4 @@ package() {
 			"$pkgdir/usr/bin/fennel"
 }
 
-sha512sums="f86da3015680b6a3ea18413480d0c43b37a93e6753dff1fe206a0cf02f5278ab20eca06df32816da6e381a70b28fcc5787a867422d56d4340f2d506a02ff5f71  fennel-0.4.0.tar.gz"
+sha512sums="cd20e110173c1a548685e06cc8d6073eab7ddfa14fe34df31a9e99f7581f8dc318d809cb0973323684515a25f3e66f26e88e52ea0968213f32c07f372348fe00  fennel-0.4.1.tar.gz"

community/ffmpeg/APKBUILD

@@ -3,8 +3,8 @@
 # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ffmpeg
-pkgver=4.2.2
-pkgrel=2
+pkgver=4.2.3
+pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 url="https://ffmpeg.org/"
 arch="all"
@@ -176,5 +176,5 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
 }
 
-sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3  ffmpeg-4.2.2.tar.xz
+sha512sums="a9bad00e452ec706a0dd955e30babaf964d13160a478da0ce5b330cd0660bd8caec3d17fd28ea2b9b05711096e950e45f90f316249c7a00cd09b1d9004992a1e  ffmpeg-4.2.3.tar.xz
 1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4  0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"

community/filezilla/APKBUILD

 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=filezilla
-pkgver=3.48.0
+pkgver=3.48.1
 pkgrel=0
 pkgdesc="FTP Client"
 url="https://filezilla-project.org"
@@ -38,5 +38,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c9d4eb17dc31894468ca4b7c4c8fda0f307d3931bf1b3b8fb44afd084a1b2c9309d39e5745f9ba287a5566d44089af32350703e324a559afd6a015af469433fb  FileZilla_3.48.0_src.tar.bz2
+sha512sums="58792f92bb4f6102166924abaf843c023faeca7f2979aaa47c26f2bb3f8449902b4a43c50a800d56584d39c9ddf64a6d3334558e46f56bda3b8515c7a3ff0a12  FileZilla_3.48.1_src.tar.bz2
 6280da4f1c359be7d49e8b590f036ddf1220ce6145fbba6c789c89d444a2a85d283275e402d996a6d28e9d5129f646b7920005d5d71faa4a80f0c734133c48a1  missing-list-include.patch"

community/fio/APKBUILD

 # Contributor: wener <wenermail@gmail.com>
 # Maintainer: wener <wenermail@gmail.com>
 pkgname=fio
-pkgver=3.19
+pkgver=3.20
 pkgrel=0
 pkgdesc="Flexible I/O Tester"
 options="!check" # Tests break due to missing drand_r
@@ -37,4 +37,4 @@ package() {
 	done
 }
 
-sha512sums="077bf1180148c9425a20213fb112a718199459578465d49eae63b3ee4414bc28f9ace9c8469c778085747c47e9804ea570ef8466006488f3f4dd4f9008cee665  fio-3.19.tar.gz"
+sha512sums="bb8581c5bb03f080de1723fefc1e7f89c90e081123943b7ed3e3cac1062c29f9bd9d7b50df8da769f900e939774e0166232acf9a946f7623edf0a8e7abbf69dc  fio-3.20.tar.gz"

community/firefox/APKBUILD

@@ -3,7 +3,7 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=firefox
 pkgver=76.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Firefox web browser"
 url="https://www.firefox.com/"
 # Limited on:
@@ -53,6 +53,8 @@ makedepends="
 	yasm
 	zip
 	pulseaudio-dev
+	libffi-dev
+	libwebp-dev
 	"
 
 source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
@@ -215,7 +217,9 @@ build() {
 		$_rust_simd \
 		$_low_mem_flags \
 		--enable-hardening \
+		--enable-system-pixman \
 		--with-system-bz2 \
+		--with-system-ffi \
 		--with-system-icu \
 		--with-system-libevent \
 		--with-system-nspr \
@@ -223,9 +227,11 @@ build() {
 		--with-system-pixman \
 		--with-system-png \
 		--with-system-zlib \
+		--with-system-libvpx \
+		--with-system-webp \
 		--with-clang-path=/usr/bin/clang \
 		--with-libclang-path=/usr/lib \
-		--with-system-libvpx
+		--enable-cdp
 	make
 }
 

testing/flatseal/APKBUILD → community/flatseal/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=flatseal
-pkgver=1.3.1
-pkgrel=1
+pkgver=1.5.3
+pkgrel=0
 pkgdesc="Permission Manager for Flatpak"
 url="https://github.com/tchx84/Flatseal"
 arch="noarch !s390x !mips !mips64" # gjs
@@ -33,4 +33,4 @@ package() {
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
-sha512sums="cb5c7a3c7251b6fc87d3bac1cdf03c5a2adc3c42183dec96a58ffbd098b30eec40d499b7ed0867b8185fd99258f4746d517f6117053651ce083c81fa3098a6d6  flatseal-1.3.1.tar.gz"
+sha512sums="b5be904025ec05e986b681c450a751191cda2fcfc72e59459ea8063253428f27fb53f6f3c6a696b5307aaaa7b983216bc26619110cb93c7165fbc3cbead087c4  flatseal-1.5.3.tar.gz"

community/fluidsynth/APKBUILD

 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=fluidsynth
-pkgver=2.1.2
+pkgver=2.1.3
 pkgrel=0
 arch="all"
 url="http://www.fluidsynth.org"
@@ -18,15 +18,16 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DLIB_INSTALL_DIR=lib \
 		-DFLUID_DAEMON_ENV_FILE=/etc/conf.d/fluidsynth
-	make -C build
+	cmake --build build
 }
 
 check() {
-	make -C build -k check
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	DESTDIR="$pkgdir" make -C build install
+	DESTDIR="$pkgdir" cmake --build build --target install
 }
 
-sha512sums="ece3328ee94731f347a03f555fd39ead0a50cb24fef5d90dbff22e74db8344c9a68bfaccb76b873bd18a8ac68ee1d7802571e51c938bbf98e424267376f47eb8  fluidsynth-v2.1.2.tar.gz"
+sha512sums="cc956a3d8926a5d5368c4d36472a9706e5da1597bab76f1b59132e6253a888f422d9f74723c74f801963a90d9e0f6b36267114cd168977c47b1b935ea3dc8927  fluidsynth-v2.1.3.tar.gz"

community/fractal/APKBUILD

@@ -2,12 +2,12 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=fractal
 pkgver=4.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Matrix group messaging app"
 url="https://wiki.gnome.org/Apps/Fractal"
 arch="x86_64 x86 armhf armv7 aarch64 ppc64le" # limited by Rust
 license="GPL-3.0-or-later"
-depends="dbus:org.freedesktop.Secrets"
+depends="dbus:org.freedesktop.Secrets xdg-utils"
 makedepends="meson gtk+3.0-dev dbus-dev openssl-dev gspell-dev libhandy-dev
 	gtksourceview4-dev gstreamer-dev gst-plugins-base-dev gst-plugins-bad-dev
 	gst-editing-services-dev glib-dev cargo gmp-dev"

testing/freexl/APKBUILD → community/freexl/APKBUILD

@@ -8,8 +8,7 @@ url="https://www.gaia-gis.it/fossil/freexl/index"
 arch="all"
 license="MPL-1.1 GPL-2.0-only LGPL-2.1-only"
 subpackages="$pkgname-dev"
-source="http://www.gaia-gis.it/gaia-sins/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="http://www.gaia-gis.it/gaia-sins/freexl-$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
@@ -17,7 +16,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--host=$CHOST \
 		--build=$CBUILD \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -rf "$pkgdir"/usr/share/
 }

community/gdal/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Trevor R.H. Clarke <trevor@notcows.com>
 pkgname=gdal
 pkgver=3.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A translator library for raster and vector geospatial data formats"
 url="https://gdal.org/"
 arch="all !s390x !x86 !armhf !armv7 !mips !mips64"
@@ -11,9 +11,11 @@ depends_dev="gdal"
 makedepends="
 	apache-ant
 	cfitsio-dev
+	charls-dev
 	chrpath
 	curl-dev
 	expat-dev
+	freexl-dev
 	geos-dev
 	giflib-dev
 	hdf5-dev
@@ -46,6 +48,7 @@ checkdepends="
 	pytest
 	"
 subpackages="
+	$pkgname-static
 	$pkgname-dev
 	py3-$pkgname:_py3
 	java-$pkgname:_java
@@ -61,8 +64,7 @@ source="
 build() {
 	cd "$builddir"/gdal
 
-	./configure \
-		CPPFLAGS=-I/usr/include/tirpc \
+	CPPFLAGS="$CPPFLAGS -I/usr/include/mysql/server -I/usr/include/tirpc" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -89,17 +91,18 @@ package() {
 
 	cd "$pkgdir/usr/bin"
 	mv gdal-config ..
-	rm -rf "${pkgdir:?}/usr/bin/*"
+	rm -rf "$pkgdir/usr/bin/"*
 	mv ../gdal-config .
 }
 
 _py3() {
 	pkgdesc="$pkgdesc (Python3 bindings)"
+	depends="py3-numpy"
 
 	mkdir -p "$subpkgdir"/usr/lib/
 	cd "$builddir"/gdal/swig/python
 	python3 setup.py install --prefix=/usr --root="$subpkgdir"
-	rm -rf "${subpkgdir:?}/usr/bin"
+	rm -rf "$subpkgdir/usr/bin"
 }
 
 _java() {
@@ -127,7 +130,7 @@ tools() {
 
 	cd "$builddir"/gdal
 	make DESTDIR="$subpkgdir" install
-	rm -rf "${subpkgdir:?}/usr/include" "${subpkgdir:?}/usr/lib" "${subpkgdir:?}/usr/share" "${subpkgdir:?}/usr/bin/gdal-config"
+	rm -rf "$subpkgdir/usr/include" "$subpkgdir/usr/lib" "$subpkgdir/usr/share" "$subpkgdir/usr/bin/gdal-config"
 }
 
 check() {

community/geth/APKBUILD

 # Contributor: André Klitzing <aklitzing@gmail.com>
 # Maintainer: André Klitzing <aklitzing@gmail.com>
 pkgname=geth
-pkgver=1.9.13
-pkgrel=1
+pkgver=1.9.14
+pkgrel=0
 pkgdesc="Official Go implementation of the Ethereum protocol"
 url="https://geth.ethereum.org/"
-arch="all !aarch64" # build fails
+arch="all !aarch64 !mips64" # build fails
 license="LGPL-3.0"
 makedepends="go linux-headers"
 checkdepends="fuse"
@@ -26,4 +26,4 @@ package() {
 	install -m755 -t "$pkgdir"/usr/bin build/bin/*
 }
 
-sha512sums="774a2a12b383a51be814171839f9e8c60294fab3686317666986d5bfec476fdc120130388d8dcc5c2efe19ab16c6f8801450fd545dd07f89b22285843ace1da3  geth-1.9.13.tar.gz"
+sha512sums="4bf2ef40e9c4272b9b4f65e44dbb3b0ec1e9c40ee2dae28e7cbfe00a9c4f973335e179626194313e3b0e4caf7242dc8e77b63415bcbced3e8ecd5864b9ed0392  geth-1.9.14.tar.gz"

community/gexiv2/APKBUILD

@@ -2,8 +2,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gexiv2
-pkgver=0.12.0
-pkgrel=4
+pkgver=0.12.1
+pkgrel=0
 pkgdesc="a GObject-based wrapper around the Exiv2 library"
 url="https://wiki.gnome.org/Projects/gexiv2"
 arch="all"
@@ -36,4 +36,4 @@ package() {
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
-sha512sums="c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9  gexiv2-0.12.0.tar.xz"
+sha512sums="cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d  gexiv2-0.12.1.tar.xz"