[Midnightbsd-cvs] mports [24263] trunk/net/mDNSResponder: update to newer version of mdnsresponder

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 9 11:36:52 EDT 2018 

Revision: 24263
          http://svnweb.midnightbsd.org/mports/?rev=24263
Author:   laffer1
Date:     2018-09-09 11:36:52 -0400 (Sun, 09 Sep 2018)
Log Message:
-----------
update to newer version of mdnsresponder

Modified Paths:
--------------
    trunk/net/mDNSResponder/Makefile
    trunk/net/mDNSResponder/distinfo
    trunk/net/mDNSResponder/files/mdnsd.in
    trunk/net/mDNSResponder/files/patch-mDNSPosix-Makefile
    trunk/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c

Removed Paths:
-------------
    trunk/net/mDNSResponder/files/mdnsresponder.in

Modified: trunk/net/mDNSResponder/Makefile
===================================================================
--- trunk/net/mDNSResponder/Makefile	2018-09-09 15:33:54 UTC (rev 24262)
+++ trunk/net/mDNSResponder/Makefile	2018-09-09 15:36:52 UTC (rev 24263)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	mDNSResponder
-PORTVERSION=	567
+PORTVERSION=	878.30.4
 CATEGORIES=	net dns
 MASTER_SITES=	http://opensource.apple.com/tarballs/${PORTNAME}/
 
@@ -13,13 +13,16 @@
 
 CONFLICTS_INSTALL=	avahi-libdns openmdns
 
+OPTIONS_DEFINE=	IPV6
+
+ALL_TARGET=	all dnsextd
 BUILD_WRKSRC=	${WRKSRC}/mDNSPosix
 INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
-MAKE_ARGS=	LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man os=freebsd
+MAKE_ARGS=	LDCONFIG=${TRUE} LOCALBASE=${PREFIX} MAN_PATH=${MANPREFIX}/man STRIP=${STRIP_CMD} os=freebsd
 MAKE_JOBS_UNSAFE=	yes
-USES=		cpe bison gmake
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	mdnsd mdnsresponder
+USE_RC_SUBR=	mdnsd mdnsresponderposix
+USES=		cpe gmake
 
 CPE_VENDOR=	apple
 CPE_PRODUCT=	${PORTNAME:tl}
@@ -29,25 +32,19 @@
 EXTRA_MAN8=	dnsextd.8 mDNSResponderPosix.8
 EXTRA_SBIN=	dnsextd
 
-.include <bsd.port.pre.mk>
-
-#.if ${OSVERSION} >= 3011
-#IGNORE=	Included in MidnightBSD 0.3+
-#.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e '/	cc / s|cc|$${CC}|' ${WRKSRC}/Clients/Makefile
-	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g; s|mDNSResponder.8|mDNSResponderPosix.8|g' ${WRKSRC}/mDNSPosix/Makefile
+	@${REINPLACE_CMD} -e '/^CFLAGS_DEBUG/ s|-Os|${CFLAGS}|' ${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
 
-post-build:
-	@${STRIP_CMD} ${WRKSRC}/Clients/build/dns-sd ${WRKSRC}/mDNSPosix/build/prod/mdnsd ${WRKSRC}/mDNSPosix/build/prod/libdns_sd.so
+post-patch-IPV6-off:
+	@${REINPLACE_CMD} -e '/^CFLAGS_OS/ s|-DHAVE_IPV6|-UHAVE_IPV6|' ${WRKSRC}/mDNSPosix/Makefile
 
 post-install:
-	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/
+	cd ${WRKSRC}/mDNSPosix/build/prod/ && ${INSTALL_PROGRAM} ${EXTRA_BIN} ${STAGEDIR}${PREFIX}/bin/
+	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN1} ${STAGEDIR}${PREFIX}/man/man1/
+	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN8} ${STAGEDIR}${PREFIX}/man/man8/
+	cd ${WRKSRC}/mDNSPosix/build/prod/ && ${INSTALL_PROGRAM} ${EXTRA_SBIN} ${STAGEDIR}${PREFIX}/sbin/
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dns-sd
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/net/mDNSResponder/distinfo
===================================================================
--- trunk/net/mDNSResponder/distinfo	2018-09-09 15:33:54 UTC (rev 24262)
+++ trunk/net/mDNSResponder/distinfo	2018-09-09 15:36:52 UTC (rev 24263)
@@ -1,2 +1,3 @@
-SHA256 (mDNSResponder-567.tar.gz) = 3239d9bb1e1e017be1ae12cff90802194b6e0312de628a1f324530b00b833018
-SIZE (mDNSResponder-567.tar.gz) = 2143110
+TIMESTAMP = 1517844631
+SHA256 (mDNSResponder-878.30.4.tar.gz) = 83ae1245ce8612438dd358a83c8c4a4f1348725d0dbf0703cf520882589229af
+SIZE (mDNSResponder-878.30.4.tar.gz) = 2490030

Modified: trunk/net/mDNSResponder/files/mdnsd.in
===================================================================
--- trunk/net/mDNSResponder/files/mdnsd.in	2018-09-09 15:33:54 UTC (rev 24262)
+++ trunk/net/mDNSResponder/files/mdnsd.in	2018-09-09 15:36:52 UTC (rev 24263)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $MidnightBSD$
+# $FreeBSD: head/net/mDNSResponder/files/mdnsd.in 340872 2014-01-24 00:14:07Z mat $
 
 # PROVIDE: mdnsd
 # REQUIRE: DAEMON

Deleted: trunk/net/mDNSResponder/files/mdnsresponder.in
===================================================================
--- trunk/net/mDNSResponder/files/mdnsresponder.in	2018-09-09 15:33:54 UTC (rev 24262)
+++ trunk/net/mDNSResponder/files/mdnsresponder.in	2018-09-09 15:36:52 UTC (rev 24263)
@@ -1,22 +0,0 @@
-#!/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 $*

Modified: trunk/net/mDNSResponder/files/patch-mDNSPosix-Makefile
===================================================================
--- trunk/net/mDNSResponder/files/patch-mDNSPosix-Makefile	2018-09-09 15:33:54 UTC (rev 24262)
+++ trunk/net/mDNSResponder/files/patch-mDNSPosix-Makefile	2018-09-09 15:36:52 UTC (rev 24263)
@@ -1,34 +1,58 @@
---- 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 @@
+--- mDNSPosix/Makefile.orig	2016-04-24 15:07:24 UTC
++++ mDNSPosix/Makefile
+@@ -54,8 +54,8 @@ COREDIR = ../mDNSCore
  SHAREDDIR ?= ../mDNSShared
  JDK = /usr/jdk
  
 -CC = @cc
+-BISON = @bison
 +CC ?= @cc
- BISON = @bison
++BISON = @yacc
  FLEX = @flex
+ ST = @strip
  LD = ld -shared
-@@ -122,7 +122,7 @@
+@@ -121,9 +121,9 @@ else
+ 
+ ifeq ($(os),freebsd)
  # If not already defined, set LOCALBASE to /usr/local
- LOCALBASE?=/usr/local
- INSTBASE=$(LOCALBASE)
+-LOCALBASE?=/usr/local
+-INSTBASE=$(LOCALBASE)
 -CFLAGS_OS = -DHAVE_IPV6
++LOCALBASE ?= /usr/local
++INSTBASE ?= $(DESTDIR)$(LOCALBASE)
 +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 @@
+@@ -185,12 +185,7 @@
+ endif
+ endif
  
- all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
+-# If directory /usr/share/man exists, then we install man pages into that, else /usr/man
+-ifeq ($(wildcard /usr/share/man), /usr/share/man)
+-MANPATH := /usr/share/man
+-else
+-MANPATH := /usr/man
+-endif
++MANPATH := $(DESTDIR)$(MAN_PATH)
  
--install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
+ # If directories /etc/init.d/rc*.d exist, then we install into that (Suse)
+ ifeq ($(wildcard /etc/init.d/rc2.d/), /etc/init.d/rc2.d/)
+@@ -219,7 +219,7 @@ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $
+ 
+ all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor $(OPTIONALTARG)
+ 
+-install: setup InstalledStartup InstalledDaemon 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 $@ $+
+@@ -259,13 +259,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)
+-	@$(LD) $(LINKOPTS) -o $@ $+
++	@$(CC) $(LINKOPTS) -shared -Wl,-soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+
  	@$(STRIP) $@
  
 -Clients: setup libdns_sd ../Clients/build/dns-sd
@@ -40,95 +64,42 @@
  	@$(MAKE) -C ../Clients
  
  # nss_mdns target builds the Name Service Switch module
-@@ -276,43 +276,43 @@
- #############################################################################
+@@ -273,7 +273,7 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE
+ 	@echo "Name Service Switch module done"
  
- # The Install targets place built stuff in their proper places
--InstalledDaemon: $(INSTBASE)/sbin/mdnsd
-+InstalledDaemon: $(DESTDIR)$(INSTBASE)/sbin/mdnsd
- 	@echo $+ " installed"
+ $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
+-	@$(LD) $(LINKOPTS) -o $@ $+
++	@$(CC) $(LINKOPTS) -shared -Wl,-soname=$(NSSLINKNAME) -o $@ $+
+ 	@$(STRIP) $@
  
--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
+ #############################################################################
+@@ -298,14 +298,12 @@ InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNA
  	@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
+-$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME)
+-	@if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi
++$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
  	$(CP) $< $@
+-	@$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) start
  
--$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
-+$(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
+ $(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)
++	$(LN) $(notdir $@) $(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
+@@ -338,7 +336,7 @@ $(MANPATH)/man8/%.8: %.8
  	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
++$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponderPosix.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 @@
+@@ -491,6 +489,8 @@ $(OBJDIR)/NetMonitor.c.o:            $(C
  $(BUILDDIR)/dnsextd:                 $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
  	$(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)
  

Modified: trunk/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c
===================================================================
--- trunk/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c	2018-09-09 15:33:54 UTC (rev 24262)
+++ trunk/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c	2018-09-09 15:36:52 UTC (rev 24263)
@@ -1,14 +1,15 @@
---- 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 @@
+--- mDNSPosix/mDNSPosix.c.orig	2016-09-13 22:37:18 UTC
++++ mDNSPosix/mDNSPosix.c
+@@ -654,7 +654,7 @@ mDNSlocal int SetupSocket(struct sockadd
+         // to bind to the socket. Our suggestion was to switch the order in which
+         // SO_REUSEPORT and SO_REUSEADDR was tested so that SO_REUSEADDR stays on
+         // top and SO_REUSEPORT to be used only if SO_REUSEADDR doesn't exist.
+-        #if defined(SO_REUSEADDR) && !defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
++        #if defined(SO_REUSEADDR) && !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__FreeBSD__)
+         err = setsockopt(*sktPtr, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn));
+         #elif defined(SO_REUSEPORT)
+         err = setsockopt(*sktPtr, SOL_SOCKET, SO_REUSEPORT, &kOn, sizeof(kOn));
+@@ -755,7 +755,13 @@ mDNSlocal int SetupSocket(struct sockadd
      {
          struct ipv6_mreq imr6;
          struct sockaddr_in6 bindAddr6;
@@ -23,7 +24,7 @@
          if (err == 0)
          {
              err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_PKTINFO, &kOn, sizeof(kOn));
-@@ -717,7 +724,13 @@
+@@ -764,7 +770,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

More information about the Midnightbsd-cvs mailing list