Merge branch 'edge' into next

4 files changed, 2 insertions, 60 deletions

diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest
index 3f12c65418a9..21b20533d07f 100644
--- a/net-libs/libmicrodns/Manifest
+++ b/net-libs/libmicrodns/Manifest
@@ -1,7 +1,4 @@
-AUX libmicrodns-0.0.9-null-addr-fix.patch 945 BLAKE2B 40b777b9d0d1a781d1ee3ff82a2370d0ca414c687d665b0df1aa9750e9bde79c027e661c9ead963edb366858c46f6118139903f77d8d4ef99df99b8c28d28268 SHA512 83ef122e8192f34608965e9d6a479ce73abf98c28028f5749e0c53cc677225fae25f501573b671425754b14fb1b871a29caff6e116ed19700cae464b4b7b4236
-DIST libmicrodns-0.0.9.tar.gz 57333 BLAKE2B a9e1d099d4588863dee3c2735a2e3f9cd46212729c342e06cccad1a8e997e85964e7f917ce97f50c0cccd21c1662ef9baf7392333ea666ff65b0577f57bab692 SHA512 6f7dbf1a324fed847131745498895ab0773dfc3c7bb96a05bf0fd3df0c0ce19d7f607789f7a5350d34e91e7ba323ee57196eb37ce351f83a9faa82c5fc8d89a8
 DIST microdns-0.1.2.tar.xz 49420 BLAKE2B 247a82c3bb038487390ba967387e9d4cec638ee5315290387c5b8863afbd45cc0700a3ee6c0308db253a161b5c1d345f77808de96df3f31bfaa2ff74e8fa3c05 SHA512 a6b15c65c74560fdba8973c63ffae9cdde4445f54196bb2d7d6348f6c15f8f162ef0a4e91b969ea3f2a60c701c3cc72799fcfba2fbf08c37f71ba8d5e3409702
-EBUILD libmicrodns-0.0.9.ebuild 623 BLAKE2B e2ccbc10fbb88ce50c749c541ed0f2121f155574b7d6f271c4da066b68456383974aeb8afe29c3647fde4e0739e201cb18ce3d5591aca776102d8ef298f03136 SHA512 d8544763e8ac77dc829bab6b04f4b6b886ef4922c4f2c4fe16d0f10a494a02be6cb8f7cf0a977fe6971eebfd2e82277fad167daf580f24612f9cee37db5a6e6c
-EBUILD libmicrodns-0.1.2.ebuild 730 BLAKE2B fc009b288958e4452ae2ce696582b16852f47ead90c13f8626a316b3eb67eac6f85ab784fa3ce10267befe6bdc12bbbd17b3958c55707a63da0fa86471e4726b SHA512 7438da9899534764cd8325b80b54be10107162663426ad072f6aaeda422f9a22bcd8353fcb27c6aa33ac6aa59f1cff6cf4b06b26ea5d1f02afce76e6efca839b
+EBUILD libmicrodns-0.1.2.ebuild 725 BLAKE2B dd81aad3f6e4d6522791f1e0fa7860f6caeefa713ebf2535f39c5dca977e8fd283f0f66f778159e128ee74ed04b53c40a875e054a56a4aeed5b1d5c2f76baad4 SHA512 1423533662f14484827d02c23392e5df339f9474f14ac106ea380a8b54b7ba2370062a2014d783358850fb4a7502a2494c40db397e68d288987d5888508874b6
 EBUILD libmicrodns-9999.ebuild 730 BLAKE2B fc009b288958e4452ae2ce696582b16852f47ead90c13f8626a316b3eb67eac6f85ab784fa3ce10267befe6bdc12bbbd17b3958c55707a63da0fa86471e4726b SHA512 7438da9899534764cd8325b80b54be10107162663426ad072f6aaeda422f9a22bcd8353fcb27c6aa33ac6aa59f1cff6cf4b06b26ea5d1f02afce76e6efca839b
 MISC metadata.xml 430 BLAKE2B 94c8e7b19ca9899428db5b67c33d492423ab83f354e878271bdc6ce9b6602c78892b5069ce38032e837e68285c2979bfb43ea11650d734ae6061089a3f2d1232 SHA512 7ca90565928898c788ac8b87abff3909c5d1c0947c57e4ba30b0929a794ac943c20f2002601d2614dca35c2e3b09432653378bd66eaa6f53881c8cc6f86b892c
diff --git a/net-libs/libmicrodns/files/libmicrodns-0.0.9-null-addr-fix.patch b/net-libs/libmicrodns/files/libmicrodns-0.0.9-null-addr-fix.patch
deleted file mode 100644
index e2bb711c7c10..000000000000
--- a/net-libs/libmicrodns/files/libmicrodns-0.0.9-null-addr-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From efdf2754f9f8b801048b8fdae2b269f091128193 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Thu, 1 Mar 2018 02:58:13 +0100
-Subject: [PATCH] Fix more of the same crash
-
----
- src/mdns.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/mdns.c b/src/mdns.c
-index 132beef..55c5cb4 100644
---- a/src/mdns.c
-+++ b/src/mdns.c
-@@ -117,7 +117,9 @@ mdns_list_interfaces(multicast_if** pp_intfs, size_t* p_nb_intf, int ai_family)
-                 return (MDNS_ERROR);
-         }
-         for (c = ifs; c != NULL; c = c->ifa_next) {
--                if (c->ifa_addr->sa_family != ai_family || !mdns_is_interface_valuable(c))
-+                if (c->ifa_addr == NULL ||
-+                    c->ifa_addr->sa_family != ai_family ||
-+                    !mdns_is_interface_valuable(c))
-                         continue;
-                 memcpy(intfs, c->ifa_addr, sizeof(*intfs));
-                 intfs++;
diff --git a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
deleted file mode 100644
index c19ecde564f8..000000000000
--- a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Minimal mDNS resolver (and announcer) library"
-HOMEPAGE="https://videolabs.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
-else
-	SRC_URI="https://github.com/videolabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.0.9-null-addr-fix.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
index 0e1d2c1f619f..bcc2e9b5a6df 100644
--- a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
 	SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 	S="${WORKDIR}/${P/lib/}"
 fi