diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-11-29 09:03:02 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-11-29 09:03:02 +0000 |
| commit | 056673c8af5bd5de157ebe84a5333970f805f101 (patch) | |
| tree | 3802dfd63703209cc065076b06cc0a25d6fb727a /dns | |
| parent | databases/grass7: update 7.4.0 -> 7.4.1 (diff) | |
dns/mDNSResponder_nss: Update 878.1.1 -> 878.70.2
PR: 225912
Submitted by: Matthieu Volat <mazhe@alkumuna.eu>
Notes
Notes:
svn path=/head/; revision=486156
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/mDNSResponder_nss/Makefile | 9 | ||||
| -rw-r--r-- | dns/mDNSResponder_nss/distinfo | 6 | ||||
| -rw-r--r-- | dns/mDNSResponder_nss/files/nss_mdns_freebsd.c | 12 |
3 files changed, 15 insertions, 12 deletions
diff --git a/dns/mDNSResponder_nss/Makefile b/dns/mDNSResponder_nss/Makefile index 80bc747f60ce..0fff4d4562f9 100644 --- a/dns/mDNSResponder_nss/Makefile +++ b/dns/mDNSResponder_nss/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= mDNSResponder -PORTVERSION= 878.1.1 -PORTREVISION= 1 +PORTVERSION= 878.70.2 CATEGORIES= dns net MASTER_SITES= http://opensource.apple.com/tarballs/mDNSResponder/ PKGNAMESUFFIX= _nss @@ -21,9 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME:S/_nss//}-${PORTVERSION} .include <bsd.port.pre.mk> -.if ${ARCH:C/^(...).*/\1/} == "arm" LD=${CC} -.endif post-extract: @${CP} ${FILESDIR}/nss_mdns_freebsd.c ${WRKSRC}/mDNSPosix @@ -32,7 +29,7 @@ do-build: (cd ${WRKSRC}/mDNSPosix && ${CC} ${CFLAGS} -c -std=c99 -Wall -fPIC \ -I. -I${PREFIX}/include -DPREFIX=\"${PREFIX}\" \ nss_mdns.c nss_mdns_freebsd.c) - (cd ${WRKSRC}/mDNSPosix && ${LD} -shared nss_mdns.o nss_mdns_freebsd.o \ + (cd ${WRKSRC}/mDNSPosix && ${LD} -shared -Wl,-soname=nss_mdns.so.1 nss_mdns.o nss_mdns_freebsd.o \ -o nss_mdns.so.1 -L${PREFIX}/lib -R${PREFIX}/lib -ldns_sd) post-build: @@ -41,7 +38,7 @@ post-build: do-install: ${INSTALL_LIB} ${WRKSRC}/mDNSPosix/nss_mdns.so.1 \ ${STAGEDIR}${PREFIX}/lib - ${LN} -sf ${PREFIX}/lib/nss_mdns.so.1 \ + ${LN} -sf nss_mdns.so.1 \ ${STAGEDIR}${PREFIX}/lib/nss_mdns.so ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \ diff --git a/dns/mDNSResponder_nss/distinfo b/dns/mDNSResponder_nss/distinfo index e3ce4ccfb62c..503871c642c6 100644 --- a/dns/mDNSResponder_nss/distinfo +++ b/dns/mDNSResponder_nss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511011856 -SHA256 (mDNSResponder-878.1.1.tar.gz) = 655e83a78796cb7e944a05111d980617afa290e238e7ce26647105f3ab4461ee -SIZE (mDNSResponder-878.1.1.tar.gz) = 2462985 +TIMESTAMP = 1543481280 +SHA256 (mDNSResponder-878.70.2.tar.gz) = cdd03171ca05f16ea987bba1f8b0c4847d3035283ea0f5fa0ade75f64ec83ed5 +SIZE (mDNSResponder-878.70.2.tar.gz) = 2497624 diff --git a/dns/mDNSResponder_nss/files/nss_mdns_freebsd.c b/dns/mDNSResponder_nss/files/nss_mdns_freebsd.c index bf05ea63793d..cdeef7d2b707 100644 --- a/dns/mDNSResponder_nss/files/nss_mdns_freebsd.c +++ b/dns/mDNSResponder_nss/files/nss_mdns_freebsd.c @@ -121,9 +121,9 @@ aiforaf(const char *name, int af, struct addrinfo *pai, struct addrinfo **aip) for (res = res0; res; res = res->ai_next) res->ai_flags = pai->ai_flags; - (*aip)->ai_next = res0; while ((*aip)->ai_next) *aip = (*aip)->ai_next; + (*aip)->ai_next = res0; } } @@ -140,10 +140,16 @@ __nss_compat_getaddrinfo(void *retval, void *mdata, va_list ap) memset(&sentinel, 0, sizeof(sentinel)); cur = &sentinel; - if ((ai->ai_family == AF_UNSPEC) || (ai->ai_family == AF_INET6)) + if (ai->ai_family == AF_INET) { + aiforaf(name, AF_INET, ai, &cur); + } + else if (ai->ai_family == AF_INET6) { + aiforaf(name, AF_INET6, ai, &cur); + } + else if (ai->ai_family == AF_UNSPEC) { aiforaf(name, AF_INET6, ai, &cur); - if ((ai->ai_family == AF_UNSPEC) || (ai->ai_family == AF_INET)) aiforaf(name, AF_INET, ai, &cur); + } if (!sentinel.ai_next) { h_errno = HOST_NOT_FOUND; |