aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-02-18 15:25:24 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-02-19 12:04:10 -0300
commit40ecb4d9422fa1239e67388fe9ad532b730fa87d (patch)
tree2497cf1d73975cd60c7a08091453f460d7445d10
parentdd7c7a22bfecbb7434ea15ef16db36c8e2787dd2 (diff)
downloadaports-40ecb4d9422fa1239e67388fe9ad532b730fa87d.tar.gz
aports-40ecb4d9422fa1239e67388fe9ad532b730fa87d.tar.bz2
aports-40ecb4d9422fa1239e67388fe9ad532b730fa87d.tar.xz
main/avahi: upgrade to 0.8
-rw-r--r--main/avahi/APKBUILD14
-rw-r--r--main/avahi/CVE-2017-6519-and-CVE-2018-1000845.patch27
2 files changed, 7 insertions, 34 deletions
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 4f68d80dff..2651e43e26 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=avahi
-pkgver=0.7
-pkgrel=4
+pkgver=0.8
+pkgrel=0
pkgdesc="A multicast/unicast DNS-SD framework"
url="https://www.avahi.org/"
arch="all"
@@ -12,14 +12,14 @@ depends_dev="gdbm-dev"
makedepends="$depends_dev
intltool gobject-introspection-dev expat-dev
libdaemon-dev glib-dev dbus-dev libcap-dev
- gettext-dev autoconf automake libtool"
+ gettext-dev autoconf automake libtool
+ libevent-dev"
install="$pkgname.pre-install"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-glib
$pkgname-libs $pkgname-compat-howl:howl
$pkgname-compat-libdns_sd:lidns_sd $pkgname-lang
"
source="https://github.com/lathiat/avahi/releases/download/v$pkgver/avahi-$pkgver.tar.gz
- CVE-2017-6519-and-CVE-2018-1000845.patch
"
# secfixes:
@@ -34,6 +34,7 @@ prepare() {
build() {
# we dont build autoipd since dhcpcd does same job
+ LDFLAGS="$LDFLAGS -lintl" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -43,12 +44,12 @@ build() {
--disable-autoipd \
--disable-qt3 \
--disable-qt4 \
+ --disable-qt5 \
--disable-gtk \
--disable-gtk3 \
--disable-mono \
--disable-monodoc \
--disable-doxygen-doc \
- --disable-pygtk \
--disable-xmltoman \
--enable-compat-libdns_sd \
--enable-compat-howl \
@@ -115,5 +116,4 @@ lidns_sd() {
"$subpkgdir"/usr/lib/
}
-sha512sums="bae5a1e9204aca90b90e7fd223d19e809e3514d03ba5fa2da1e55bf1d72d3d3b98567f357900c36393613dc17dc98e15ff3ebf0f226f2f6b9766e592452a6ce7 avahi-0.7.tar.gz
-dc5c9fde8d1244e70e3cf1c09bc274b094458d2fad982f5a79bcbf3cbddc43a0cf79e9ba106b3b0446a6f0b006fd3beeee48a03bd3d8a06cf8d9821f6945ffed CVE-2017-6519-and-CVE-2018-1000845.patch"
+sha512sums="c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de avahi-0.8.tar.gz"
diff --git a/main/avahi/CVE-2017-6519-and-CVE-2018-1000845.patch b/main/avahi/CVE-2017-6519-and-CVE-2018-1000845.patch
deleted file mode 100644
index 513489fa5b..0000000000
--- a/main/avahi/CVE-2017-6519-and-CVE-2018-1000845.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/avahi-core/server.c b/avahi-core/server.c
-index a2cb19a..a2580e3 100644
---- a/avahi-core/server.c
-+++ b/avahi-core/server.c
-@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
-
- if (avahi_dns_packet_is_query(p)) {
- int legacy_unicast = 0;
-+ char t[AVAHI_ADDRESS_STR_MAX];
-
- /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the
- * AR section completely here, so far. Until the day we add
-@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
- legacy_unicast = 1;
- }
-
-+ if (!is_mdns_mcast_address(dst_address) &&
-+ !avahi_interface_address_on_link(i, src_address)) {
-+
-+ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
-+ return;
-+ }
-+
- if (legacy_unicast)
- reflect_legacy_unicast_query_packet(s, p, i, src_address, port);
-
-