[Midnightbsd-cvs] mports [15666] U trunk/net/mDNSResponder/pkg-plist: mDNSResponder 541

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Dec 9 10:38:11 EST 2013


Revision: 15666
          http://svnweb.midnightbsd.org/mports/?rev=15666
Author:   laffer1
Date:     2013-12-09 10:38:09 -0500 (Mon, 09 Dec 2013)
Log Message:
-----------
mDNSResponder 541

Modified Paths:
--------------
    trunk/net/mDNSResponder/Makefile
    trunk/net/mDNSResponder/distinfo
    trunk/net/mDNSResponder/pkg-descr

Added Paths:
-----------
    trunk/net/mDNSResponder/files/mdnsresponder.in
    trunk/net/mDNSResponder/files/patch-mDNSPosix-Makefile
    trunk/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c

Removed Paths:
-------------
    trunk/net/mDNSResponder/files/patch-mDNSPosix_Makefile
    trunk/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c
    trunk/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h

Property Changed:
----------------
    trunk/net/mDNSResponder/distinfo
    trunk/net/mDNSResponder/files/mdnsd.in
    trunk/net/mDNSResponder/pkg-descr
    trunk/net/mDNSResponder/pkg-plist

Modified: trunk/net/mDNSResponder/Makefile
===================================================================
--- trunk/net/mDNSResponder/Makefile	2013-12-07 21:36:23 UTC (rev 15665)
+++ trunk/net/mDNSResponder/Makefile	2013-12-09 15:38:09 UTC (rev 15666)
@@ -1,63 +1,49 @@
-# $FreeBSD: ports/net/mDNSResponder/Makefile,v 1.18 2006/09/13 03:21:37 alexbl Exp $
 # $MidnightBSD$
 
 PORTNAME=	mDNSResponder
-PORTVERSION=	333.10
+PORTVERSION=	541
 CATEGORIES=	net dns
-MASTER_SITES=	http://opensource.apple.com/tarballs/mDNSResponder/
+MASTER_SITES=	http://opensource.apple.com/tarballs/${PORTNAME}/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	Apple's mDNSResponder
+COMMENT=	Bonjour (zero-configuration networking) by Apple
+
 LICENSE=	agg
 #bsd3 and apache 2
 
-MAKE_JOBS_UNSAFE=	yes
+CONFLICTS=	avahi-libdns-[0-9]*
 
-USE_BISON=	build
-USE_LDCONFIG=	YES
-
-USE_GMAKE=	YES
-USE_RC_SUBR=	mdnsd
-MAKE_ARGS+=	os=freebsd LOCALBASE=${FAKE_DESTDIR}${PREFIX} MANPATH=${FAKE_DESTDIR}${MANPREFIX}/man
 BUILD_WRKSRC=	${WRKSRC}/mDNSPosix
 INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
-EXTRA_PROGS_BIN=mDNSClientPosix \
-		mDNSIdentify \
-		mDNSNetMonitor \
-		mDNSProxyResponderPosix \
-		mDNSResponderPosix
-EXTRA_PROGS_SBIN=dnsextd
+MAKE_ARGS=	LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man os=freebsd
+USES=		bison gmake
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	mdnsd mdnsresponder
 
-EXTRAMAN8=	dnsextd.8 mDNSResponderPosix.8
+EXTRA_BIN=	mDNSClientPosix mDNSIdentify mDNSNetMonitor mDNSProxyResponderPosix mDNSResponderPosix
+EXTRA_MAN1=	dns-sd.1
+EXTRA_MAN8=	dnsextd.8 mDNSResponderPosix.8
+EXTRA_SBIN=	dnsextd
 
-MAN8=		mdnsd.8 ${EXTRAMAN8}
-
-CONFLICTS=	avahi-libdns-[0-9]*
-
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 3011
-IGNORE=	Included in MidnightBSD 0.3+
-.endif
+#.if ${OSVERSION} >= 3011
+#IGNORE=	Included in MidnightBSD 0.3+
+#.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/	cc / s|cc|$${CC}|' ${WRKSRC}/Clients/Makefile
-	@${MV} ${WRKSRC}/mDNSShared/mDNSResponder.8 \
-		${WRKSRC}/mDNSShared/mDNSResponderPosix.8
+	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g; 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
 
-pre-build:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		-e 's|mDNSResponder.8|mDNSResponderPosix.8|g' \
-		${WRKSRC}/mDNSPosix/Makefile
+post-build:
+	@${STRIP_CMD} ${WRKSRC}/Clients/build/dns-sd ${WRKSRC}/mDNSPosix/build/prod/mdnsd ${WRKSRC}/mDNSPosix/build/prod/libdns_sd.so
 
 post-install:
-	cd ${INSTALL_WRKSRC}/build/prod && \
-		${INSTALL_PROGRAM} ${EXTRA_PROGS_BIN} ${PREFIX}/bin && \
-		${INSTALL_PROGRAM} ${EXTRA_PROGS_SBIN} ${PREFIX}/sbin
-.	for section in 1 2 3 4 5 6 7 8
-.		for page in ${EXTRAMAN${section}}
-			${INSTALL_MAN} ${WRKSRC}/mDNSShared/${page} ${MAN${section}PREFIX}/man/man${page:E}/
-.		endfor
-.	endfor
+	cd ${WRKSRC}/mDNSPosix/build/prod/ && ${INSTALL_PROGRAM} ${EXTRA_BIN} ${PREFIX}/bin/
+	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN1} ${PREFIX}/man/man1/
+	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN8} ${PREFIX}/man/man8/
+	cd ${WRKSRC}/mDNSPosix/build/prod/ && ${INSTALL_PROGRAM} ${EXTRA_SBIN} ${PREFIX}/sbin/
 
 .include <bsd.port.post.mk>

Modified: trunk/net/mDNSResponder/distinfo
===================================================================
--- trunk/net/mDNSResponder/distinfo	2013-12-07 21:36:23 UTC (rev 15665)
+++ trunk/net/mDNSResponder/distinfo	2013-12-09 15:38:09 UTC (rev 15666)
@@ -1,2 +1,2 @@
-SHA256 (mDNSResponder-333.10.tar.gz) = 3624e39022c9210b819e94423c02f9ae12550cc21511ca979ab87e0c2212967b
-SIZE (mDNSResponder-333.10.tar.gz) = 1937483
+SHA256 (mDNSResponder-541.tar.gz) = b768999280756325b6bacd78acaff00d2bb06136450b727c6b0eb441c1ff2e30
+SIZE (mDNSResponder-541.tar.gz) = 2153009


Property changes on: trunk/net/mDNSResponder/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Index: trunk/net/mDNSResponder/files/mdnsd.in
===================================================================
--- trunk/net/mDNSResponder/files/mdnsd.in	2013-12-07 21:36:23 UTC (rev 15665)
+++ trunk/net/mDNSResponder/files/mdnsd.in	2013-12-09 15:38:09 UTC (rev 15666)

Property changes on: trunk/net/mDNSResponder/files/mdnsd.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/net/mDNSResponder/files/mdnsresponder.in
===================================================================
--- trunk/net/mDNSResponder/files/mdnsresponder.in	                        (rev 0)
+++ trunk/net/mDNSResponder/files/mdnsresponder.in	2013-12-09 15:38:09 UTC (rev 15666)
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# $MidnightBSD$
+
+# PROVIDE: mdnsresponder
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name=mdnsresponder
+rcvar=mdnsresponder_enable
+
+load_rc_config $name
+
+: ${mdnsresponder_enable="NO"}
+: ${mdnsresponder_pidfile="/var/run/${name}.pid"}
+
+command="%%PREFIX%%/bin/mDNSResponderPosix"
+command_args="-b -P ${mdnsresponder_pidfile}"
+
+run_rc_command $*

Copied: trunk/net/mDNSResponder/files/patch-mDNSPosix-Makefile (from rev 15649, trunk/net/mDNSResponder/files/patch-mDNSPosix_Makefile)
===================================================================
--- trunk/net/mDNSResponder/files/patch-mDNSPosix-Makefile	                        (rev 0)
+++ trunk/net/mDNSResponder/files/patch-mDNSPosix-Makefile	2013-12-09 15:38:09 UTC (rev 15666)
@@ -0,0 +1,139 @@
+--- mDNSPosix/Makefile.orig	2011-11-03 08:23:39.000000000 +0800
++++ mDNSPosix/Makefile	2013-10-13 02:29:12.791431406 +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
+@@ -276,43 +276,43 @@
+ #############################################################################
+ 
+ # The Install targets place built stuff in their proper places
+-InstalledDaemon: $(INSTBASE)/sbin/mdnsd
++InstalledDaemon: $(DESTDIR)$(INSTBASE)/sbin/mdnsd
+ 	@echo $+ " installed"
+ 
+-InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h
++InstalledLib: $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/include/dns_sd.h
+ 	@echo $+ " installed"
+ 
+-InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME)
++InstalledStartup: $(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME)
+ 	@echo $+ " installed"
+ 
+-InstalledManPages: $(MANPATH)/man8/mdnsd.8
++InstalledManPages: $(DESTDIR)$(MANPATH)/man8/mdnsd.8
+ 	@echo $+ " installed"
+ 
+-InstalledClients: $(INSTBASE)/bin/dns-sd
++InstalledClients: $(DESTDIR)$(INSTBASE)/bin/dns-sd
+ 	@echo $+ " installed"
+ 
+-InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
++InstalledNSS: $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8
+ 	@echo $+ " installed"
+ 
+ # Note: If daemon already installed, we make sure it's stopped before overwriting it
+-$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
++$(DESTDIR)$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
+ 	@if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi
+ 	$(CP) $< $@
+ 
+-$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
++$(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
+ 	$(CP) $< $@
+-	$(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
++	$(LN) libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
+ ifdef LDCONFIG
+     # -m means 'merge into existing database', -R means 'rescan directories'
+ 	$(LDCONFIG) -mR
+ endif
+ 
+-$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
++$(DESTDIR)$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
+ 	$(CP) $< $@
+ 
+ # We make this target dependent on $(INSTBASE)/sbin/mdnsd because we need to ensure
+ # that the daemon is installed *before* we try to execute the command to start it.
+-$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) $(INSTBASE)/sbin/mdnsd
++$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) $(DESTDIR)$(INSTBASE)/sbin/mdnsd
+ 	$(CP) $< $@
+ 	chmod ugo+x $@
+ 	$@ start
+@@ -329,26 +329,26 @@
+ endif
+ endif
+ 
+-$(MANPATH)/man5/%.5: %.5
++$(DESTDIR)$(MANPATH)/man5/%.5: %.5
+ 	cp $< $@
+ 	chmod 444 $@
+ 
+-$(MANPATH)/man8/%.8: %.8
++$(DESTDIR)$(MANPATH)/man8/%.8: %.8
+ 	cp $< $@
+ 	chmod 444 $@
+ 
+-$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
++$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
+ 	cp $< $@
+ 	chmod 444 $@
+ 
+-$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd
++$(DESTDIR)$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd
+ 	$(CP) $< $@
+ 
+-$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
++$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
+ 	$(LN) $< $@
+ 	ldconfig
+ 
+-$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
++$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
+ 	$(CP) $< $@
+ 	chmod 444 $@
+ 
+@@ -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

Added: trunk/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c
===================================================================
--- trunk/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c	                        (rev 0)
+++ trunk/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c	2013-12-09 15:38:09 UTC (rev 15666)
@@ -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));

Deleted: trunk/net/mDNSResponder/files/patch-mDNSPosix_Makefile
===================================================================
--- trunk/net/mDNSResponder/files/patch-mDNSPosix_Makefile	2013-12-07 21:36:23 UTC (rev 15665)
+++ trunk/net/mDNSResponder/files/patch-mDNSPosix_Makefile	2013-12-09 15:38:09 UTC (rev 15666)
@@ -1,60 +0,0 @@
---- mDNSPosix/Makefile.orig	2009-08-11 09:13:47.000000000 +0800
-+++ mDNSPosix/Makefile	2011-06-21 10:22:59.016198425 +0800
-@@ -54,7 +54,7 @@
- SHAREDDIR ?= ../mDNSShared
- JDK = /usr/jdk
- 
--CC = @cc
-+CC ?= @cc
- BISON = @bison
- FLEX = @flex
- LD = ld -shared
-@@ -118,7 +118,7 @@
- LOCALBASE?=/usr/local
- INSTBASE=$(LOCALBASE)
- STARTUPSCRIPTNAME=mdns.sh
--CFLAGS_OS =
-+CFLAGS_OS = -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:
-@@ -211,7 +211,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:
-@@ -252,10 +252,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
-@@ -330,7 +330,7 @@
- 	cp $< $@
- 	chmod 444 $@
- 
--$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
-+$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponderPosix.8
- 	cp $< $@
- 	chmod 444 $@
- 
-@@ -482,6 +482,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

Deleted: trunk/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c
===================================================================
--- trunk/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c	2013-12-07 21:36:23 UTC (rev 15665)
+++ trunk/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c	2013-12-09 15:38:09 UTC (rev 15666)
@@ -1,19 +0,0 @@
---- mDNSPosix/mDNSPosix.c.orig	2011-04-07 06:48:43.000000000 +0800
-+++ mDNSPosix/mDNSPosix.c	2011-08-28 22:14:54.089049545 +0800
-@@ -487,7 +487,7 @@
- 	{
- 	char line[256];
- 	char nameserver[16];
--	char keyword[10];
-+	char keyword[11];
- 	int  numOfServers = 0;
- 	FILE *fp = fopen(filePath, "r");
- 	if (fp == NULL) return -1;
-@@ -506,6 +506,7 @@
- 			numOfServers++;
- 			}
- 		}  
-+	fclose(fp);
- 	return (numOfServers > 0) ? 0 : -1;
- 	}
- 

Deleted: trunk/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h
===================================================================
--- trunk/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h	2013-12-07 21:36:23 UTC (rev 15665)
+++ trunk/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h	2013-12-09 15:38:09 UTC (rev 15666)
@@ -1,52 +0,0 @@
---- mDNSShared/CommonServices.h.orig	2009-08-11 09:13:47.000000000 +0800
-+++ mDNSShared/CommonServices.h	2011-01-11 11:51:28.000000000 +0800
-@@ -54,6 +54,15 @@
- 	#endif
- #endif
- 
-+// FreeBSD
-+
-+#if( !defined( TARGET_OS_FREEBSD ) )
-+	#if( defined( __FreeBSD__ ) )
-+		#define	TARGET_OS_FREEBSD		1
-+	#else
-+		#define	TARGET_OS_FREEBSD		0
-+	#endif
-+#endif
- // Linux
- 
- #if( !defined( TARGET_OS_LINUX ) )
-@@ -90,7 +99,7 @@
- 	
- 	// No predefined macro for VxWorks so just assume VxWorks if nothing else is set.
- 	
--	#if( !macintosh && !__MACH__  && !defined( __linux__ ) && !defined ( __SVR4 ) && !defined ( __sun ) && !defined( __PALMOS_TRAPS__ ) && !defined( __PALMOS_ARMLET__ ) && !defined( _WIN32 ) )
-+	#if( !macintosh && !__MACH__  && !defined( __FreeBSD__ ) && !defined( __linux__ ) && !defined ( __SVR4 ) && !defined ( __sun ) && !defined( __PALMOS_TRAPS__ ) && !defined( __PALMOS_ARMLET__ ) && !defined( _WIN32 ) )
- 		#define	TARGET_OS_VXWORKS		1
- 	#else
- 		#define	TARGET_OS_VXWORKS		0
-@@ -179,6 +188,15 @@
- 	#include	<libkern/OSTypes.h>
- 	#include	<sys/types.h>
- 	
-+#elif( TARGET_OS_FREEBSD )
-+
-+	// FreeBSD
-+	#include	<stdint.h>
-+	#include	<pthread.h>
-+	#include	<netinet/in.h>
-+	#include	<arpa/inet.h>
-+	#include	<sys/socket.h>
-+
- #elif( TARGET_OS_LINUX )
- 	
- 	// Linux
-@@ -455,7 +473,7 @@
- // - Windows
- 
- #if( TARGET_LANGUAGE_C_LIKE )
--	#if( !defined(_SSIZE_T) && ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) && !TARGET_OS_LINUX && !TARGET_OS_VXWORKS && !TARGET_OS_MAC)
-+	#if( !defined(_SSIZE_T) && ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) && !TARGET_OS_FREEBSD && !TARGET_OS_LINUX && !TARGET_OS_VXWORKS && !TARGET_OS_MAC)
- 		typedef int						ssize_t;
- 	#endif
- #endif

Modified: trunk/net/mDNSResponder/pkg-descr
===================================================================
--- trunk/net/mDNSResponder/pkg-descr	2013-12-07 21:36:23 UTC (rev 15665)
+++ trunk/net/mDNSResponder/pkg-descr	2013-12-09 15:38:09 UTC (rev 15666)
@@ -1,4 +1,11 @@
-The mDNSResponder project is a component of Bonjour,
-Apple's ease-of-use IP networking initiative:
+Bonjour, also known as zero-configuration networking, enables automatic
+discovery of devices and services on a local network using industry standard IP
+protocols. Bonjour makes it easy to discover, publish, and resolve network
+services with a sophisticated, yet easy-to-use, programming interface that is
+accessible from Cocoa, Ruby, Python, and other languages.
 
-WWW: http://developer.apple.com/networking/bonjour/index.html
+The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP
+networking initiative.
+
+WWW: https://developer.apple.com/bonjour/
+WWW: http://opensource.apple.com/tarballs/mDNSResponder/


Property changes on: trunk/net/mDNSResponder/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/mDNSResponder/pkg-plist
===================================================================
--- trunk/net/mDNSResponder/pkg-plist	2013-12-07 21:36:23 UTC (rev 15665)
+++ trunk/net/mDNSResponder/pkg-plist	2013-12-09 15:38:09 UTC (rev 15666)

Property changes on: trunk/net/mDNSResponder/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list