Date: Sun, 26 Apr 2015 12:27:39 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384780 - in head/net/mDNSResponder: . files Message-ID: <201504261227.t3QCRdxM000714@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Apr 26 12:27:39 2015 New Revision: 384780 URL: https://svnweb.freebsd.org/changeset/ports/384780 Log: - Update to 567 - Cleanup Makefile - Regenerate patch files Modified: head/net/mDNSResponder/Makefile head/net/mDNSResponder/distinfo head/net/mDNSResponder/files/patch-mDNSPosix-Makefile head/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c head/net/mDNSResponder/files/patch-mDNSPosix-mDNSUNP.c Modified: head/net/mDNSResponder/Makefile ============================================================================== --- head/net/mDNSResponder/Makefile Sun Apr 26 12:20:57 2015 (r384779) +++ head/net/mDNSResponder/Makefile Sun Apr 26 12:27:39 2015 (r384780) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mDNSResponder -PORTVERSION= 561.1.1 -PORTREVISION= 1 +PORTVERSION= 567 CATEGORIES= net dns MASTER_SITES= http://opensource.apple.com/tarballs/${PORTNAME}/ @@ -31,15 +30,7 @@ EXTRA_MAN1= dns-sd.1 EXTRA_MAN8= dnsextd.8 mDNSResponderPosix.8 EXTRA_SBIN= dnsextd -.include <bsd.port.pre.mk> - -.if ${ARCH:C/^(...).*/\1/} == "arm" -MAKE_ARGS+= LD="${CC} -shared" -.endif - post-patch: - @${REINPLACE_CMD} -e '/ cc / s|cc|$${CC}|' ${WRKSRC}/Clients/Makefile - @${REINPLACE_CMD} -e 's|mDNSResponder.8|mDNSResponderPosix.8|g' ${WRKSRC}/mDNSPosix/Makefile @${REINPLACE_CMD} -e 's|\(#define IPV6_2292_PKTINFO \).*|\1IPV6_PKTINFO|; s|\(#define IPV6_2292_HOPLIMIT \).*|\1IPV6_HOPLIMIT|' ${WRKSRC}/mDNSPosix/mDNSUNP.h @${MV} ${WRKSRC}/mDNSShared/mDNSResponder.8 ${WRKSRC}/mDNSShared/mDNSResponderPosix.8 @@ -52,4 +43,4 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/* ${CHMOD} u-w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/* -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/mDNSResponder/distinfo ============================================================================== --- head/net/mDNSResponder/distinfo Sun Apr 26 12:20:57 2015 (r384779) +++ head/net/mDNSResponder/distinfo Sun Apr 26 12:27:39 2015 (r384780) @@ -1,2 +1,2 @@ -SHA256 (mDNSResponder-561.1.1.tar.gz) = 217ca717149b999a34c568913e4721beef96ac7ab93db8a012e68ffe816530d9 -SIZE (mDNSResponder-561.1.1.tar.gz) = 2153693 +SHA256 (mDNSResponder-567.tar.gz) = 3239d9bb1e1e017be1ae12cff90802194b6e0312de628a1f324530b00b833018 +SIZE (mDNSResponder-567.tar.gz) = 2143110 Modified: head/net/mDNSResponder/files/patch-mDNSPosix-Makefile ============================================================================== --- head/net/mDNSResponder/files/patch-mDNSPosix-Makefile Sun Apr 26 12:20:57 2015 (r384779) +++ head/net/mDNSResponder/files/patch-mDNSPosix-Makefile Sun Apr 26 12:27:39 2015 (r384780) @@ -1,4 +1,4 @@ ---- mDNSPosix/Makefile.orig 2012-10-17 22:11:12 UTC +--- mDNSPosix/Makefile.orig 2015-03-04 03:09:18 UTC +++ mDNSPosix/Makefile @@ -54,8 +54,8 @@ COREDIR = ../mDNSCore SHAREDDIR ?= ../mDNSShared @@ -9,9 +9,9 @@ +CC ?= @cc +BISON = @yacc FLEX = @flex + ST = @strip LD = ld -shared - CP = cp -@@ -122,7 +122,7 @@ ifeq ($(os),freebsd) +@@ -123,7 +123,7 @@ ifeq ($(os),freebsd) # If not already defined, set LOCALBASE to /usr/local LOCALBASE?=/usr/local INSTBASE=$(LOCALBASE) @@ -20,7 +20,7 @@ # FreeBSD 4 requires threaded code to be compiled and linked using the "-pthread" option, # and requires that the "-lpthread" link option NOT be used # This appies only to FreeBSD -- "man cc" on FreeBSD says: -@@ -216,7 +216,7 @@ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $ +@@ -217,7 +217,7 @@ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $ all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) @@ -29,7 +29,7 @@ # 'setup' sets up the build directory structure the way we want setup: -@@ -256,13 +256,13 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ +@@ -257,13 +257,13 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) @@ -46,7 +46,7 @@ @$(MAKE) -C ../Clients # nss_mdns target builds the Name Service Switch module -@@ -270,49 +270,49 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE +@@ -271,49 +271,49 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE @echo "Name Service Switch module done" $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o @@ -108,7 +108,7 @@ $(CP) $< $@ chmod ugo+x $@ $@ start -@@ -329,26 +329,26 @@ else +@@ -330,26 +330,26 @@ else endif endif @@ -123,7 +123,7 @@ chmod 444 $@ -$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 -+$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 ++$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponderPosix.8 cp $< $@ chmod 444 $@ @@ -141,7 +141,7 @@ $(CP) $< $@ chmod 444 $@ -@@ -490,6 +490,8 @@ $(OBJDIR)/NetMonitor.c.o: $(C +@@ -491,6 +491,8 @@ $(OBJDIR)/NetMonitor.c.o: $(C $(BUILDDIR)/dnsextd: $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o $(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD) Modified: head/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c ============================================================================== --- head/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c Sun Apr 26 12:20:57 2015 (r384779) +++ head/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c Sun Apr 26 12:27:39 2015 (r384780) @@ -1,6 +1,6 @@ ---- mDNSPosix/mDNSPosix.c.orig 2012-04-18 07:01:01.000000000 +0800 -+++ mDNSPosix/mDNSPosix.c 2013-08-16 23:04:31.089791517 +0800 -@@ -503,6 +503,7 @@ +--- mDNSPosix/mDNSPosix.c.orig 2015-03-02 19:24:41 UTC ++++ mDNSPosix/mDNSPosix.c +@@ -516,6 +516,7 @@ mDNSexport int ParseDNSServers(mDNS *m, numOfServers++; } } @@ -8,7 +8,7 @@ return (numOfServers > 0) ? 0 : -1; } -@@ -708,7 +709,13 @@ +@@ -740,7 +741,13 @@ mDNSlocal int SetupSocket(struct sockadd { struct ipv6_mreq imr6; struct sockaddr_in6 bindAddr6; @@ -23,7 +23,7 @@ if (err == 0) { err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_PKTINFO, &kOn, sizeof(kOn)); -@@ -717,7 +724,13 @@ +@@ -749,7 +756,13 @@ mDNSlocal int SetupSocket(struct sockadd #else #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts #endif Modified: head/net/mDNSResponder/files/patch-mDNSPosix-mDNSUNP.c ============================================================================== --- head/net/mDNSResponder/files/patch-mDNSPosix-mDNSUNP.c Sun Apr 26 12:20:57 2015 (r384779) +++ head/net/mDNSResponder/files/patch-mDNSPosix-mDNSUNP.c Sun Apr 26 12:27:39 2015 (r384780) @@ -1,5 +1,5 @@ ---- mDNSPosix/mDNSUNP.c.orig 2011-12-02 01:39:45.000000000 +0100 -+++ mDNSPosix/mDNSUNP.c 2015-03-26 17:08:45.334715000 +0100 +--- mDNSPosix/mDNSUNP.c.orig 2011-12-02 00:39:45 UTC ++++ mDNSPosix/mDNSUNP.c @@ -449,6 +449,8 @@ struct ifi_info *get_ifi_info(int family ifi->ifi_netmask = (struct sockaddr*)calloc(1, sizeof(struct sockaddr_in6)); if (ifi->ifi_netmask == NULL) goto gotError;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504261227.t3QCRdxM000714>