From owner-svn-ports-head@freebsd.org Thu Nov 29 09:03:03 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8CB58115909B; Thu, 29 Nov 2018 09:03:03 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3135C7E796; Thu, 29 Nov 2018 09:03:03 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 10B5A176EB; Thu, 29 Nov 2018 09:03:03 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAT932F6097523; Thu, 29 Nov 2018 09:03:02 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAT932Iv097521; Thu, 29 Nov 2018 09:03:02 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201811290903.wAT932Iv097521@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 29 Nov 2018 09:03:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486156 - in head/dns/mDNSResponder_nss: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/dns/mDNSResponder_nss: . files X-SVN-Commit-Revision: 486156 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3135C7E796 X-Spamd-Result: default: False [0.90 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.34)[0.335,0]; NEURAL_SPAM_MEDIUM(0.31)[0.308,0]; NEURAL_SPAM_SHORT(0.25)[0.254,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 09:03:03 -0000 Author: yuri Date: Thu Nov 29 09:03:02 2018 New Revision: 486156 URL: https://svnweb.freebsd.org/changeset/ports/486156 Log: dns/mDNSResponder_nss: Update 878.1.1 -> 878.70.2 PR: 225912 Submitted by: Matthieu Volat Modified: head/dns/mDNSResponder_nss/Makefile head/dns/mDNSResponder_nss/distinfo head/dns/mDNSResponder_nss/files/nss_mdns_freebsd.c Modified: head/dns/mDNSResponder_nss/Makefile ============================================================================== --- head/dns/mDNSResponder_nss/Makefile Thu Nov 29 08:39:00 2018 (r486155) +++ head/dns/mDNSResponder_nss/Makefile Thu Nov 29 09:03:02 2018 (r486156) @@ -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 -.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 \ Modified: head/dns/mDNSResponder_nss/distinfo ============================================================================== --- head/dns/mDNSResponder_nss/distinfo Thu Nov 29 08:39:00 2018 (r486155) +++ head/dns/mDNSResponder_nss/distinfo Thu Nov 29 09:03:02 2018 (r486156) @@ -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 Modified: head/dns/mDNSResponder_nss/files/nss_mdns_freebsd.c ============================================================================== --- head/dns/mDNSResponder_nss/files/nss_mdns_freebsd.c Thu Nov 29 08:39:00 2018 (r486155) +++ head/dns/mDNSResponder_nss/files/nss_mdns_freebsd.c Thu Nov 29 09:03:02 2018 (r486156) @@ -121,9 +121,9 @@ aiforaf(const char *name, int af, struct addrinfo *pai 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 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); - if ((ai->ai_family == AF_UNSPEC) || (ai->ai_family == AF_INET)) + } + else if (ai->ai_family == AF_UNSPEC) { + aiforaf(name, AF_INET6, ai, &cur); aiforaf(name, AF_INET, ai, &cur); + } if (!sentinel.ai_next) { h_errno = HOST_NOT_FOUND;