fix avahi-socket path (bug #159341)

Package-Manager: portage-2.1.2_rc4-r2

5 files changed, 107 insertions, 5 deletions

diff --git a/sys-auth/nss-mdns/ChangeLog b/sys-auth/nss-mdns/ChangeLog
index eab7ea15c634..e0e65a6203e8 100644
--- a/sys-auth/nss-mdns/ChangeLog
+++ b/sys-auth/nss-mdns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/nss-mdns
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/ChangeLog,v 1.11 2006/08/01 14:52:20 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/ChangeLog,v 1.12 2006/12/30 07:21:20 compnerd Exp $
+
+*nss-mdns-0.8-r1 (30 Dec 2006)
+
+  30 Dec 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/nss-mdns-0.8-avahi-socket.patch, +nss-mdns-0.8-r1.ebuild:
+  Fix avahi-socket path, bug #159341
 
   01 Aug 2006; Simon Stelling <blubb@gentoo.org> nss-mdns-0.8.ebuild:
   stable on amd64
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index f7b9283816b5..7f66f616cf61 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -2,20 +2,28 @@ AUX mdns.allow 29 RMD160 c65a9a70c14528b7330a51187634b51c43725397 SHA1 2be715163
 MD5 e571bfc04e713afe6b26f9de16906d2e files/mdns.allow 29
 RMD160 c65a9a70c14528b7330a51187634b51c43725397 files/mdns.allow 29
 SHA256 9fde506c70de0983039fc17b705fd40a2e43fbb8d426a74f662a09136458bc40 files/mdns.allow 29
+AUX nss-mdns-0.8-avahi-socket.patch 893 RMD160 c838927dae4da73a63d8d8cc628ccc0c026dd075 SHA1 575481ac15ddc6bbd7111d7b011af947b5a296ca SHA256 3ec68966c04ffec0324fdde06ded47f602aca05672ef69592a7d079bf932f641
+MD5 b12d20ca6fafd471c83033c2eb329faf files/nss-mdns-0.8-avahi-socket.patch 893
+RMD160 c838927dae4da73a63d8d8cc628ccc0c026dd075 files/nss-mdns-0.8-avahi-socket.patch 893
+SHA256 3ec68966c04ffec0324fdde06ded47f602aca05672ef69592a7d079bf932f641 files/nss-mdns-0.8-avahi-socket.patch 893
 DIST nss-mdns-0.7.tar.gz 333327 RMD160 91e30ea0a01f5d7600bac0374aa51529472ac9d9 SHA1 9221df6aa6b2752664002bc5419ad84e2e7e459f SHA256 3c45afef8390d8eae65e1415f7de159b7fdcef649218238a6cac8e9952fde7d5
 DIST nss-mdns-0.8.tar.gz 342256 RMD160 08b361275e68c7623ba41d304867178ae6a0301f SHA1 fd4d1c4d9dfcd4aebe01e19a98121adfcbaf7161 SHA256 280212222924155627aea4ac2eb57073b8aa78a831b177fcae46de1ac211715a
 EBUILD nss-mdns-0.7.ebuild 1403 RMD160 4ca9e6ddf6de1f310181aaf6125d3c8527dc14a2 SHA1 1f38763b1717c244934f11815d740e4dc6fccca1 SHA256 b1bcb394fd43e4d31663651af464652e6f99dbdfb6ae7b25774371e2db7e797c
 MD5 0eeca5aeaf1c9f5493f7a318608b1b0c nss-mdns-0.7.ebuild 1403
 RMD160 4ca9e6ddf6de1f310181aaf6125d3c8527dc14a2 nss-mdns-0.7.ebuild 1403
 SHA256 b1bcb394fd43e4d31663651af464652e6f99dbdfb6ae7b25774371e2db7e797c nss-mdns-0.7.ebuild 1403
+EBUILD nss-mdns-0.8-r1.ebuild 1749 RMD160 8a4cb4046d8d765cc7449bf1b820458fb07f5e19 SHA1 e8665c51e101f00ef335e12c991668aae9aa40f6 SHA256 5d1bb4d11c0dfc2c308132be3847260a7c3acc9b6794065897ce9cd879f1bed7
+MD5 a0b45df887f439681a318ec54df65c35 nss-mdns-0.8-r1.ebuild 1749
+RMD160 8a4cb4046d8d765cc7449bf1b820458fb07f5e19 nss-mdns-0.8-r1.ebuild 1749
+SHA256 5d1bb4d11c0dfc2c308132be3847260a7c3acc9b6794065897ce9cd879f1bed7 nss-mdns-0.8-r1.ebuild 1749
 EBUILD nss-mdns-0.8.ebuild 1629 RMD160 c0b2807d91dd822854d9da9f38a3252e5cdaef68 SHA1 f24d9600030899a206f3f866f53008f9dc7e1703 SHA256 fc70d6f13e72b373eed6da51d8a634d14b9c6d445369f5dd20d17c749489e0bb
 MD5 ef38b5ac651ea8dd1b64af5ecd4f317f nss-mdns-0.8.ebuild 1629
 RMD160 c0b2807d91dd822854d9da9f38a3252e5cdaef68 nss-mdns-0.8.ebuild 1629
 SHA256 fc70d6f13e72b373eed6da51d8a634d14b9c6d445369f5dd20d17c749489e0bb nss-mdns-0.8.ebuild 1629
-MISC ChangeLog 1572 RMD160 704d45fb19da934455f047bcac8170b1d725bf5a SHA1 c238ede938c2fe0fa0bcaf0b5c5822a0123f58dc SHA256 71b747c4408c5644559d8bd394a7efb32ee77870912b42a7fed7c4f380665b66
-MD5 4b31428f2159a42c09284ed32e55d432 ChangeLog 1572
-RMD160 704d45fb19da934455f047bcac8170b1d725bf5a ChangeLog 1572
-SHA256 71b747c4408c5644559d8bd394a7efb32ee77870912b42a7fed7c4f380665b66 ChangeLog 1572
+MISC ChangeLog 1768 RMD160 5d27f1448aaf28d016af4b5ef5fa734cca49424e SHA1 124904d024eb6d584d319dc11a79067b9a3400a4 SHA256 96c9768a2d6e47b74b31cb5e026111799e9bc3dd6c9360d30aa0dd4fa9e3eee0
+MD5 872bce2457e6d4206cc4cab079a1b8b7 ChangeLog 1768
+RMD160 5d27f1448aaf28d016af4b5ef5fa734cca49424e ChangeLog 1768
+SHA256 96c9768a2d6e47b74b31cb5e026111799e9bc3dd6c9360d30aa0dd4fa9e3eee0 ChangeLog 1768
 MISC metadata.xml 509 RMD160 d596e7e487223fc6f70ceefd01ccebc705370ce5 SHA1 b3ba12ddc2f63f9c034f41e3267e11d29e71cef4 SHA256 754a514696213a355fbbade110f0b57cd5c15a3b96b57f7859e4a82ca9442428
 MD5 554d9a0f33bac5a9356d9b07a8bab872 metadata.xml 509
 RMD160 d596e7e487223fc6f70ceefd01ccebc705370ce5 metadata.xml 509
@@ -26,3 +34,6 @@ SHA256 16dd55585f3b1a0e9695e318d39c5e579606f9088d7282542924635f0148d0f0 files/di
 MD5 0815227d85fb66812c0ca1d539fdfe35 files/digest-nss-mdns-0.8 238
 RMD160 917da0954f827218a557a7410c2fc2f863fec68e files/digest-nss-mdns-0.8 238
 SHA256 08c6fc678482d38f085cd43f9ad583bca4e80357e6c1c8707668de71de084806 files/digest-nss-mdns-0.8 238
+MD5 0815227d85fb66812c0ca1d539fdfe35 files/digest-nss-mdns-0.8-r1 238
+RMD160 917da0954f827218a557a7410c2fc2f863fec68e files/digest-nss-mdns-0.8-r1 238
+SHA256 08c6fc678482d38f085cd43f9ad583bca4e80357e6c1c8707668de71de084806 files/digest-nss-mdns-0.8-r1 238
diff --git a/sys-auth/nss-mdns/files/digest-nss-mdns-0.8-r1 b/sys-auth/nss-mdns/files/digest-nss-mdns-0.8-r1
new file mode 100644
index 000000000000..bef767a68856
--- /dev/null
+++ b/sys-auth/nss-mdns/files/digest-nss-mdns-0.8-r1
@@ -0,0 +1,3 @@
+MD5 d7545fbf6df15f3af502531efcf15a25 nss-mdns-0.8.tar.gz 342256
+RMD160 08b361275e68c7623ba41d304867178ae6a0301f nss-mdns-0.8.tar.gz 342256
+SHA256 280212222924155627aea4ac2eb57073b8aa78a831b177fcae46de1ac211715a nss-mdns-0.8.tar.gz 342256
diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket.patch b/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket.patch
new file mode 100644
index 000000000000..2b73165b7135
--- /dev/null
+++ b/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.am	2006-12-30 01:00:22.000000000 -0600
++++ src/Makefile.am	2006-12-30 01:01:11.000000000 -0600
+@@ -20,7 +20,7 @@
+ AM_CFLAGS = \
+ 	-DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
+ 	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
+-	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"
++	-DAVAHI_SOCKET=\"$(ROOT)var/run/avahi-daemon/socket\"
+ 
+ #AM_CFLAGS += -DNDEBUG=1 -Os
+ 
+--- src/Makefile.in	2006-12-30 01:00:19.000000000 -0600
++++ src/Makefile.in	2006-12-30 01:00:37.000000000 -0600
+@@ -301,7 +301,7 @@
+ # This cool debug trap works on i386/gcc only
+ AM_CFLAGS = -DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
+ 	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
+-	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\" \
++	-DAVAHI_SOCKET=\"$(ROOT)var/run/avahi-daemon/socket\" \
+ 	'-DDEBUG_TRAP=__asm__("int $$3")'
+ lib_LTLIBRARIES = \
+ 	libnss_mdns.la \
diff --git a/sys-auth/nss-mdns/nss-mdns-0.8-r1.ebuild b/sys-auth/nss-mdns/nss-mdns-0.8-r1.ebuild
new file mode 100644
index 000000000000..17c6686813aa
--- /dev/null
+++ b/sys-auth/nss-mdns/nss-mdns-0.8-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/nss-mdns-0.8-r1.ebuild,v 1.1 2006/12/30 07:21:20 compnerd Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Name Service Switch module for Multicast DNS"
+HOMEPAGE="http://0pointer.de/lennart/projects/nss-mdns/"
+SRC_URI="http://0pointer.de/lennart/projects/nss-mdns/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="avahi"
+
+DEPEND="avahi? ( net-dns/avahi )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-0.8-avahi-socket.patch
+	eautomake
+}
+
+src_compile() {
+	econf $(use_enable avahi) || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+
+	insinto /etc
+	doins ${FILESDIR}/mdns.allow
+
+	dodoc README
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "You must modify your name service switch look up file to enable"
+	ewarn "multicast DNS lookups.  If you wish to resolve only IPv6 addresses"
+	ewarn "use mdns6.  For IPv4 addresses only, use mdns4.  To resolve both"
+	ewarn "use mdns.  Keep in mind that mdns will be slower if there are no"
+	ewarn "IPv6 addresses published via mDNS on the network.  There are also"
+	ewarn "minimal (mdns?_minimal) libraries which only lookup .local hosts"
+	ewarn "and 169.254.x.x addresses."
+	ewarn
+	ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf"
+	ewarn "An example line looks like:"
+	einfo "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
+	ewarn
+	ewarn "If you want to perform mDNS lookups for domains other than the ones"
+	ewarn "ending in .local, add them to /etc/mdns.allow"
+	ewarn
+	ebeep 5
+	epause 10
+}