subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-auth\/nss\-mdns\/, sys\-auth\/nss\-mdns\/files\/"

[gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-mdns/, sys-auth/nss-mdns/files/

2024-01-16 Thread Sam James

commit: 1b7f453040380117f1789c851411e5157f0da93a
Author: Nicholas Vinson  gmail  com>
AuthorDate: Sun Jan 14 14:26:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 17 05:45:03 2024 +
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 ..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)

[gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-mdns/, sys-auth/nss-mdns/files/

2018-09-06 Thread Michał Górny

commit: 95b6bb2723c881536a35404b9f8f227b742a74c6
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Sep  6 20:54:19 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Sep  6 21:22:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b6bb27

sys-auth/nss-mdns: Clean old up

 sys-auth/nss-mdns/Manifest |   2 -
 .../files/nss-mdns-0.10-avahi-socket.patch |  14 -
 sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch   | 528 -
 sys-auth/nss-mdns/metadata.xml |   4 -
 sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild  |  57 ---
 sys-auth/nss-mdns/nss-mdns-0.11.ebuild |  54 ---
 6 files changed, 659 deletions(-)

diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index 821d3ef0c5f..b7a8af7b630 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -1,3 +1 @@
-DIST nss-mdns-0.10.tar.gz 353130 BLAKE2B 
88cc7cbc908f397bbf52f590946b3bc8bc4c71585c9a0a52648ae3dd23b3f5ca9fbd24f0fc7c34dff08d7a4c8d72fec94a51a65650bed41b07aec6c81220d517
 SHA512 
7c9f4150648dfab34bc6f8551e5b58b0b7065e4c1472efb8ce1b00b2bd75627e5928b2c199d9dae742abe839968a8774e39c7646f8ce855d342b4d90252efc0e
-DIST nss-mdns-0.11.tar.gz 382059 BLAKE2B 
5523c76d6f7364efde54b9bf303dfdf34c11b96c9348bfd4a62d095215e7d6f32e0d44e22d21677d51700d458a10f9c36f7ccecb7b4add04fcba629ee19abc21
 SHA512 
9dceb0f244c4cd27b04ca2014637873a0d137464c26780dfdb228502b06b310991494b115e42e1057c45478361d0e441ec73099fbf56a13a5933618b72390af4
 DIST nss-mdns-0.13.tar.gz 380261 BLAKE2B 
555b7b9df8ff15da423712fac04ccbc303395d38a07121906cf31871a8684c71e43809b80674a489d87397902a33f4d19b0ae49a4c384290bad227a24880476f
 SHA512 
f1b379111fb758323179ea3e447d754e934308940b11a8402dfb6033264940d831266d15ae1ee0badfecd5cdc7f589b42e4363dfc058f5e62026017d97eb0a3b

diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch 
b/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
deleted file mode 100644
index 9ada93d2b8f..000
--- a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/159341
-
-fix the full path to the socket run dir
-
 src/Makefile.am
-+++ src/Makefile.am
-@@ -20,7 +20,7 @@
- AM_CFLAGS = \
-   -DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
-   -DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
--  -DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"
-+  -DAVAHI_SOCKET=\"/var/run/avahi-daemon/socket\"
- 
- #AM_CFLAGS += -DNDEBUG=1 -Os

diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch 
b/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch
deleted file mode 100644
index 6d6dbc9eab5..000
--- a/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch
+++ /dev/null
@@ -1,528 +0,0 @@
-diff -u src/avahi.c src/avahi.c
 src/avahi.c2006-04-29 05:14:09.0 +0800
-+++ src/avahi.c2013-01-04 10:00:05.025558790 +0800
-@@ -26,6 +26,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -34,6 +35,7 @@
- 
- #include "avahi.h"
- #include "util.h"
-+#include "query.h"
- 
- #define WHITESPACE " \t"
- 
-@@ -93,7 +95,8 @@
- p = ln+1;
- p += strspn(p, WHITESPACE);
- 
--/* Skip interface */
-+/* Parse interface */
-+if (af == AF_INET6) ((ipv6_address_t*)data)->if_idx = strtoul(p, 0, 10);
- p += strcspn(p, WHITESPACE);
- p += strspn(p, WHITESPACE);
- 
-diff -u src/avahi-test.c src/avahi-test.c
 src/avahi-test.c   2007-02-09 00:42:23.0 +0800
-+++ src/avahi-test.c   2013-01-04 09:59:06.174017729 +0800
-@@ -24,6 +24,7 @@
- #include 
- 
- #include "avahi.h"
-+#include "query.h"
- 
- int main(int argc, char *argv[]) {
- uint8_t data[64];
-@@ -35,15 +36,20 @@
- else
- printf("AF_INET: failed (%i).\n", r);
- 
--/* if ((r = avahi_resolve_name(AF_INET6, argc >= 2 ? argv[1] : 
"cocaine.local", data)) == 0) */
--/* printf("AF_INET6: %s\n", inet_ntop(AF_INET6, data, t, sizeof(t))); 
*/
--/* else */
--/* printf("AF_INET6: failed (%i).\n", r); */
--
- if ((r = avahi_resolve_address(AF_INET, data, t, sizeof(t))) == 0)
- printf("REVERSE: %s\n", t);
- else
- printf("REVERSE: failed (%i).\n", r);
-+
-+ if ((r = avahi_resolve_name(AF_INET6, argc >= 2 ? argv[1] : 
"cocaine.local", data)) == 0)
-+ printf("AF_INET6: %s, %u\n", inet_ntop(AF_INET6, data, t, 
sizeof(t)), ((ipv6_address_t*)data)->if_idx);
-+ else
-+ printf("AF_INET6: failed (%i).\n", r);
-+
-+if ((r = avahi_resolve_address(AF_INET6, data, t, sizeof(t))) == 0)
-+printf("REVERSE: %s\n", t);
-+else
-+printf("REVERSE: failed (%i).\n", r);
- 
- return 0;
- }
-diff -u src/bsdnss.c src/bsdnss.c
 src/bsdnss.c   2007-02-09 00:42:23.0 +0800
-+++ src/bsdnss.c   2013-01-04 09:49:45.566389491 +0800
-@@ -258,6 +258,8 @@
-   ai->ai_addrlen =

[gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-mdns/, sys-auth/nss-mdns/files/

2016-05-29 Thread Amy Winston

commit: 75e23df8c331b7498d1f27a82bf0d048f627bb3d
Author: Amy Winston  gentoo  org>
AuthorDate: Sun May 29 18:50:25 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Sun May 29 18:57:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e23df8

sys-auth/nss-mdns: revbump, add ipv6 patch bug #584286

Package-Manager: portage-2.2.28
RepoMan-Options: --force

 sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch   | 528 +
 ...mdns-0.10-r2.ebuild => nss-mdns-0.10-r3.ebuild} |   5 +-
 2 files changed, 531 insertions(+), 2 deletions(-)

diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch 
b/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch
new file mode 100644
index 000..6d6dbc9
--- /dev/null
+++ b/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch
@@ -0,0 +1,528 @@
+diff -u src/avahi.c src/avahi.c
+--- src/avahi.c2006-04-29 05:14:09.0 +0800
 src/avahi.c2013-01-04 10:00:05.025558790 +0800
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -34,6 +35,7 @@
+ 
+ #include "avahi.h"
+ #include "util.h"
++#include "query.h"
+ 
+ #define WHITESPACE " \t"
+ 
+@@ -93,7 +95,8 @@
+ p = ln+1;
+ p += strspn(p, WHITESPACE);
+ 
+-/* Skip interface */
++/* Parse interface */
++if (af == AF_INET6) ((ipv6_address_t*)data)->if_idx = strtoul(p, 0, 10);
+ p += strcspn(p, WHITESPACE);
+ p += strspn(p, WHITESPACE);
+ 
+diff -u src/avahi-test.c src/avahi-test.c
+--- src/avahi-test.c   2007-02-09 00:42:23.0 +0800
 src/avahi-test.c   2013-01-04 09:59:06.174017729 +0800
+@@ -24,6 +24,7 @@
+ #include 
+ 
+ #include "avahi.h"
++#include "query.h"
+ 
+ int main(int argc, char *argv[]) {
+ uint8_t data[64];
+@@ -35,15 +36,20 @@
+ else
+ printf("AF_INET: failed (%i).\n", r);
+ 
+-/* if ((r = avahi_resolve_name(AF_INET6, argc >= 2 ? argv[1] : 
"cocaine.local", data)) == 0) */
+-/* printf("AF_INET6: %s\n", inet_ntop(AF_INET6, data, t, sizeof(t))); 
*/
+-/* else */
+-/* printf("AF_INET6: failed (%i).\n", r); */
+-
+ if ((r = avahi_resolve_address(AF_INET, data, t, sizeof(t))) == 0)
+ printf("REVERSE: %s\n", t);
+ else
+ printf("REVERSE: failed (%i).\n", r);
++
++ if ((r = avahi_resolve_name(AF_INET6, argc >= 2 ? argv[1] : 
"cocaine.local", data)) == 0)
++ printf("AF_INET6: %s, %u\n", inet_ntop(AF_INET6, data, t, 
sizeof(t)), ((ipv6_address_t*)data)->if_idx);
++ else
++ printf("AF_INET6: failed (%i).\n", r);
++
++if ((r = avahi_resolve_address(AF_INET6, data, t, sizeof(t))) == 0)
++printf("REVERSE: %s\n", t);
++else
++printf("REVERSE: failed (%i).\n", r);
+ 
+ return 0;
+ }
+diff -u src/bsdnss.c src/bsdnss.c
+--- src/bsdnss.c   2007-02-09 00:42:23.0 +0800
 src/bsdnss.c   2013-01-04 09:49:45.566389491 +0800
+@@ -258,6 +258,8 @@
+   ai->ai_addrlen = sizeof(struct sockaddr_in6);
+   memcpy(&((struct sockaddr_in6 *)psa)->sin6_addr, hap,
+   ai->ai_addrlen);
++  if (((struct sockaddr_in6 *)psa)->sin6_addr[0] == 0xfe 
&& ((struct sockaddr_in6 *)psa)->sin6_addr[0] == 0x80)
++  ((struct sockaddr_in6 *)psa)->sin6_scope_id = 
((struct ipv6_address_t*) hap)->if_idx;
+   break;
+   default:
+   ai->ai_addrlen = sizeof(struct sockaddr_storage);
+diff -u src/map-file src/map-file
+--- src/map-file   2007-01-02 02:36:21.0 +0800
 src/map-file   2013-01-07 08:56:56.406478774 +0800
+@@ -18,6 +18,12 @@
+ _nss_mdns_minimal_gethostbyname2_r; 
+ _nss_mdns4_minimal_gethostbyname2_r;
+ _nss_mdns6_minimal_gethostbyname2_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 -u src/nss.c src/nss.c
+--- src/nss.c  2013-01-07 15:14:23.0 +0800
 src/nss.c  2013-01-07 16:52:38.399842517 +0800
+@@ -41,22 +41,27 @@
+ 
+ #if defined(NSS_IPV4_ONLY) && ! defined(MDNS_MINIMAL)
+ #define _nss_mdns_gethostbyname2_r _nss_mdns4_gethostbyname2_r
++#define _nss_mdns_gethostbyname4_r _nss_mdns4_gethostbyname4_r
+ #define _nss_mdns_gethostbyname_r  _nss_mdns4_gethostbyname_r
+ #define _nss_mdns_gethostbyaddr_r  _nss_mdns4_gethostbyaddr_r
+ #elif defined(NSS_IPV4_ONLY) && defined(MDNS_MINIMAL)
+ #define _nss_mdns_gethostbyname2_r _nss_mdns4_minimal_gethostbyname2_r
++#define _nss_mdns_gethostbyname4_r _nss_mdns4_minimal_gethostbyname4_r
+ #define _nss_mdns_gethostbyname_r  _nss_mdns4_minimal_gethostbyname_r
+ #define _nss_mdns_gethostbyaddr_r  _nss_mdns4_minimal_gethostbyaddr_r
+ #elif defined(NSS_IPV6_ONLY) && ! defined(MDNS_MINIMAL)
+ #define _nss_mdns_gethostbyname2_r

[gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-mdns/, sys-auth/nss-mdns/files/

[gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-mdns/, sys-auth/nss-mdns/files/

[gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-mdns/, sys-auth/nss-mdns/files/

3 matches

Site Navigation

Mail list logo

Footer information