From 5a680f7689b01b4b7a0bfade1a6c1f659f8cbed4 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 7 Mar 2012 00:01:25 +0000
Subject: Wed Mar  7 00:01:25 UTC 2012

---
 extra/dnsmasq/PKGBUILD        | 24 +++++++++++++-----------
 extra/dnsmasq/dnsmasq.service |  4 ++--
 extra/dnsmasq/rc.dnsmasq      |  6 +++---
 3 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'extra/dnsmasq')

diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 6751d8023..0d9eb307b 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 141089 2011-10-23 16:20:24Z dreisner $
+# $Id: PKGBUILD 152257 2012-03-06 04:01:25Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.59
+pkgver=2.60
 pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('glibc' 'dbus-core')
-makedepends=('libcap>=2.16')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf'
         'etc/conf.d/dnsmasq')
@@ -19,24 +18,27 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
         'dnsmasq.confd'
         'rc.dnsmasq'
         'dnsmasq.service')
-md5sums=('b5757ef2d7b651748eeebb88af29d7d6'
+md5sums=('5a09908e02724d759ac60d9cafd27de8'
          '66479e99123faeab83ebaed709ef95b5'
-         '9f180cc236808bbd02ca8652fd2e8217'
-         'f329d86f8ba1cd85f9b6ee59e0ce3791')
+         '819fbdf6440d710616e6df5f8ca9cdba'
+         '631d8349acbed1b01d4e11d9f42fdb7d')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  # link against dbus
-  echo '#define HAVE_DBUS' >> src/config.h
+  # link against dbus. this ugliness is needed to ensure that the
+  # compile time opts report properly on startup. yuck.
+  sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ {
+    i#define HAVE_DBUS
+  }' src/config.h
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
 
   install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
   install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq"
diff --git a/extra/dnsmasq/dnsmasq.service b/extra/dnsmasq/dnsmasq.service
index b09cb24b9..05a1f0b69 100644
--- a/extra/dnsmasq/dnsmasq.service
+++ b/extra/dnsmasq/dnsmasq.service
@@ -4,8 +4,8 @@ Description=A lightweight DHCP and caching DNS server
 [Service]
 Type=dbus
 BusName=uk.org.thekelleys.dnsmasq
-ExecStartPre=/usr/sbin/dnsmasq --test
-ExecStart=/usr/sbin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
+ExecStartPre=/usr/bin/dnsmasq --test
+ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq
index 0ce736ba9..4030c2896 100755
--- a/extra/dnsmasq/rc.dnsmasq
+++ b/extra/dnsmasq/rc.dnsmasq
@@ -7,7 +7,7 @@
 checkconfig() {
   local testout
 
-  if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
+  if ! testout=$(/usr/bin/dnsmasq --test 2>&1); then
     echo "$testout"
     return 1
   fi
@@ -29,7 +29,7 @@ case $1 in
   start)
     stat_busy "Starting DNS/DHCP daemon"
     if [[ -z $PID ]] && checkconfig &&
-        /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
+        /usr/bin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
                           "--pid-file=$pidfile" \
                           "${DNSMASQ_OPTS[@]}"; then
       add_daemon dnsmasq
@@ -56,7 +56,7 @@ case $1 in
     ;;
   checkconfig)
     # diagnostics will be printed, with zero/non-zero exit
-    /usr/sbin/dnsmasq --test
+    /usr/bin/dnsmasq --test
     ;;
   *)
     echo "usage: $0 <start|stop|restart|checkconfig>"
-- 
cgit v1.2.3-54-g00ecf