[arch-commits] Commit in avahi/trunk (PKGBUILD avahi-daemon-dbus.patch)

[Gaetan Bisson]

    Date: Tuesday, August 17, 2010 @ 18:39:49
  Author: bisson
Revision: 87694

upstream bug/security-fix update, and some packaging changes:
- removed old versioned dependencies
- build against qt rather than qt3
- simplified avahi-daemon patch

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/avahi-daemon-dbus.patch

-------------------------+
 PKGBUILD                |   73 +++++++++++++++++++++++-----------------------
 avahi-daemon-dbus.patch |   19 ++++-------
 2 files changed, 44 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-17 21:39:29 UTC (rev 87693)
+++ PKGBUILD	2010-08-17 22:39:49 UTC (rev 87694)
@@ -2,40 +2,47 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=avahi
-pkgver=0.6.25
-pkgrel=3
-pkgdesc="A multicast/unicast DNS-SD framework"
+pkgver=0.6.27
+pkgrel=1
+pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
-url="http://www.avahi.org/"
+url='http://www.avahi.org/'
 license=('LGPL')
-depends=('dbus>=1.1.20-1' 'libcap>=2.16' 'libdaemon>=0.11' 'gdbm' 'glib2' 'expat')
-optdepends=('qt3: Qt3 UI support'
-	'libglade: avahi-discover-standalone'
-	'nss-mdns: NSS support for mDNS'
-	'pygtk: avahi-discover'
-	'dbus-python: avahi-discover')
-makedepends=('mono' 'pygtk' 'gtk-sharp-2' 'dbus-python' 'qt3' 'libglade' 'intltool')
+depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
+optdepends=('pygtk: avahi-discover'
+            'dbus-python: avahi-discover'
+            'gtk2: avahi-discover-standalone'
+            'libglade: avahi-discover-standalone'
+            'pygtk: avahi-bookmarks'
+            'twisted: avahi-bookmarks')
+makedepends=('qt' 'pygtk' 'mono' 'libglade' 'intltool' 'dbus-python' 'gtk-sharp-2')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
 replaces=('howl' 'mdnsresponder')
 options=('!libtool')
-source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png avahi-daemon-dbus.patch)
+source=("http://www.avahi.org/download/avahi-$pkgver.tar.gz"
+        'avahi-daemon-dbus.patch'
+        'gnome-nettool.png')
+sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
+          '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
+          'cf56387c88aed246b9f435efc182ef44de4d52f3')
 
+
 build() {
-  [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
-  export MONO_SHARED_DIR=${srcdir}/.wabi
-  mkdir -p ${MONO_SHARED_DIR}
+  cd "$srcdir/$pkgname-$pkgver"
 
-  cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i 's/Requires.private/Requires/' avahi-qt4.pc.in
+  sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+  patch -p0 < ../avahi-daemon-dbus.patch
 
-  sed -i 's|Requires.private|Requires|' avahi-qt3.pc.in
-
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --disable-qt4 \
+    --disable-qt3 \
+    --disable-gtk3 \
     --disable-monodoc \
     --disable-doxygen-doc \
     --disable-xmltoman \
@@ -43,29 +50,23 @@
     --enable-compat-howl \
     --with-distro=archlinux \
     --with-avahi-priv-access-group=network \
-    --enable-autoipd \
     --with-autoipd-user=avahi \
     --with-autoipd-group=avahi
 
-  make || return 1
-  make DESTDIR=${pkgdir} install
+  make
+}
 
-  rm -rf ${MONO_SHARED_DIR}
-  
-  sed -i -e 's/netdev/network/g' ${pkgdir}/etc/dbus-1/system.d/avahi-dbus.conf
-   
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
   # howl and mdnsresponder compatability
-  cd ${pkgdir}/usr/include
+  cd "$pkgdir"/usr/include
   ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h
   ln -s avahi-compat-howl howl
-  cd ${pkgdir}/usr/lib/pkgconfig
+  cd "$pkgdir"/usr/lib/pkgconfig
   ln -s avahi-compat-howl.pc howl.pc
-  mkdir -p ${pkgdir}/usr/share/pixmaps
-  install -m 644 ${srcdir}/gnome-nettool.png ${pkgdir}/usr/share/pixmaps/gnome-nettool.png
 
-  cd ${pkgdir}
-  patch -p0 < ${srcdir}/avahi-daemon-dbus.patch || return 1
+  install -D -m 644 "$srcdir"/gnome-nettool.png "$pkgdir"/usr/share/pixmaps/gnome-nettool.png
 }
-md5sums=('a83155a6e29e3988f07e5eea3287b21e'
-         '42c2905307c7a5dc6ac4b75f4c3d65a3'
-	 '0e1f5900b56fcfa1bffddb4f233f539f')

Modified: avahi-daemon-dbus.patch
===================================================================
--- avahi-daemon-dbus.patch	2010-08-17 21:39:29 UTC (rev 87693)
+++ avahi-daemon-dbus.patch	2010-08-17 22:39:49 UTC (rev 87694)
@@ -1,16 +1,11 @@
---- etc/rc.d/avahi-daemon	2010-02-26 21:10:30.000000000 -0600
-+++ etc/rc.d/avahi-daemon	2010-02-26 21:09:44.000000000 -0600
-@@ -35,8 +35,11 @@
+--- initscript/archlinux/avahi-daemon.in	2010-08-17 22:23:46.510293144 +0200
++++ initscript/archlinux/avahi-daemon.in	2010-08-17 22:46:58.110163026 +0200
+@@ -33,6 +35,8 @@
  
  case "$1" in
      start)
--        stat_busy "Starting $DESC"
--        $DAEMON -D > /dev/null 2>&1
-+	if ck_daemon dbus; then
-+		/etc/rc.d/dbus start
-+	fi
-+    	stat_busy "Starting $DESC"
-+        modprobe capability  > /dev/null 2>&1 ;  $DAEMON -D > /dev/null 2>&1
++        ck_daemon dbus && /etc/rc.d/dbus start
++        modprobe capability &> /dev/null
+         stat_busy "Starting $DESC"
+         $DAEMON -D > /dev/null 2>&1
          if [ $? -gt 0 ]; then
-             stat_fail
-         else