merge of '8bfdfaf4e5f3e1114fa91502c9eafe85c21a06dd'

     and 'ce48c156b1ce78cf4d83f981c103ec2f8d2b529e'

5 files changed, 5 insertions, 71 deletions

diff --git a/packages/libnss-mdns/files/.mtn2git_empty b/packages/libnss-mdns/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libnss-mdns/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libnss-mdns/files/alignment-fix.patch b/packages/libnss-mdns/files/alignment-fix.patch
deleted file mode 100644
index 11d4655e1f..0000000000
--- a/packages/libnss-mdns/files/alignment-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nss-mdns-0.6/src/nss.c.orig	2005-09-25 17:27:51 +0200
-+++ nss-mdns-0.6/src/nss.c	2005-09-25 17:28:55 +0200
-@@ -456,6 +456,8 @@
-     result->h_addrtype = af;
-     result->h_length = address_length;
-     
-+    idx+=(sizeof(char*)-idx%sizeof(char*)); /* Align on 32 bit boundary */
-+    
-     /* Check if there's enough space for the addresses */
-     if (buflen < idx+u.data_len+sizeof(char*)*(u.count+1)) {
-         *errnop = ERANGE;
diff --git a/packages/libnss-mdns/libnss-mdns_0.6.bb b/packages/libnss-mdns/libnss-mdns_0.6.bb
deleted file mode 100644
index 5de9df567c..0000000000
--- a/packages/libnss-mdns/libnss-mdns_0.6.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "NSS module for Multicast DNS name resolution"
-HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-
-RRECOMMENDS_${PN} = "zeroconf"
-PR = "r1"
-
-EXTRA_OECONF = "--libdir=/lib"
-S = "${WORKDIR}/nss-mdns-${PV}"
-
-SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz \
-	   file://alignment-fix.patch;patch=1"
-
-inherit autotools
-
-pkg_postinst () {
-	cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && {
-		cat /etc/nsswitch.conf | sed 's/hosts:\s*files dns/& mdns/' > /tmp/nsswitch.conf
-		mv /tmp/nsswitch.conf /etc/nsswitch.conf
-	}
-}
-
-pkg_prerm () {
-	cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && {
-		cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files dns\) mdns/\1/' > /tmp/nsswitch.conf
-		mv /tmp/nsswitch.conf /etc/nsswitch.conf
-	}
-}
diff --git a/packages/libnss-mdns/libnss-mdns_0.7.bb b/packages/libnss-mdns/libnss-mdns_0.7.bb
deleted file mode 100644
index 98ab50f07f..0000000000
--- a/packages/libnss-mdns/libnss-mdns_0.7.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "NSS module for Multicast DNS name resolution"
-HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-
-RRECOMMENDS_${PN} = "zeroconf"
-PR = "r0"
-
-EXTRA_OECONF = "--libdir=/lib"
-S = "${WORKDIR}/nss-mdns-${PV}"
-
-SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
-
-inherit autotools
-
-pkg_postinst () {
-	cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && {
-		cat /etc/nsswitch.conf | sed 's/hosts:\s*files dns/& mdns4/' > /tmp/nsswitch.conf
-		mv /tmp/nsswitch.conf /etc/nsswitch.conf
-	}
-}
-
-pkg_prerm () {
-	cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && {
-		cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files dns\) mdns4*/\1/' > /tmp/nsswitch.conf
-		mv /tmp/nsswitch.conf /etc/nsswitch.conf
-	}
-}
diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.8.bb
index 475297cd63..a4a9cd00d1 100644
--- a/packages/libnss-mdns/libnss-mdns_0.8.bb
+++ b/packages/libnss-mdns/libnss-mdns_0.8.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 
 RRECOMMENDS_${PN} = "zeroconf"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "--libdir=/lib"
 S = "${WORKDIR}/nss-mdns-${PV}"
@@ -15,6 +15,10 @@ SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
 inherit autotools
 
 pkg_postinst () {
+        # can't do this offline
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
 	cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && {
 		cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf
 		mv /tmp/nsswitch.conf /etc/nsswitch.conf