commit: d3d7b027d9aca15bbc93e1037b43eb6a54f931ad Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Aug 1 21:17:43 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Aug 1 21:17:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d7b027
media-libs/liblo: Remove old Closes: https://bugs.gentoo.org/688576 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-libs/liblo/Manifest | 1 - .../liblo/files/liblo-0.29-ipv6_build_fix.patch | 133 --------------------- media-libs/liblo/liblo-0.29.ebuild | 48 -------- 3 files changed, 182 deletions(-) diff --git a/media-libs/liblo/Manifest b/media-libs/liblo/Manifest index 3f680f0d105..bd9d2de3df3 100644 --- a/media-libs/liblo/Manifest +++ b/media-libs/liblo/Manifest @@ -1,2 +1 @@ -DIST liblo-0.29.tar.gz 645313 BLAKE2B 2ef68c49446c83e13541e626eb666360f4b1b579abd2685a9eeaf18989e0252860a7c2eb99e9f6991210873b60dd4b0a62f4f2adfe88c8ac2e069b41fea0e2d4 SHA512 11e20725a049c55c02ef8cd106be5802507f3df95422d8dad10009bdd1237af7517e3261c7336c3005e21ae8fd1e663badef46e4bae006c7af70520bdb336c7c DIST liblo-0.30.tar.gz 641498 BLAKE2B d884cc723d770f45414e838b6f2520c1f3b2a11972a9977d19b20ba68bc653f895eeb21ba0182a09fde1f096c9be084def1572f747463cd71e96bf0022ef7549 SHA512 51132933cc23237b70ed08fa7986a4a9f838529b83807746b358bcc171f8bbce7f37115b7c855520c9219bae93c74e502aebfb90e44dabdc6d0a00b8335336e3 diff --git a/media-libs/liblo/files/liblo-0.29-ipv6_build_fix.patch b/media-libs/liblo/files/liblo-0.29-ipv6_build_fix.patch deleted file mode 100644 index 484fddbd603..00000000000 --- a/media-libs/liblo/files/liblo-0.29-ipv6_build_fix.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 968dff4d576ca102525c81beddb36a623890424b Mon Sep 17 00:00:00 2001 -From: Stephen Sinclair <[email protected]> -Date: Tue, 29 Aug 2017 14:32:24 -0300 -Subject: [PATCH] Resolve hostname using getnameinfo for ipv6 support. - -Iterates on interfaces, possibly searching for a pre-selected -interface, and resolves the hostname associated with non-localhost -addresses. - -Fixes #56, fix compilation with --enable-ipv6. ---- - src/server.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------- - src/testlo.c | 7 ++++++ - 2 files changed, 72 insertions(+), 9 deletions(-) - -diff --git a/src/server.c b/src/server.c -index cf20495..4aff673 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -55,6 +55,10 @@ - #endif - #include <sys/un.h> - #include <arpa/inet.h> -+#include <netinet/in.h> -+#ifdef HAVE_GETIFADDRS -+#include <ifaddrs.h> -+#endif - #endif - - #if defined(WIN32) || defined(_MSC_VER) -@@ -298,20 +302,72 @@ void lo_server_resolve_hostname(lo_server s) - /* Set hostname to empty string */ - hostname[0] = '\0'; - --#ifdef ENABLE_IPV6 -+#if defined(ENABLE_IPV6) && defined(HAVE_GETIFADDRS) - /* Try it the IPV6 friendly way first */ -- for (it = ai; it; it = it->ai_next) { -- if (getnameinfo(it->ai_addr, it->ai_addrlen, hostname, -- sizeof(hostname), NULL, 0, NI_NAMEREQD) == 0) { -+ do { -+ struct ifaddrs *ifa, *ifa_list; -+ if (getifaddrs(&ifa_list)) - break; -+ ifa = ifa_list; -+ -+ while (ifa) { -+ if (!ifa->ifa_addr) { -+ ifa = ifa->ifa_next; -+ continue; -+ } -+ -+ if (s->addr_if.iface) { -+ if (s->addr_if.size == sizeof(struct in_addr) -+ && (ifa->ifa_addr->sa_family == AF_INET)) -+ { -+ struct sockaddr_in *sin = (struct sockaddr_in*)ifa->ifa_addr; -+ if (memcmp(&sin->sin_addr, &s->addr_if.a.addr, sizeof(struct in_addr))!=0 -+ || (s->addr_if.iface && ifa->ifa_name -+ && strcmp(s->addr_if.iface, ifa->ifa_name)!=0)) -+ { -+ ifa = ifa->ifa_next; -+ continue; -+ } -+ } -+ else if (s->addr_if.size == sizeof(struct in6_addr) -+ && (ifa->ifa_addr->sa_family == AF_INET6)) -+ { -+ struct sockaddr_in6 *sin = (struct sockaddr_in6*)ifa->ifa_addr; -+ if (memcmp(&sin->sin6_addr, &s->addr_if.a.addr6, -+ sizeof(struct in6_addr))!=0 -+ || (s->addr_if.iface && ifa->ifa_name -+ && strcmp(s->addr_if.iface, ifa->ifa_name)!=0)) -+ { -+ ifa = ifa->ifa_next; -+ continue; -+ } -+ } -+ } -+ -+ if ((ifa->ifa_addr->sa_family == AF_INET -+ && (!s->addr_if.iface || s->addr_if.size == sizeof(struct in_addr)) -+ && (getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), hostname, -+ sizeof(hostname), NULL, 0, NI_NAMEREQD) == 0)) -+ || (ifa->ifa_addr->sa_family == AF_INET6 -+ && (!s->addr_if.iface || s->addr_if.size == sizeof(struct in6_addr)) -+ && (getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), hostname, -+ sizeof(hostname), NULL, 0, NI_NAMEREQD) == 0))) -+ { -+ /* check to make sure getnameinfo() didn't just set the hostname to "::". -+ Needed on Darwin. */ -+ if (hostname[0] == ':') -+ hostname[0] = '\0'; -+ else if (strcmp(hostname, "localhost")==0) -+ hostname[0] = '\0'; -+ else -+ break; -+ } -+ ifa = ifa->ifa_next; - } -- } - -- /* check to make sure getnameinfo() didn't just set the hostname to "::". -- Needed on Darwin. */ -- if (hostname[0] == ':') { -- hostname[0] = '\0'; -+ freeifaddrs(ifa_list); - } -+ while (0); - #endif - - /* Fallback to the oldschool (i.e. more reliable) way */ -diff --git a/src/testlo.c b/src/testlo.c -index c128d10..c69570c 100644 ---- a/src/testlo.c -+++ b/src/testlo.c -@@ -704,6 +704,13 @@ void test_multicast(lo_server_thread st) - - DOING("test_multicast"); - -+#ifdef ENABLE_IPV6 -+ // Print a warning but we let it fail, prefer to actually fix IPv6 -+ // support rather than just skip the test! -+ printf("WARNING: Compiled with --enable-ipv6, multicast not supported;" -+ "failure expected.\n"); -+#endif -+ - /* test multicast server and sender */ - /* message is sent from st otherwise reply doesn't work */ - ms = lo_server_new_multicast("224.0.1.1", "15432", error); --- -2.14.1 - diff --git a/media-libs/liblo/liblo-0.29.ebuild b/media-libs/liblo/liblo-0.29.ebuild deleted file mode 100644 index 034568c3215..00000000000 --- a/media-libs/liblo/liblo-0.29.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools ltprune - -DESCRIPTION="Lightweight OSC (Open Sound Control) implementation" -HOMEPAGE="http://plugin.org.uk/liblo"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos" -IUSE="doc ipv6 static-libs" - -RESTRICT="test" - -DEPEND="doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/${P}-ipv6_build_fix.patch" #627832 -) - -src_prepare() { - default - - # don't build examples by default - sed -i '/^SUBDIRS =/s/examples//' Makefile.am || die - - eautoreconf -} - -src_configure() { - use doc || export ac_cv_prog_HAVE_DOXYGEN=false - - # switching threads on/off breaks ABI, bugs #473282, #473286 and #473356 - myeconfargs=( - --enable-threads - $(use_enable ipv6) - $(use_enable static-libs static) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - prune_libtool_files -}
