Attachment 146812 Details for Bug 193229 – Patch (8char tabs)

[patch] Patch (8char tabs)

dns_mDNSResponder_nss.patch (text/plain), 2.98 KB, created by Matthieu Volat on 2014-09-04 18:12:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Volat

Created: 2014-09-04 18:12:02 UTC

Size: 2.98 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 367284)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	mDNSResponder_nss
> PORTVERSION=	544
>+PORTREVISION=	1
> CATEGORIES=	dns net
> MASTER_SITES=	http://opensource.apple.com/tarballs/mDNSResponder/
> DISTNAME=	${PORTNAME:S/_nss//}-${PORTVERSION}
>@@ -10,11 +11,11 @@
> COMMENT=	Apple mDNS responder - FreeBSD nsswitch module
> 
> LICENSE=	APACHE20 BSD3CLAUSE
>-LICENSE_COMB=	dual
>+LICENSE_COMB=   dual
> 
> LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
> 
>-CONFLICTS_INSTALL=	nss_mdns-[0-9]*
>+CONFLICTS_INSTALL=nss_mdns-[0-9]*
> 
> WRKSRC=		${WRKDIR}/${PORTNAME:S/_nss//}-${PORTVERSION}
> 
>@@ -28,14 +29,22 @@
> 	(cd ${WRKSRC}/mDNSPosix && ${LD} -shared nss_mdns.o nss_mdns_freebsd.o \
> 		-o nss_mdns.so.1 -L${PREFIX}/lib -R${PREFIX}/lib -ldns_sd)
> 
>+post-build:
>+	${STRIP_CMD} ${WRKSRC}/mDNSPosix/nss_mdns.so.1
>+
> do-install:
>-	${INSTALL_LIB} ${WRKSRC}/mDNSPosix/nss_mdns.so.1 ${STAGEDIR}${PREFIX}/lib
>-	${LN} -sf ${PREFIX}/lib/nss_mdns.so.1 ${STAGEDIR}${PREFIX}/lib/nss_mdns.so
>+	${INSTALL_LIB} ${WRKSRC}/mDNSPosix/nss_mdns.so.1 \
>+		${STAGEDIR}${PREFIX}/lib
>+	${LN} -sf ${PREFIX}/lib/nss_mdns.so.1 \
>+		${STAGEDIR}${PREFIX}/lib/nss_mdns.so
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
>+	${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \
>+		${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 \
>+		${STAGEDIR}${MANPREFIX}/man/man5
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/nss_mdns.so.1
>+	${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \
>+		${STAGEDIR}${PREFIX}/etc/nss_mdns.conf.sample
> 
> .include <bsd.port.mk>
>Index: files/nss_mdns_freebsd.c
>===================================================================
>--- files/nss_mdns_freebsd.c	(revision 367284)
>+++ files/nss_mdns_freebsd.c	(working copy)
>@@ -76,14 +76,14 @@
> 	int *errnop;
> 	int *h_errnop;
> 
>-    addr = va_arg(ap, const void *);
>-    addrlen = va_arg(ap, socklen_t);
>-    af = va_arg(ap, int);
>-    hptr = va_arg(ap, struct hostent *);
>-    buffer = va_arg(ap, char *);
>-    buflen = va_arg(ap, size_t);
>-    errnop = va_arg(ap, int *);
>-    h_errnop = va_arg(ap, int *);
>+	addr = va_arg(ap, const void *);
>+	addrlen = va_arg(ap, socklen_t);
>+	af = va_arg(ap, int);
>+	hptr = va_arg(ap, struct hostent *);
>+	buffer = va_arg(ap, char *);
>+	buflen = va_arg(ap, size_t);
>+	errnop = va_arg(ap, int *);
>+	h_errnop = va_arg(ap, int *);
> 
> 	s = _nss_mdns_gethostbyaddr_r(
> 			addr, addrlen, af, hptr, buffer, buflen, errnop, h_errnop);
>@@ -110,8 +110,7 @@
> 
> 	for (addrp = host.h_addr_list; *addrp; addrp++) {
> 		/* XXX this sucks, but get_ai is not public */
>-		if (!inet_ntop(host.h_addrtype, *addrp,
>-			       addrstr, sizeof(addrstr)))
>+		if (!inet_ntop(host.h_addrtype, *addrp, addrstr, sizeof(addrstr)))
> 			continue;
> 		hints = *pai;
> 		hints.ai_flags = AI_NUMERICHOST;

Actions: View | Diff

Attachments on bug 193229: 146632 | 146812 | 146814 | 146815