summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--experimental/horizon/noninstall-mount.patch61
-rw-r--r--system/execline/APKBUILD4
-rw-r--r--system/skalibs/APKBUILD4
-rw-r--r--user/dovecot/APKBUILD12
-rw-r--r--user/horizon/APKBUILD (renamed from experimental/horizon/APKBUILD)18
-rw-r--r--user/netqmail/0005-CVE-2005-1513.patch19
-rw-r--r--user/netqmail/APKBUILD4
-rw-r--r--user/wireguard-module/APKBUILD6
-rw-r--r--user/wireguard-tools/APKBUILD6
9 files changed, 50 insertions, 84 deletions
diff --git a/experimental/horizon/noninstall-mount.patch b/experimental/horizon/noninstall-mount.patch
deleted file mode 100644
index 2b0e7152a..000000000
--- a/experimental/horizon/noninstall-mount.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc
-index 143ae43..556a6f3 100644
---- a/ui/qt5/horizonwizard.cc
-+++ b/ui/qt5/horizonwizard.cc
-@@ -542,7 +542,9 @@ QString HorizonWizard::toHScript() {
- break;
- }
-
-+#ifdef HAS_INSTALL_ENV
- part_lines << (dynamic_cast<PartitionMountPage *>(page(Page_PartitionMount)))->mountLines();
-+#endif /* HAS_INSTALL_ENV */
-
- if(chosen_disk.empty()) {
- lines << part_lines;
-diff --git a/ui/qt5/mountdialog.cc b/ui/qt5/mountdialog.cc
-index f986423..103e442 100644
---- a/ui/qt5/mountdialog.cc
-+++ b/ui/qt5/mountdialog.cc
-@@ -16,6 +16,7 @@
- #include <QLabel>
- #include <QLineEdit>
- #include <QPushButton>
-+#include <QSet>
- #include <QVBoxLayout>
-
- MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
-@@ -75,7 +76,11 @@ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
-
- QVBoxLayout *controlLayout = new QVBoxLayout;
- controlLayout->addWidget(new QLabel(tr("Partition")));
-+#ifdef HAS_INSTALL_ENV
- controlLayout->addWidget(partList);
-+#else /* !HAS_INSTALL_ENV */
-+ controlLayout->addWidget(partInput);
-+#endif /* HAS_INSTALL_ENV */
- controlLayout->addWidget(new QLabel(tr("will be mounted on")));
- controlLayout->addWidget(pathInput);
-
-@@ -87,14 +92,22 @@ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
- }
-
- QString MountDialog::partition() const {
-+#ifdef HAS_INSTALL_ENV
- assert(partList->currentItem() != nullptr);
- return partList->currentItem()->text();
-+#else /* !HAS_INSTALL_ENV */
-+ return partInput->text();
-+#endif /* HAS_INSTALL_ENV */
- }
-
- void MountDialog::setPartition(const QString &part) {
-+#ifdef HAS_INSTALL_ENV
- QList<QListWidgetItem *> candidate = partList->findItems(part, Qt::MatchExactly);
- if(candidate.empty()) return;
- partList->setCurrentItem(candidate.at(0));
-+#else /* !HAS_INSTALL_ENV */
-+ partInput->setText(part);
-+#endif /* HAS_INSTALL_ENV */
- }
-
- QString MountDialog::mountPoint() const {
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 252daeb63..bc7328ea3 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=execline
-pkgver=2.6.0.0
+pkgver=2.6.0.2
pkgrel=0
pkgdesc="A small scripting language for non-interactive scripts"
url="https://skarnet.org/software/$pkgname/"
@@ -62,4 +62,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="890a533a6ffad98b066adda34ae4a7e69daa98950974fcdb4635cff4c8957851b7fc6beaf25802c7ed5085285fc9b2aa9d9806afdb1aaa6884745a978b969f7a execline-2.6.0.0.tar.gz"
+sha512sums="915823af0d557fc7a181e088ce319568e62ea4bf743704e498786422c97b991e6b09447c7cff7d7dda520d391773ef4b2fea68e44479c02766966256719bb4c0 execline-2.6.0.2.tar.gz"
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index ada2b303c..129fa7e79 100644
--- a/system/skalibs/APKBUILD
+++ b/system/skalibs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=skalibs
-pkgver=2.9.2.0
+pkgver=2.9.2.1
pkgrel=0
pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
url="https://skarnet.org/software/skalibs/"
@@ -57,4 +57,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="a351cb8d048cefa495cc35fd2758579879d5ac11d2a1fc00c694d5655aa9e430228517c01fc91bdbc70c3992f73429a68a5365cb46039a7b7bb11358f0f4506d skalibs-2.9.2.0.tar.gz"
+sha512sums="bd507faf30f0564fb8d3e5f86de04ab4b39961dab2497ba9f4a81980a57f7ff68cad366b9847b25d555b5b9263460d13f096e1774d080d1d286979f2e7324c54 skalibs-2.9.2.1.tar.gz"
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/experimental/horizon/APKBUILD b/user/horizon/APKBUILD
index 9c1d39ee7..7f8c04e21 100644
--- a/experimental/horizon/APKBUILD
+++ b/user/horizon/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=horizon
-pkgver=0.9.0
+pkgver=0.9.1
pkgrel=0
pkgdesc="Installation tools for Adélie Linux"
url="https://horizon.adelielinux.org/"
arch="all"
-options="!check" # Unpackaged dependency ruby-aruba.
+options="!archcheck !check" # Unpackaged dependency ruby-aruba.
license="AGPL-3.0+"
depends=""
checkdepends="ruby-aruba ruby-rspec valgrind"
@@ -15,11 +15,9 @@ 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-dev $pkgname-doc $pkgname-image $pkgname-qt5
+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
- noninstall-mount.patch
- "
+source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -61,15 +59,19 @@ package() {
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
@@ -90,11 +92,9 @@ wizard() {
pkgdesc="Wizard to generate a HorizonScript for another computer"
make DESTDIR="$subpkgdir" -C "$builddir"/build-wizard install
- rm "$subpkgdir"/usr/bin/hscript-printowner
rm -r "$subpkgdir"/usr/include
rm -r "$subpkgdir"/usr/lib
rm -r "$subpkgdir"/usr/share
}
-sha512sums="a2185744b611154f41ba433399f621c8114147bc981dad03fac581bf7ddd67c46042bc230fd68d4c89188cefa281022d101d7394cf1a0554729da540706e6216 horizon-0.9.0.tar.xz
-44a4f022df03a3ac3ec9fe3aea9faa8d98ed6c9b61ff50e3c363f5691a2ed428d328f6d5aa019f25be67811dede8da7195eaf354f1cd3a4a56c77f698d53e7fb noninstall-mount.patch"
+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"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-23 03:55:25 +0000