New version (#96966, #87845). Install the mDNSResponder deamon, the dnsextd deamon and various auxiliary programs. Add support for the debug USE flag. Thanks to Sandy McArthur <Sandy@McArthur.org>.

(Portage version: 2.0.51.22-r2)

10 files changed, 382 insertions, 12 deletions

diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog
index e97ff335f399..f12d86ca6f76 100644
--- a/net-misc/mDNSResponder/ChangeLog
+++ b/net-misc/mDNSResponder/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/mDNSResponder
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.16 2005/08/25 00:12:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.17 2005/08/27 16:46:45 greg_g Exp $
+
+*mDNSResponder-107.1 (27 Aug 2005)
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/mDNSResponder-107.1-Makefiles.patch, +files/dnsextd.conf.d,
+  +files/dnsextd.init.d, +files/mDNSResponderPosix.conf,
+  +files/mDNSResponderPosix.conf.d, +files/mDNSResponderPosix.init.d,
+  files/mdnsd.init.d, +mDNSResponder-107.1.ebuild:
+  New version (#96966, #87845). Install the mDNSResponder deamon, the dnsextd
+  deamon and various auxiliary programs. Add support for the debug USE flag.
+  Thanks to Sandy McArthur <Sandy@McArthur.org>.
 
   25 Aug 2005; Aron Griffis <agriffis@gentoo.org> mDNSResponder-98.ebuild:
   stable on ia64
diff --git a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.1 b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.1
new file mode 100644
index 000000000000..5bf53a4698b4
--- /dev/null
+++ b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.1
@@ -0,0 +1 @@
+MD5 0182d100b3f7929649bfc6c29715d4d7 mDNSResponder-107.1.tar.gz 1325181
diff --git a/net-misc/mDNSResponder/files/dnsextd.conf.d b/net-misc/mDNSResponder/files/dnsextd.conf.d
new file mode 100644
index 000000000000..815075084289
--- /dev/null
+++ b/net-misc/mDNSResponder/files/dnsextd.conf.d
@@ -0,0 +1,12 @@
+# Set the address of the BIND server that dnsextd will
+# contact and the zone that it will administer.
+# Make sure you have read the instructions at
+# http://www.dns-sd.org/ServerSetup.html
+# on how to configure the BIND server before
+# starting dnsextd.
+#DNSEXTD_NAMESERVER="127.0.0.1"
+#DNSEXTD_ZONE="zone.example.com."
+
+# Add extra arguments to dnsextd here.
+# See dnsextd -h for options.
+#DNSEXTD_ARGS="-k 'TSIG auth key'"
diff --git a/net-misc/mDNSResponder/files/dnsextd.init.d b/net-misc/mDNSResponder/files/dnsextd.init.d
new file mode 100644
index 000000000000..4df7e9caa69e
--- /dev/null
+++ b/net-misc/mDNSResponder/files/dnsextd.init.d
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/dnsextd.init.d,v 1.1 2005/08/27 16:46:45 greg_g Exp $
+
+opts="${opts} dump"
+
+depend() {
+	after named
+}
+
+start() {
+	if [ -z "${DNSEXTD_ZONE}" -o -z "${DNSEXTD_NAMESERVER}" ]; then
+		eerror "You need to setup DNSEXTD_ZONE and DNSEXTD_NAMESERVER in /etc/conf.d/dnsextd first"
+		return 1
+	fi
+
+	ebegin "Starting dnsextd"
+	start-stop-daemon --start --quiet --user named \
+		--pid /var/run/dnsextd.pid --exec /usr/sbin/dnsextd \
+		-- -z "${DNSEXTD_ZONE}" -s "${DNSEXTD_NAMESERVER}" ${DNSEXTD_ARGS}
+
+	eend $? "Failed to start dnsextd"
+}
+
+stop() {
+	ebegin "Stopping dnsextd"
+	start-stop-daemon --stop --quiet --pid /var/run/dnsextd.pid
+	eend $? "Failed to stop dnsextd"
+}
+
+dump() {
+	ebegin "Dumping dnsextd lease table"
+	kill -INFO `cat /var/run/dnsextd.pid` >&/dev/null
+	eend $? "Failed to dump dnsextd lease table"
+}
diff --git a/net-misc/mDNSResponder/files/mDNSResponder-107.1-Makefiles.patch b/net-misc/mDNSResponder/files/mDNSResponder-107.1-Makefiles.patch
new file mode 100644
index 000000000000..3cb201278d39
--- /dev/null
+++ b/net-misc/mDNSResponder/files/mDNSResponder-107.1-Makefiles.patch
@@ -0,0 +1,145 @@
+diff -Nur mDNSResponder-107.1.orig/Clients/Makefile mDNSResponder-107.1/Clients/Makefile
+--- mDNSResponder-107.1.orig/Clients/Makefile	2004-09-24 23:15:26.000000000 +0200
++++ mDNSResponder-107.1/Clients/Makefile	2005-08-27 14:36:34.000000000 +0200
+@@ -49,11 +49,14 @@
+ #############################################################################
+ 
+ 
+-# If library /usr/lib/libdns_sd.* exists, then link it
++ifneq "$(wildcard ../mDNSPosix/build/prod/libdns_sd.*)" ""
++LIBS ?= -L../mDNSPosix/build/prod/ -ldns_sd
++endif
++ifneq "$(wildcard ../mDNSPosix/build/debug/libdns_sd.*)" ""
++LIBS ?= -L../mDNSPosix/build/debug/ -ldns_sd
++endif
+ ifneq "$(wildcard /usr/lib/libdns_sd.*)" ""
+-LIBS = -ldns_sd
+-else
+-LIBS =
++LIBS ?= -ldns_sd
+ endif
+ 
+ targets: build/dns-sd
+diff -Nur mDNSResponder-107.1.orig/mDNSPosix/Makefile mDNSResponder-107.1/mDNSPosix/Makefile
+--- mDNSResponder-107.1.orig/mDNSPosix/Makefile	2005-04-14 23:07:10.000000000 +0200
++++ mDNSResponder-107.1/mDNSPosix/Makefile	2005-08-27 14:32:35.000000000 +0200
+@@ -384,7 +384,7 @@
+ 
+ all: setup Daemon libdns_sd Client Responder ProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
+ 
+-install: setup InstalledDaemon InstalledLib InstalledStartup InstalledManPages $(OPTINSTALL)
++install: setup InstalledDaemon InstalledLib InstalledManPages $(OPTINSTALL)
+ 
+ # 'setup' sets up the build directory structure the way we want
+ setup:
+@@ -419,7 +419,7 @@
+ 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) $(LIBFLAGS) -o $@ $+
++	@$(LD) $(LIBFLAGS) -soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+
+ 	@$(STRIP) $@
+ 
+ # nss_mdns target builds the Name Service Switch module
+@@ -427,42 +427,38 @@
+ 	@echo "Name Service Switch module done"
+ 
+ $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
+-	@$(LD) $(LIBFLAGS) -o $@ $+
++	@$(LD) $(LIBFLAGS) -soname=$(NSSLINKNAME) -o $@ $+
+ 	@$(STRIP) $@
+ 
+ #############################################################################
+ 
+ # 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"
+ 
+-InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
++InstalledNSS: $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME) $(DESTDIR)etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8
+ 	@echo $+ " installed"
+ 
+-InstalledManPages: $(MANPATH)/man8/mdnsd.8
++InstalledManPages: $(DESTDIR)$(MANPATH)/man8/mdnsd.8
+ 	@echo $+ " installed"
+ 
+-$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
++$(DESTDIR)$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
+ 	$(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)
+-ifdef LDCONFIG
+-    # -m means 'merge into existing database', -R means 'rescan directories'
+-	$(LDCONFIG) -mR
+-endif
++	$(LN) libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
+ 
+-$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
++$(DESTDIR)$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
+ 	$(CP) $< $@
+ 
+-$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR)
++$(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR)
+ 	$(CP) $< $@
+ 	chmod ugo+x $@
+ ifdef RUNLEVELSCRIPTSDIR
+@@ -478,31 +474,26 @@
+ endif
+ endif
+ 
+-$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
+-	$(LN) $< $@
+-	ldconfig
++$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE)
++	$(LN) $(NSSLIBFILE) $@
+ 
+-$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
++$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
+ 	$(CP) $< $@
+ 	chmod 444 $@
+ 
+-/etc/nss_mdns.conf: nss_mdns.conf
++$(DESTDIR)etc/nss_mdns.conf: nss_mdns.conf
+ 	$(CP) $< $@
+ 	chmod 444 $@
+-	# Check the nsswitch.conf file.
+-	# If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns'
+-	cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns
+-	sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf
+ 
+-$(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 $@
+ 
+@@ -537,7 +528,7 @@
+ 	$(JAR) -cf $@ -C $(OBJDIR) com
+ 
+ $(BUILDDIR)/libjdns_sd.$(LDSUFFIX): $(JAVASRC)/JNISupport.c $(OBJDIR)/DNSSD.java.h
+-	$(CC) -o $@ $< $(JAVACFLAGS) -I$(OBJDIR)
++	$(CC) -o $@ $< $(JAVACFLAGS) -I$(OBJDIR) -L$(BUILDDIR)
+ 
+ $(OBJDIR)/com/apple/dnssd/%.class:	$(JAVASRC)/%.java
+ 	$(JAVAC) -d $(OBJDIR) -classpath $(OBJDIR) $<
diff --git a/net-misc/mDNSResponder/files/mDNSResponderPosix.conf b/net-misc/mDNSResponder/files/mDNSResponderPosix.conf
new file mode 100644
index 000000000000..639e7be27072
--- /dev/null
+++ b/net-misc/mDNSResponder/files/mDNSResponderPosix.conf
@@ -0,0 +1,23 @@
+# See http://www.dns-sd.org/ServiceTypes.html for service types and parameters.
+# Format is:
+#	name
+#	service type
+#	port
+#	[params, name=value, one per line]
+# NOTE: At least as of 107.1 there is a bug where you cannot have a blank line
+# NOTE: before the first entry if there are any leading comments.
+#yourhost
+#_ssh._tcp.
+#22
+
+#yourhost
+#_http._tcp.
+#80
+#path=/
+
+#yourhost
+#_ftp._tcp.
+#21
+#u=yourusername
+#p=password
+#path=/somepath
diff --git a/net-misc/mDNSResponder/files/mDNSResponderPosix.conf.d b/net-misc/mDNSResponder/files/mDNSResponderPosix.conf.d
new file mode 100644
index 000000000000..11b73228c7b4
--- /dev/null
+++ b/net-misc/mDNSResponder/files/mDNSResponderPosix.conf.d
@@ -0,0 +1,2 @@
+# Add extra arguments to mDNSResponderPosix here.
+#RESPONDER_ARGS=
diff --git a/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d b/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d
new file mode 100644
index 000000000000..35bbf201477b
--- /dev/null
+++ b/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d,v 1.1 2005/08/27 16:46:45 greg_g Exp $
+
+opts="${opts} reload debug"
+
+depend() {
+	need mdnsd
+}
+
+start() {
+	if [ ! -f "/etc/mDNSResponderPosix.conf" ]; then
+		eerror "You need to setup /etc/mDNSResponderPosix.conf first"
+		return 1
+	fi
+
+	ebegin "Starting mDNSResponderPosix"
+	start-stop-daemon --start --quiet --pidfile /var/run/mDNSResponderPosix.pid \
+		--exec /usr/sbin/mDNSResponderPosix \
+		-- -b -f /etc/mDNSResponderPosix.conf -P /var/run/mDNSResponderPosix.pid \
+		$RESPONDER_ARGS
+
+	eend $? "Failed to start mDNSResponderPosix"
+}
+
+stop() {
+	ebegin "Stopping mDNSResponderPosix"
+	start-stop-daemon --stop --quiet --pidfile /var/run/mDNSResponderPosix.pid
+	eend $? "Failed to stop mDNSResponderPosix"
+}
+
+reload() {
+	ebegin "Reloading mDNSResponderPosix"
+	kill -HUP `cat /var/run/mDNSResponderPosix.pid` >&/dev/null
+	eend $? "Failed to reload mDNSResponderPosix"
+}
+
+debug() {
+	ebegin "Changing verbosity of mDNSResponderPosix"
+	kill -USR1 `cat /var/run/mDNSResponderPosix.pid` >&/dev/null
+	eend $? "Failed to change verbosity"
+}
diff --git a/net-misc/mDNSResponder/files/mdnsd.init.d b/net-misc/mDNSResponder/files/mdnsd.init.d
index 6e726e31cfb5..44a8a682c900 100644
--- a/net-misc/mDNSResponder/files/mdnsd.init.d
+++ b/net-misc/mDNSResponder/files/mdnsd.init.d
@@ -1,20 +1,36 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/mdnsd.init.d,v 1.1 2005/02/23 21:41:22 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/mdnsd.init.d,v 1.2 2005/08/27 16:46:45 greg_g Exp $
+
+opts="${opts} reload dump"
+
+depend() {
+	after net
+}
 
 start() {
-        ebegin "Starting mdnsd"
-        start-stop-daemon --start --quiet --pidfile /var/run/mdnsd.pid \
-                --startas /usr/sbin/mdnsd
-        eend $? "Failed to start mdnsd"
+	ebegin "Starting mdnsd"
+	start-stop-daemon --start --quiet --pidfile /var/run/mdnsd.pid \
+		--exec /usr/sbin/mdnsd
+
+	eend $? "Failed to start mdnsd"
 }
 
 stop() {
-        ebegin "Stopping mdnsd"
-        start-stop-daemon --stop --quiet --pidfile /var/run/mdnsd.pid
-        eend $? "Failed to stop mdnsd"
+	ebegin "Stopping mdnsd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/mdnsd.pid
+	eend $? "Failed to stop mdnsd"
+}
+
+reload() {
+	ebegin "Reloading mdnsd"
+	kill -HUP `cat /var/run/mdnsd.pid` >&/dev/null
+	eend $? "Failed to reload mdnsd"
+}
 
-        # clean stale pidfile
-        [ -f /var/run/mdnsd.pid ] && rm -f /var/run/mdnsd.pid
+dump() {
+	ebegin "Dump mdnsd state to logs"
+	kill -USR1 `cat /var/run/mdnsd.pid` >&/dev/null
+	eend $? "Failed to dump mdnsd state"
 }
diff --git a/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild
new file mode 100644
index 000000000000..fbf2b09eed93
--- /dev/null
+++ b/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild,v 1.1 2005/08/27 16:46:45 greg_g Exp $
+
+inherit eutils
+
+DESCRIPTION="The mDNSResponder project is a component of Bonjour, Apple's initiative for zero-configuration networking."
+HOMEPAGE="http://developer.apple.com/networking/bonjour/index.html"
+SRC_URI="http://helios.et.put.poznan.pl/~jstachow/pub/${P}.tar.gz"
+LICENSE="APSL-2 BSD"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-Makefiles.patch"
+}
+
+src_compile() {
+	local debug
+	if use debug; then
+		debug="DEBUG=1"
+	fi
+
+	cd ${S}/mDNSPosix
+	emake os=linux ${debug} || die "make mDNSPosix failed"
+
+	cd ${S}/Clients
+	emake os=linux ${debug} || die "make Clients failed"
+}
+
+src_install() {
+	cd "${S}/mDNSPosix"
+
+	dodir /usr/sbin
+	dodir /usr/lib
+	dodir /usr/include
+	dodir /lib
+	dodir /etc
+	dodir /usr/share/man/man5
+	dodir /usr/share/man/man8
+
+	local debug
+	local objdir="prod"
+	if use debug; then
+		debug="DEBUG=1"
+		objdir=debug
+	fi
+
+	emake DESTDIR="${D}" os=linux ${debug} install || die "install failed"
+
+	dosbin ${S}/mDNSPosix/build/${objdir}/dnsextd
+	dosbin ${S}/mDNSPosix/build/${objdir}/mDNSResponderPosix
+	dosbin ${S}/mDNSPosix/build/${objdir}/mDNSNetMonitor
+
+	dobin ${S}/Clients/build/dns-sd
+	dobin ${S}/mDNSPosix/build/${objdir}/mDNSProxyResponderPosix
+	dobin ${S}/mDNSPosix/build/${objdir}/mDNSIdentify
+
+	newinitd ${FILESDIR}/mdnsd.init.d mdnsd
+	newinitd ${FILESDIR}/mDNSResponderPosix.init.d mDNSResponderPosix
+	newconfd ${FILESDIR}/mDNSResponderPosix.conf.d mDNSResponderPosix
+	newinitd ${FILESDIR}/dnsextd.init.d dnsextd
+	newconfd ${FILESDIR}/dnsextd.conf.d dnsextd
+
+	insinto /etc
+	doins ${FILESDIR}/mDNSResponderPosix.conf
+
+	dodoc ${S}/README.txt
+}
+
+pkg_postinst() {
+	echo
+	einfo "To enable multicast dns lookups for applications"
+	einfo "that are not multicast dns aware, edit the 'hosts:'"
+	einfo "line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+	einfo "hosts: files mdns dns"
+	echo
+}