aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2018-10-19 02:12:21 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2018-11-08 23:05:49 +0100
commitb14fc437abacc82496ff9f347444eb0f5ebd2f3d (patch)
tree0f4a48bfcdbc740c247aec6e07b9cd3ea47646b9
parentc23f007bf3550cf68aa78c257fe8ba0ae5168524 (diff)
downloadaports-b14fc437abacc82496ff9f347444eb0f5ebd2f3d.tar.bz2
main/dnsmasq: upgrade to 2.80
-rw-r--r--main/dnsmasq/APKBUILD8
-rw-r--r--main/dnsmasq/uncomment-conf-dir.patch5
2 files changed, 8 insertions, 5 deletions
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index ac6f643..022c712 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -14,8 +14,8 @@
# - CVE-2017-14496
#
pkgname=dnsmasq
-pkgver=2.79
-pkgrel=2
+pkgver=2.80
+pkgrel=0
pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
url="http://www.thekelleys.org.uk/dnsmasq/"
arch="all"
@@ -73,7 +73,7 @@ dnssec() {
cp -r "$pkgdir"/etc "$subpkgdir"/etc
}
-sha512sums="c808abc8f24f302cac3609a78fa5a402019a397a248156cda9ce60e6cd706b9f689772af5301c8d1475c3cbbe39ea1528c1e1406f9ec0b7e8153a0899be02352 dnsmasq-2.79.tar.gz
+sha512sums="da50030ac96617fbb7d54d5ef02d2ed1e14ec1ebe0df49bc23a1509381bc1644cf6fb95ff72ed15e0ad1e9bd6aa11ec6e4dcabec8ebb152da0d84f9a4408565b dnsmasq-2.80.tar.gz
011d0bdf4c7e577be179bd455d5dfb71071ddbe5d63d76baec9425566f457775b8552d8c845eaeae49254deb431469ce9adbac510291247b7d30d3b62cb51dd4 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
-d01077f39e1240041a6700137810f254daf683b2d58dafecb6b162e94d694992e57d45964a57993b298f97c2b589eedcf9fb1506692730a38b7f06b5f55ba8d8 uncomment-conf-dir.patch"
+01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch"
diff --git a/main/dnsmasq/uncomment-conf-dir.patch b/main/dnsmasq/uncomment-conf-dir.patch
index 612a004..9b64427 100644
--- a/main/dnsmasq/uncomment-conf-dir.patch
+++ b/main/dnsmasq/uncomment-conf-dir.patch
@@ -1,8 +1,11 @@
--- a/dnsmasq.conf.example 2016-08-02 11:30:24.207034952 +0200
+++ b/dnsmasq.conf.example 2016-08-02 11:30:34.094695721 +0200
-@@ -663,4 +663,4 @@
+@@ -671,7 +671,7 @@
#conf-dir=/etc/dnsmasq.d,.bak
# Include all files in a directory which end in .conf
-#conf-dir=/etc/dnsmasq.d/,*.conf
+conf-dir=/etc/dnsmasq.d/,*.conf
+
+ # If a DHCP client claims that its name is "wpad", ignore that.
+ # This fixes a security hole. see CERT Vulnerability VU#598349