aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2021-04-09 06:44:00 +0000
committerAriadne Conill <ariadne@dereferenced.org>2021-04-27 08:49:33 -0600
commit111512222b08b35c1dc8ec27dca2db924a2b01fd (patch)
tree9989a1e079b29071ae0ee9a8f370e211fa08338b
parent26915bc124b9b2301b19fac4b5e16a5e947499ea (diff)
downloadaports-111512222b08b35c1dc8ec27dca2db924a2b01fd.tar.gz
aports-111512222b08b35c1dc8ec27dca2db924a2b01fd.tar.bz2
aports-111512222b08b35c1dc8ec27dca2db924a2b01fd.tar.xz
main/dnsmasq: security upgrade to 2.85 (CVE-2021-3448)
Backport of: main/dnsmasq: upgrade to 2.85 main/dnsmasq: add coreutils to makedepends to fix --version option main/dnsmasq: update url and secfixes
-rw-r--r--main/dnsmasq/APKBUILD12
1 files changed, 7 insertions, 5 deletions
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index ff63805262..e994976549 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -2,6 +2,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
#
# secfixes:
+# 2.85-r0:
+# - CVE-2021-3448
# 2.83-r0:
# - CVE-2020-25681
# - CVE-2020-25682
@@ -24,18 +26,18 @@
# - CVE-2017-14496
#
pkgname=dnsmasq
-pkgver=2.83
+pkgver=2.85
pkgrel=0
pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
-url="http://www.thekelleys.org.uk/dnsmasq/"
+url="https://www.thekelleys.org.uk/dnsmasq/"
arch="all"
license="GPL-2.0-only OR GPL-3.0-only"
depends="!$pkgname-dnssec"
-makedepends="linux-headers nettle-dev"
+makedepends="linux-headers nettle-dev coreutils"
install="$pkgname.pre-install $pkgname.pre-upgrade
$pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade"
subpackages="$pkgname-doc $pkgname-dnssec"
-source="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.gz
+source="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.xz
$pkgname.initd
$pkgname.confd
uncomment-conf-dir.patch
@@ -77,7 +79,7 @@ dnssec() {
cp -r "$pkgdir"/etc "$subpkgdir"/etc
}
-sha512sums="bdd6e701317b7a0191625c7d1983b64d4f4e49f3e2d192ca799397d9a8ab5a788542000888d9e0c32d5394622c311b4c191baa392be06ebbf953ebc887b96745 dnsmasq-2.83.tar.gz
+sha512sums="8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09 dnsmasq-2.85.tar.xz
a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch"