From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F0CB15838C for ; Wed, 17 Jan 2024 05:47:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABBFAE2AAD; Wed, 17 Jan 2024 05:47:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80BF0E2AAD for ; Wed, 17 Jan 2024 05:47:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96E5334334F for ; Wed, 17 Jan 2024 05:47:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2ED914B4 for ; Wed, 17 Jan 2024 05:47:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705470303.1b7f453040380117f1789c851411e5157f0da93a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-mdns/, sys-auth/nss-mdns/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/nss-mdns/files/lld-17-undefined-versioned-symbols.patch sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild X-VCS-Directories: sys-auth/nss-mdns/files/ sys-auth/nss-mdns/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1b7f453040380117f1789c851411e5157f0da93a X-VCS-Branch: master Date: Wed, 17 Jan 2024 05:47:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 32a8a6ca-b14a-49ae-b897-a50a754b572a X-Archives-Hash: b37db1b339c9d7d80ec091871a28b3c5 commit: 1b7f453040380117f1789c851411e5157f0da93a Author: Nicholas Vinson gmail com> AuthorDate: Sun Jan 14 14:26:37 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 17 05:45:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7f4530 sys-auth/nss-mdns: Apply upstream ver. sym. patch Update ebuild to apply proposed lld-17 version symbol patch from upstream. The upstream patch splits the symbol map into multiple files with each file tailored to its corresponding shared library. Upstream PR: https://github.com/avahi/nss-mdns/pull/93 Bug: https://bugs.gentoo.org/919484 Signed-off-by: Nicholas Vinson gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34798 Signed-off-by: Sam James gentoo.org> .../files/lld-17-undefined-versioned-symbols.patch | 160 +++++++++++++++++++++ sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild | 13 +- 2 files changed, 171 insertions(+), 2 deletions(-) diff --git a/sys-auth/nss-mdns/files/lld-17-undefined-versioned-symbols.patch b/sys-auth/nss-mdns/files/lld-17-undefined-versioned-symbols.patch new file mode 100644 index 000000000000..905e41853871 --- /dev/null +++ b/sys-auth/nss-mdns/files/lld-17-undefined-versioned-symbols.patch @@ -0,0 +1,160 @@ +Gentoo bug: https://bugs.gentoo.org/919484 +Upstream PR: https://github.com/avahi/nss-mdns/pull/93 +diff --git a/Makefile.am b/Makefile.am +index d5a83c1..6df75f3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -17,9 +17,6 @@ + EXTRA_DIST=bootstrap.sh README.md ACKNOWLEDGEMENTS.md NEWS.md LICENSE + ACLOCAL_AMFLAGS=-I m4 + +-# src +-EXTRA_DIST += src/map-file +- + AM_CFLAGS = \ + -DMDNS_ALLOW_FILE=\"$(MDNS_ALLOW_FILE)\" \ + -DAVAHI_SOCKET=\"$(AVAHI_SOCKET)\" +@@ -47,29 +44,53 @@ endif + + check_PROGRAMS = nss-test avahi-test + ++src/libnss-mdns-la-map-file: $(srcdir)/src/map-file.in $(srcdir)/src/nss.h ++ $(COMPILE) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(libnss_mdns_la_CFLAGS) -E -x assembler-with-cpp -DVER_SYM_MAP_GEN -o $@ $< ++ ++src/libnss-mdns-minimal-la-map-file: $(srcdir)/src/map-file.in $(srcdir)/src/nss.h ++ $(COMPILE) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(libnss_mdns_minimal_la_CFLAGS) -E -x assembler-with-cpp -DVER_SYM_MAP_GEN -o $@ $< ++ ++src/libnss-mdns4-la-map-file: $(srcdir)/src/map-file.in $(srcdir)/src/nss.h ++ $(COMPILE) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(libnss_mdns4_la_CFLAGS) -E -x assembler-with-cpp -DVER_SYM_MAP_GEN -o $@ $< ++ ++src/libnss-mdns4-minimal-la-map-file: $(srcdir)/src/map-file.in $(srcdir)/src/nss.h ++ $(COMPILE) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(libnss_mdns4_minimal_la_CFLAGS) -E -x assembler-with-cpp -DVER_SYM_MAP_GEN -o $@ $< ++ ++src/libnss-mdns6-la-map-file: $(srcdir)/src/map-file.in $(srcdir)/src/nss.h ++ $(COMPILE) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(libnss_mdns6_la_CFLAGS) -E -x assembler-with-cpp -DVER_SYM_MAP_GEN -o $@ $< ++ ++src/libnss-mdns6-minimal-la-map-file: $(srcdir)/src/map-file.in $(srcdir)/src/nss.h ++ $(COMPILE) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(libnss_mdns6_minimal_la_CFLAGS) -E -x assembler-with-cpp -DVER_SYM_MAP_GEN -o $@ $< ++ + libnss_mdns_la_SOURCES=src/util.c src/util.h src/avahi.c src/avahi.h src/nss.c src/nss.h ++EXTRA_libnss_mdns_la_DEPENDENCIES=src/libnss-mdns-la-map-file + libnss_mdns_la_CFLAGS=$(AM_CFLAGS) +-libnss_mdns_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=$(srcdir)/src/map-file ++libnss_mdns_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=src/libnss-mdns-la-map-file + + libnss_mdns_minimal_la_SOURCES=$(libnss_mdns_la_SOURCES) ++EXTRA_libnss_mdns_minimal_la_DEPENDENCIES=src/libnss-mdns-minimal-la-map-file + libnss_mdns_minimal_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DMDNS_MINIMAL +-libnss_mdns_minimal_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS) ++libnss_mdns_minimal_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=src/libnss-mdns-minimal-la-map-file + + libnss_mdns4_la_SOURCES=$(libnss_mdns_la_SOURCES) ++EXTRA_libnss_mdns4_la_DEPENDENCIES=src/libnss-mdns4-la-map-file + libnss_mdns4_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DNSS_IPV4_ONLY=1 +-libnss_mdns4_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS) ++libnss_mdns4_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=src/libnss-mdns4-la-map-file + + libnss_mdns4_minimal_la_SOURCES=$(libnss_mdns_la_SOURCES) ++EXTRA_libnss_mdns4_minimal_la_DEPENDENCIES=src/libnss-mdns4-minimal-la-map-file + libnss_mdns4_minimal_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DNSS_IPV4_ONLY=1 -DMDNS_MINIMAL +-libnss_mdns4_minimal_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS) ++libnss_mdns4_minimal_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=src/libnss-mdns4-minimal-la-map-file + + libnss_mdns6_la_SOURCES=$(libnss_mdns_la_SOURCES) ++EXTRA_libnss_mdns6_la_DEPENDENCIES=src/libnss-mdns6-la-map-file + libnss_mdns6_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DNSS_IPV6_ONLY=1 +-libnss_mdns6_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS) ++libnss_mdns6_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=src/libnss-mdns6-la-map-file + + libnss_mdns6_minimal_la_SOURCES=$(libnss_mdns_la_SOURCES) ++EXTRA_libnss_mdns6_minimal_la_DEPENDENCIES=src/libnss-mdns6-minimal-la-map-file + libnss_mdns6_minimal_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DNSS_IPV6_ONLY=1 -DMDNS_MINIMAL +-libnss_mdns6_minimal_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS) ++libnss_mdns6_minimal_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=src/libnss-mdns6-minimal-la-map-file + + nss_mdns_la_SOURCES=$(libnss_mdns_la_SOURCES) src/bsdnss.c + nss_mdns_la_CFLAGS=$(AM_CFLAGS) +diff --git a/src/map-file b/src/map-file +deleted file mode 100644 +index 69e7987..0000000 +--- a/src/map-file ++++ /dev/null +@@ -1,41 +0,0 @@ +-NSSMDNS_0 { +-global: +- +-_nss_mdns_gethostbyaddr_r; +-_nss_mdns4_gethostbyaddr_r; +-_nss_mdns6_gethostbyaddr_r; +-_nss_mdns_minimal_gethostbyaddr_r; +-_nss_mdns4_minimal_gethostbyaddr_r; +-_nss_mdns6_minimal_gethostbyaddr_r; +- +-_nss_mdns_gethostbyname_r; +-_nss_mdns4_gethostbyname_r; +-_nss_mdns6_gethostbyname_r; +-_nss_mdns_minimal_gethostbyname_r; +-_nss_mdns4_minimal_gethostbyname_r; +-_nss_mdns6_minimal_gethostbyname_r; +- +-_nss_mdns_gethostbyname2_r; +-_nss_mdns4_gethostbyname2_r; +-_nss_mdns6_gethostbyname2_r; +-_nss_mdns_minimal_gethostbyname2_r; +-_nss_mdns4_minimal_gethostbyname2_r; +-_nss_mdns6_minimal_gethostbyname2_r; +- +-_nss_mdns_gethostbyname3_r; +-_nss_mdns4_gethostbyname3_r; +-_nss_mdns6_gethostbyname3_r; +-_nss_mdns_minimal_gethostbyname3_r; +-_nss_mdns4_minimal_gethostbyname3_r; +-_nss_mdns6_minimal_gethostbyname3_r; +- +-_nss_mdns_gethostbyname4_r; +-_nss_mdns4_gethostbyname4_r; +-_nss_mdns6_gethostbyname4_r; +-_nss_mdns_minimal_gethostbyname4_r; +-_nss_mdns4_minimal_gethostbyname4_r; +-_nss_mdns6_minimal_gethostbyname4_r; +- +-local: +-*; +-}; +diff --git a/src/map-file.in b/src/map-file.in +new file mode 100644 +index 0000000..caecf41 +--- /dev/null ++++ b/src/map-file.in +@@ -0,0 +1,14 @@ ++NSSMDNS_0 { ++global: ++ ++#include "nss.h" ++ ++_nss_mdns_gethostbyaddr_r; ++_nss_mdns_gethostbyname2_r; ++_nss_mdns_gethostbyname3_r; ++_nss_mdns_gethostbyname4_r; ++_nss_mdns_gethostbyname_r; ++ ++local: ++*; ++}; +diff --git a/src/nss.h b/src/nss.h +index dd8dbff..d63f51c 100644 +--- a/src/nss.h ++++ b/src/nss.h +@@ -33,6 +33,7 @@ + #define _nss_mdns_gethostbyaddr_r _nss_mdns_minimal_gethostbyaddr_r + #endif + ++#ifndef VER_SYM_MAP_GEN + // Define prototypes for nss function we're going to export (fixes GCC warnings) + #ifndef __FreeBSD__ + enum nss_status _nss_mdns_gethostbyname4_r(const char*, struct gaih_addrtuple**, +@@ -50,3 +51,4 @@ enum nss_status _nss_mdns_gethostbyaddr_r(const void*, int, int, + int*); + + #endif ++#endif diff --git a/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild b/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild index 13fffc2c4aae..3a3ef1f43012 100644 --- a/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild +++ b/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="Name Service Switch module for Multicast DNS" HOMEPAGE="https://github.com/lathiat/nss-mdns" @@ -18,6 +18,15 @@ RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} test? ( >=dev-libs/check-0.11[${MULTILIB_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/lld-17-undefined-versioned-symbols.patch +) + +src_prepare() { + default + eautoreconf +} + multilib_src_configure() { local myconf=( # $(localstatedir)/run/... is used to locate avahi-daemon socket