6 files changed, 137 insertions, 10 deletions
diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD
index f78987820..5af5254e1 100644
--- a/user/dovecot/APKBUILD
+++ b/user/dovecot/APKBUILD
@@ -5,8 +5,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Lee Starnes <lee@canned-death.us>
 pkgname=dovecot
-pkgver=2.3.10
-_pkgvermajor=${pkgver%.*}
+pkgver=2.3.10.1
+_pkgvermajor=2.3
 pkgrel=0
 _pigeonholever=0.5.9
 _pigeonholevermajor=${_pigeonholever%.*}
@@ -67,6 +67,12 @@ source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz
 	"
 _builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever"
 
+# secfixes:
+#   2.3.10.1-r0:
+#     - CVE-2020-10957
+#     - CVE-2020-10958
+#     - CVE-2020-10967
+
 _configure() {
 	./configure \
 		--build=$CBUILD \
@@ -270,7 +276,7 @@ _submv() {
 	done
 }
 
-sha512sums="73e10d7d1e616d6599eb53f2d2d1ac0f0f2e6e84019faac5cd525e833da44839a7e483635b61d432e3254a9e5f6f90915bec8940c584210341085241949dffa2  dovecot-2.3.10.tar.gz
+sha512sums="5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06  dovecot-2.3.10.1.tar.gz
 1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8  dovecot-2.3-pigeonhole-0.5.9.tar.gz
 fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a  skip-iconv-check.patch
 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5  split-protocols.patch
diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD
new file mode 100644
index 000000000..7f8c04e21
--- /dev/null
+++ b/user/horizon/APKBUILD
@@ -0,0 +1,100 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=horizon
+pkgver=0.9.1
+pkgrel=0
+pkgdesc="Installation tools for Adélie Linux"
+url="https://horizon.adelielinux.org/"
+arch="all"
+options="!archcheck !check"  # Unpackaged dependency ruby-aruba.
+license="AGPL-3.0+"
+depends=""
+checkdepends="ruby-aruba ruby-rspec valgrind"
+# Second group is the Qt5 UI deps.
+makedepends="bcnm-dev boost-dev cmake curl-dev eudev-dev libarchive-dev
+	linux-headers parted-dev skalibs-dev util-linux-dev
+
+	libcap-dev libx11-dev libxkbfile-dev qt5-qtbase-dev"
+subpackages="$pkgname-image $pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-qt5
+	$pkgname-tools $pkgname-wizard"
+source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz"
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=True \
+		-DBUILD_TOOLS=ON \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-format-truncation" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DINSTALL=ON \
+		${CMAKE_CROSSOPTS} \
+		-Bbuild
+	make -C build
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=False \
+		-DBUILD_TOOLS=OFF \
+		-DBUILD_UI=ON \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-format-truncation" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DINSTALL=OFF \
+		${CMAKE_CROSSOPTS} \
+		-Bbuild-wizard
+	make -C build-wizard
+}
+
+check() {
+	CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
+}
+
+package() {
+	make DESTDIR="$pkgdir" -C build install
+}
+
+image() {
+	pkgdesc="Tools for generating images using HorizonScript"
+	depends="mtools"
+	mkdir -p "$subpkgdir"/usr/bin
+	mkdir -p "$subpkgdir"/usr/lib
+	mkdir -p "$subpkgdir"/usr/share/horizon
+
+	mv "$pkgdir"/usr/bin/hscript-image "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/lib/libhi-backends.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/share/horizon/iso "$subpkgdir"/usr/share/horizon/
+}
+
+qt5() {
+	pkgdesc="Qt 5 installation wizard for Adélie Linux"
+	depends="horizon"
+	mkdir -p "$subpkgdir"/usr/bin
+
+	for _bin in horizon-ppc64-detect horizon-qt5 horizon-run-qt5; do
+		mv "$pkgdir"/usr/bin/$_bin "$subpkgdir"/usr/bin/
+	done
+}
+
+tools() {
+	pkgdesc="Tools for authoring HorizonScript files"
+	mkdir -p "$subpkgdir"/usr/bin
+
+	for _bin in hscript-fromjson hscript-simulate hscript-validate; do
+		mv "$pkgdir"/usr/bin/$_bin "$subpkgdir"/usr/bin/
+	done
+}
+
+wizard() {
+	pkgdesc="Wizard to generate a HorizonScript for another computer"
+
+	make DESTDIR="$subpkgdir" -C "$builddir"/build-wizard install
+	rm -r "$subpkgdir"/usr/include
+	rm -r "$subpkgdir"/usr/lib
+	rm -r "$subpkgdir"/usr/share
+}
+
+sha512sums="fe8f58a232b7e577aeba62cecfd97bec4037d41dd179781af912c9974210ce4648b0c56bd84fbf78866698e91882b8f4b7168c22842bde1682ea118ca931832f  horizon-0.9.1.tar.xz"
diff --git a/user/netqmail/0005-CVE-2005-1513.patch b/user/netqmail/0005-CVE-2005-1513.patch
new file mode 100644
index 000000000..3b3876cb3
--- /dev/null
+++ b/user/netqmail/0005-CVE-2005-1513.patch
@@ -0,0 +1,19 @@
+diff -rNU3 netqmail-1.06.old/alloc.c netqmail-1.06/alloc.c
+--- netqmail-1.06.old/alloc.c	1998-06-15 10:53:16.000000000 +0000
++++ netqmail-1.06/alloc.c	2020-05-21 11:33:24.689739728 +0000
+@@ -1,3 +1,4 @@
++#include <limits.h>
+ #include "alloc.h"
+ #include "error.h"
+ extern char *malloc();
+@@ -15,6 +16,10 @@
+ unsigned int n;
+ {
+   char *x;
++  if (n >= (INT_MAX >> 3)) {
++    errno = error_nomem;
++    return 0;
++  }
+   n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */
+   if (n <= avail) { avail -= n; return space + avail; }
+   x = malloc(n);
diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD
index 551895f83..45b92dbc8 100644
--- a/user/netqmail/APKBUILD
+++ b/user/netqmail/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=netqmail
 pkgver=1.06
-pkgrel=6
+pkgrel=7
 pkgdesc="The qmail mail transfer agent (community version)"
 url="http://www.netqmail.org/"
 arch="all"
@@ -19,6 +19,7 @@ source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz
 	0002-qbiffutmpx-20170820.patch
 	0003-qmailremote-20170716.patch
 	0004-notifyfd.patch
+	0005-CVE-2005-1513.patch
 	qmail.run
 	smtpd.run
 	smtpsd.run
@@ -106,6 +107,7 @@ ad126cad5c0d35351919ad87022fd94b910519d91cf82f38c158f423bbfc1b82455844a791ba0c69
 b3af9c29e6d46daa2a1b9f677c6f32892d5f8c9b8d5c2bdd6f34b106dd5ad41394c05a5ebe145c6e29b4ced4482f08b2d09e7818fd309123c0d087600500e336  0002-qbiffutmpx-20170820.patch
 cbebdc72c7cc5c437531c9277534ae552c6d044a83b36e3f3ce60ab5563c55eb814d6c543cc0997abab73075d1b517cc0929dd65674d468d517b0ca38196e2b4  0003-qmailremote-20170716.patch
 b32a8a36c8ab8872abd4f1a117482f064a6d631a6bb2ba75cafe61743bef09f923d26935d9514eec33a7dec5aeb3d0b517d677e55924859d2db5233bc11f9f11  0004-notifyfd.patch
+ac8406c1d16ce2e55e47bc83ca6e095833a54de73cecee222cad3fcececa518386b95a11cb0c9c2dcc6851bae28aa539b11069305aa887a291177bf177ee7b01  0005-CVE-2005-1513.patch
 954a905bac5e3bc49f180dc0de7f6ee4c4ae8f94dd400ee4b06d3c944f1ff1cfc44bddccb07ae439f2523ad06fcb89023e57d091737da88f836013757794e931  qmail.run
 c0cd244af4d8186305c51b0e93960bdb1ea6ce40f1adf20c4f72419aa7498e35649590919ebd16547a0313676bf9171c9efea2ff8ac3a5c773b18473a972a977  smtpd.run
 719c4ce5ad93cddeafbb734cffeec3fd959d3f374e44e1f34e9a25d638303dd97df41642d3df5c7a069a8db47d1e31c32a16ecd2d04b72860c4e00bbba0c9fcf  smtpsd.run
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD
index 7fac2165c..3ac5683cf 100644
--- a/user/wireguard-module/APKBUILD
+++ b/user/wireguard-module/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Luis Ressel <aranea@aixah.de>
-# Maintainer: Luis Ressel <aranea@aixah.de>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 _kver="5.4.5-mc0"
-pkgver=1.0.20200401
+pkgver=1.0.20200506
 pkgrel=0
 _pkgname="wireguard-module"
 pkgname="$_pkgname-$_kver"
@@ -39,4 +39,4 @@ _patch() {
 	"$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch"
 }
 
-sha512sums="894da609c7102eb1d076a4a7bdaa96c7d5f0d64b4b86fdf01068ac5f4af966652e7ad7f18b1295a7fc4447f53b55a9ec45f1b3f36f0f9df7fb08836dfdff89f0  wireguard-linux-compat-1.0.20200401.tar.xz"
+sha512sums="39a27a515919933dbed71624be3f8f3f512073b522e1e16248c9eda749dd72a3db5a02d85d29855160eb182415f489a4c02c1659ef9589507c99dbfe74ea3074  wireguard-linux-compat-1.0.20200506.tar.xz"
diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD
index db64e132e..219a91836 100644
--- a/user/wireguard-tools/APKBUILD
+++ b/user/wireguard-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Luis Ressel <aranea@aixah.de>
-# Maintainer: Luis Ressel <aranea@aixah.de>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=wireguard-tools
-pkgver=1.0.20200319
+pkgver=1.0.20200513
 pkgrel=0
 pkgdesc="Userland tools for the WireGuard VPN"
 url="https://www.wireguard.com/"
@@ -29,4 +29,4 @@ bashcomp() {
 	mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/"
 }
 
-sha512sums="d5bcd153f9b10f184b9a1bf9a81f33a9713ab4863ab5aa190eac60e92919756c8fecbb0d3cfb83bae20ac78fc43fdd7168f37294cdd7c5ee21f2a1b2db5fdf41  wireguard-tools-1.0.20200319.tar.xz"
+sha512sums="4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c  wireguard-tools-1.0.20200513.tar.xz"