Date: Sat, 19 Oct 2013 16:37:48 +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: r330908 - head/net/mDNSResponder/files Message-ID: <201310191637.r9JGbm57051281@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Oct 19 16:37:47 2013 New Revision: 330908 URL: http://svnweb.freebsd.org/changeset/ports/330908 Log: - Rename patch files Added: head/net/mDNSResponder/files/patch-mDNSPosix-Makefile - copied unchanged from r329904, head/net/mDNSResponder/files/patch-mDNSPosix_Makefile head/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c - copied unchanged from r329904, head/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c Deleted: head/net/mDNSResponder/files/patch-mDNSPosix_Makefile head/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c Copied: head/net/mDNSResponder/files/patch-mDNSPosix-Makefile (from r329904, head/net/mDNSResponder/files/patch-mDNSPosix_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/mDNSResponder/files/patch-mDNSPosix-Makefile Sat Oct 19 16:37:47 2013 (r330908, copy of r329904, head/net/mDNSResponder/files/patch-mDNSPosix_Makefile) @@ -0,0 +1,51 @@ +--- mDNSPosix/Makefile.orig 2011-11-03 08:23:39.000000000 +0800 ++++ mDNSPosix/Makefile 2013-08-16 22:56:35.265791824 +0800 +@@ -54,7 +54,7 @@ + SHAREDDIR ?= ../mDNSShared + JDK = /usr/jdk + +-CC = @cc ++CC ?= @cc + BISON = @bison + FLEX = @flex + LD = ld -shared +@@ -122,7 +122,7 @@ + # If not already defined, set LOCALBASE to /usr/local + LOCALBASE?=/usr/local + INSTBASE=$(LOCALBASE) +-CFLAGS_OS = -DHAVE_IPV6 ++CFLAGS_OS = -DHAVE_IPV6 -DTARGET_OS_FREEBSD + # 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 @@ + + all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) + +-install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) ++install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) + + # 'setup' sets up the build directory structure the way we want + setup: +@@ -259,10 +259,10 @@ + @$(LD) $(LINKOPTS) -o $@ $+ + @$(STRIP) $@ + +-Clients: setup libdns_sd ../Clients/build/dns-sd ++Clients: ../Clients/build/dns-sd + @echo "Clients done" + +-../Clients/build/dns-sd: ++../Clients/build/dns-sd: setup libdns_sd + @$(MAKE) -C ../Clients + + # nss_mdns target builds the Name Service Switch module +@@ -490,6 +490,8 @@ + $(BUILDDIR)/dnsextd: $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o + $(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD) + ++$(OBJDIR)/dnsextd_lexer.l.o: $(OBJDIR)/dnsextd_parser.y.o ++ + ############################################################################# + + # Implicit rules Copied: head/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c (from r329904, head/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c Sat Oct 19 16:37:47 2013 (r330908, copy of r329904, head/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c) @@ -0,0 +1,40 @@ +--- 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 @@ + numOfServers++; + } + } ++ fclose(fp); + return (numOfServers > 0) ? 0 : -1; + } + +@@ -708,7 +709,13 @@ + { + struct ipv6_mreq imr6; + struct sockaddr_in6 bindAddr6; +- #if defined(IPV6_PKTINFO) ++ #if defined(IPV6_RECVPKTINFO) ++ if (err == 0) ++ { ++ err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn)); ++ if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); } ++ } ++ #elif defined(IPV6_PKTINFO) + if (err == 0) + { + err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_PKTINFO, &kOn, sizeof(kOn)); +@@ -717,7 +724,13 @@ + #else + #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts + #endif +- #if defined(IPV6_HOPLIMIT) ++ #if defined(IPV6_RECVHOPLIMIT) ++ if (err == 0) ++ { ++ err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &kOn, sizeof(kOn)); ++ if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVHOPLIMIT"); } ++ } ++ #elif defined(IPV6_HOPLIMIT) + if (err == 0) + { + err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_HOPLIMIT, &kOn, sizeof(kOn));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310191637.r9JGbm57051281>