[arch-commits] Commit in dnsmasq/trunk (PKGBUILD dnsmasq.service rc.dnsmasq)

[Dave Reisner]

    Date: Monday, March 5, 2012 @ 20:59:22
  Author: dreisner
Revision: 152251

upgpkg: dnsmasq 2.60-1

- upstrema release 2.60
- install daemon to /usr/bin

Modified:
  dnsmasq/trunk/PKGBUILD
  dnsmasq/trunk/dnsmasq.service
  dnsmasq/trunk/rc.dnsmasq

-----------------+
 PKGBUILD        |   22 ++++++++++++----------
 dnsmasq.service |    4 ++--
 rc.dnsmasq      |    6 +++---
 3 files changed, 17 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-06 01:50:30 UTC (rev 152250)
+++ PKGBUILD	2012-03-06 01:59:22 UTC (rev 152251)
@@ -4,14 +4,13 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.59
-pkgrel=2
+pkgver=2.60
+pkgrel=1
 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 @@
         'dnsmasq.confd'
         'rc.dnsmasq'
         'dnsmasq.service')
-md5sums=('b5757ef2d7b651748eeebb88af29d7d6'
+md5sums=('5a09908e02724d759ac60d9cafd27de8'
          '66479e99123faeab83ebaed709ef95b5'
          '9f180cc236808bbd02ca8652fd2e8217'
-         'f329d86f8ba1cd85f9b6ee59e0ce3791')
+         '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"

Modified: dnsmasq.service
===================================================================
--- dnsmasq.service	2012-03-06 01:50:30 UTC (rev 152250)
+++ dnsmasq.service	2012-03-06 01:59:22 UTC (rev 152251)
@@ -4,8 +4,8 @@
 [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]

Modified: rc.dnsmasq
===================================================================
--- rc.dnsmasq	2012-03-06 01:50:30 UTC (rev 152250)
+++ rc.dnsmasq	2012-03-06 01:59:22 UTC (rev 152251)
@@ -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 @@
   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 @@
     ;;
   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>"