network/avahi: Updated for version 0.6.31.

Thanks to Robby Workman for the dnsconfd.action.patch.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 79 insertions, 6 deletions

diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
index c2e962212327..9cdb269b5800 100644
--- a/network/avahi/avahi.SlackBuild
+++ b/network/avahi/avahi.SlackBuild
@@ -6,7 +6,7 @@
 # Derived from Slackware's Slackbuilds.
 #
 # Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# Copyright 2008-2011  David Somero (dsomero@hotmail.com) Athens, TN, USA
+# Copyright 2008-2012  David Somero (dsomero@hotmail.com) Athens, TN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=avahi
-VERSION=0.6.30
+VERSION=0.6.31
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -92,6 +92,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
+# Thanks to Robby Workman for this patch.
+patch -p1 --verbose < $CWD/fixup_avahi-dnsconfd.action.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -101,6 +104,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-tests \
   --disable-static \
   --disable-monodoc \
   --disable-autoipd \
@@ -110,7 +114,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-dbus \
   --enable-python \
   --enable-gtk \
-  --disable-gtk3 \
+  --enable-gtk3 \
   --enable-qt4 \
   --disable-qt3 \
   --enable-core-docs \
diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info
index 3edbb2972443..54f5a96498b0 100644
--- a/network/avahi/avahi.info
+++ b/network/avahi/avahi.info
@@ -1,8 +1,8 @@
 PRGNAM="avahi"
-VERSION="0.6.30"
+VERSION="0.6.31"
 HOMEPAGE="http://avahi.org/"
-DOWNLOAD="http://avahi.org/download/avahi-0.6.30.tar.gz"
-MD5SUM="e4db89a2a403ff4c47d66ac66fad1f43"
+DOWNLOAD="http://avahi.org/download/avahi-0.6.31.tar.gz"
+MD5SUM="2f22745b8f7368ad5a0a3fddac343f2d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libdaemon"
diff --git a/network/avahi/fixup_avahi-dnsconfd.action.patch b/network/avahi/fixup_avahi-dnsconfd.action.patch
new file mode 100644
index 000000000000..88f9b5f80770
--- /dev/null
+++ b/network/avahi/fixup_avahi-dnsconfd.action.patch
@@ -0,0 +1,69 @@
+avahi-dnsconfd.action looks for /sbin/netconfig, and if found, attempts to 
+use it to modify /etc/resolv.conf.  While *our* netconfig and SuSE's
+netconfig started out the same, they're quite different these days, and
+thus the result is /etc/HOSTNAME getting set to some nonsense such as:
+  INTERFACE='eth0'.DNSSERVERS='192.168.13.1'
+This was quite some fun tracking down, by the way...  :-)  --rworkman
+
+
+diff -Nur avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action
+--- avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action	2010-06-28 22:30:34.000000000 -0500
++++ avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action	2012-01-21 16:18:24.337986754 -0600
+@@ -33,48 +33,16 @@
+ #   $AVAHI_INTERFACE_DNS_SERVERS   A whitespace seperated list of DNS servers on $AVAHI_INTERFACE
+ #   $AVAHI_DNS_SERVERS             The complete list of all DNS servers found on all interfaces
+ 
+-if [ -x /sbin/netconfig ]; then
+-    # SUSE method on 11.1+
+-    if [ -n "$AVAHI_INTERFACE_DNS_SERVERS" ]; then
+-	/sbin/netconfig modify -s avahi -i "$AVAHI_INTERFACE" <<-EOF
+-	INTERFACE='$AVAHI_INTERFACE'
+-	DNSSERVERS='$AVAHI_INTERFACE_DNS_SERVERS'
+-	EOF
+-    else
+-	/sbin/netconfig remove -s avahi -i "$AVAHI_INTERFACE"
+-    fi
+-elif [ -x /sbin/modify_resolvconf ] ; then
+-    # method for SUSE <= 11.0
+-    if [ -n "$AVAHI_DNS_SERVERS" ]; then
+-	/sbin/modify_resolvconf modify -s avahi -t - -p avahi-dnsconfd -n "$AVAHI_DNS_SERVERS" <<-EOF
+-	if you don't like avahi to update your Nameservers
+-	disable the avahi-dnsconfd init script
+-	EOF
+-    else
+-	/sbin/modify_resolvconf restore -s avahi
+-    fi
+-elif [ -x /sbin/resolvconf ] ; then
+ 
+-    # We have Debian's resolvconf tool
+-
+-    if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then
+-        /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi"
+-    else
+-        for n in $AVAHI_INTERFACE_DNS_SERVERS ; do 
+-            echo "nameserver $n"
+-        done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi"
+-    fi
+-else
+-
+-    # No resolvconf tool available
+-
+-    if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then
++if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then
+         test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf
+-    else
++else
+         test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi
+ 
+-        for n in $AVAHI_DNS_SERVERS ; do 
+-            echo "nameserver $n"
+-        done > /etc/resolv.conf
+-    fi
++        grep -v ^nameserver /etc/resolv.conf.avahi > /etc/resolv.conf
++
++        for n in $AVAHI_DNS_SERVERS ; do
++                echo "nameserver $n"
++        done >> /etc/resolv.conf
+ fi
++
+