[arch-commits] Commit in dnsmasq/repos (20 files)

Dave Reisner dreisner at archlinux.org
Sun Oct 23 12:20:25 EDT 2011


    Date: Sunday, October 23, 2011 @ 12:20:24
  Author: dreisner
Revision: 141089

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  dnsmasq/repos/extra-i686/PKGBUILD
    (from rev 141088, dnsmasq/trunk/PKGBUILD)
  dnsmasq/repos/extra-i686/dnsmasq.confd
    (from rev 141088, dnsmasq/trunk/dnsmasq.confd)
  dnsmasq/repos/extra-i686/dnsmasq.install
    (from rev 141088, dnsmasq/trunk/dnsmasq.install)
  dnsmasq/repos/extra-i686/dnsmasq.service
    (from rev 141088, dnsmasq/trunk/dnsmasq.service)
  dnsmasq/repos/extra-i686/rc.dnsmasq
    (from rev 141088, dnsmasq/trunk/rc.dnsmasq)
  dnsmasq/repos/extra-x86_64/PKGBUILD
    (from rev 141088, dnsmasq/trunk/PKGBUILD)
  dnsmasq/repos/extra-x86_64/dnsmasq.confd
    (from rev 141088, dnsmasq/trunk/dnsmasq.confd)
  dnsmasq/repos/extra-x86_64/dnsmasq.install
    (from rev 141088, dnsmasq/trunk/dnsmasq.install)
  dnsmasq/repos/extra-x86_64/dnsmasq.service
    (from rev 141088, dnsmasq/trunk/dnsmasq.service)
  dnsmasq/repos/extra-x86_64/rc.dnsmasq
    (from rev 141088, dnsmasq/trunk/rc.dnsmasq)
Deleted:
  dnsmasq/repos/extra-i686/PKGBUILD
  dnsmasq/repos/extra-i686/dnsmasq.confd
  dnsmasq/repos/extra-i686/dnsmasq.install
  dnsmasq/repos/extra-i686/dnsmasq.service
  dnsmasq/repos/extra-i686/rc.dnsmasq
  dnsmasq/repos/extra-x86_64/PKGBUILD
  dnsmasq/repos/extra-x86_64/dnsmasq.confd
  dnsmasq/repos/extra-x86_64/dnsmasq.install
  dnsmasq/repos/extra-x86_64/dnsmasq.service
  dnsmasq/repos/extra-x86_64/rc.dnsmasq

------------------------------+
 extra-i686/PKGBUILD          |   98 +++++++++++++++----------------
 extra-i686/dnsmasq.confd     |   18 ++---
 extra-i686/dnsmasq.install   |   42 ++++++-------
 extra-i686/dnsmasq.service   |   26 ++++----
 extra-i686/rc.dnsmasq        |  128 ++++++++++++++++++++---------------------
 extra-x86_64/PKGBUILD        |   98 +++++++++++++++----------------
 extra-x86_64/dnsmasq.confd   |   18 ++---
 extra-x86_64/dnsmasq.install |   42 ++++++-------
 extra-x86_64/dnsmasq.service |   26 ++++----
 extra-x86_64/rc.dnsmasq      |  128 ++++++++++++++++++++---------------------
 10 files changed, 312 insertions(+), 312 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-i686/PKGBUILD	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=dnsmasq
-pkgver=2.59
-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')
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
-        'dnsmasq.confd'
-        'rc.dnsmasq'
-        'dnsmasq.service')
-md5sums=('29d43f182ecad06d64b3598c02380a80'
-         '66479e99123faeab83ebaed709ef95b5'
-         '9f180cc236808bbd02ca8652fd2e8217'
-         'f329d86f8ba1cd85f9b6ee59e0ce3791')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # link against dbus
-  echo '#define HAVE_DBUS' >> src/config.h
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make 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"
-
-  install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
-  install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
-  install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
-}
-
-# vim: ts=2 sw=2 et ft=sh

Copied: dnsmasq/repos/extra-i686/PKGBUILD (from rev 141088, dnsmasq/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=dnsmasq
+pkgver=2.59
+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')
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
+        'dnsmasq.confd'
+        'rc.dnsmasq'
+        'dnsmasq.service')
+md5sums=('b5757ef2d7b651748eeebb88af29d7d6'
+         '66479e99123faeab83ebaed709ef95b5'
+         '9f180cc236808bbd02ca8652fd2e8217'
+         'f329d86f8ba1cd85f9b6ee59e0ce3791')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # link against dbus
+  echo '#define HAVE_DBUS' >> src/config.h
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make 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"
+
+  install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
+  install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
+  install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
+}
+
+# vim: ts=2 sw=2 et ft=sh

Deleted: extra-i686/dnsmasq.confd
===================================================================
--- extra-i686/dnsmasq.confd	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-i686/dnsmasq.confd	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,9 +0,0 @@
-#
-# runtime config for dnsmasq
-#
-
-# if unset, dnsmasq will run as nobody.
-DNSMASQ_USER=dnsmasq
-
-# other runtime options. treated as an array.
-DNSMASQ_OPTS=()

Copied: dnsmasq/repos/extra-i686/dnsmasq.confd (from rev 141088, dnsmasq/trunk/dnsmasq.confd)
===================================================================
--- extra-i686/dnsmasq.confd	                        (rev 0)
+++ extra-i686/dnsmasq.confd	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,9 @@
+#
+# runtime config for dnsmasq
+#
+
+# if unset, dnsmasq will run as nobody.
+DNSMASQ_USER=dnsmasq
+
+# other runtime options. treated as an array.
+DNSMASQ_OPTS=()

Deleted: extra-i686/dnsmasq.install
===================================================================
--- extra-i686/dnsmasq.install	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-i686/dnsmasq.install	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-add_dnsmasq_user() {
-  if ! getent passwd dnsmasq >/dev/null; then
-    useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq
-  fi
-}
-
-post_install() {
-  add_dnsmasq_user
-}
-
-post_upgrade() {
-  add_dnsmasq_user
-}
-
-post_remove() {
-  if getent passwd dnsmasq >/dev/null; then
-    userdel dnsmasq
-  fi
-}

Copied: dnsmasq/repos/extra-i686/dnsmasq.install (from rev 141088, dnsmasq/trunk/dnsmasq.install)
===================================================================
--- extra-i686/dnsmasq.install	                        (rev 0)
+++ extra-i686/dnsmasq.install	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+add_dnsmasq_user() {
+  if ! getent passwd dnsmasq >/dev/null; then
+    useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq
+  fi
+}
+
+post_install() {
+  add_dnsmasq_user
+}
+
+post_upgrade() {
+  add_dnsmasq_user
+}
+
+post_remove() {
+  if getent passwd dnsmasq >/dev/null; then
+    userdel dnsmasq
+  fi
+}

Deleted: extra-i686/dnsmasq.service
===================================================================
--- extra-i686/dnsmasq.service	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-i686/dnsmasq.service	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,13 +0,0 @@
-[Unit]
-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
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
-Alias=dbus-uk.org.thekelleys.dnsmasq

Copied: dnsmasq/repos/extra-i686/dnsmasq.service (from rev 141088, dnsmasq/trunk/dnsmasq.service)
===================================================================
--- extra-i686/dnsmasq.service	                        (rev 0)
+++ extra-i686/dnsmasq.service	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,13 @@
+[Unit]
+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
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-uk.org.thekelleys.dnsmasq

Deleted: extra-i686/rc.dnsmasq
===================================================================
--- extra-i686/rc.dnsmasq	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-i686/rc.dnsmasq	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dnsmasq
-
-checkconfig() {
-  local testout
-
-  if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
-    echo "$testout"
-    return 1
-  fi
-
-  return 0
-}
-
-pidfile=/run/dnsmasq.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting DNS/DHCP daemon"
-    if [[ -z $PID ]] && checkconfig &&
-        /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
-                          "--pid-file=$pidfile" \
-                          "${DNSMASQ_OPTS[@]}"; then
-      add_daemon dnsmasq
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DNS/DHCP daemon"
-    if [[ $PID ]] && kill "$PID" &> /dev/null; then
-      # dnsmasq doesn't clean up after itself
-      rm -f "$pidfile"
-      rm_daemon dnsmasq
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  checkconfig)
-    # diagnostics will be printed, with zero/non-zero exit
-    /usr/sbin/dnsmasq --test
-    ;;
-  *)
-    echo "usage: $0 <start|stop|restart|checkconfig>"
-esac
-

Copied: dnsmasq/repos/extra-i686/rc.dnsmasq (from rev 141088, dnsmasq/trunk/rc.dnsmasq)
===================================================================
--- extra-i686/rc.dnsmasq	                        (rev 0)
+++ extra-i686/rc.dnsmasq	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/dnsmasq
+
+checkconfig() {
+  local testout
+
+  if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
+    echo "$testout"
+    return 1
+  fi
+
+  return 0
+}
+
+pidfile=/run/dnsmasq.pid
+if [[ -r $pidfile ]]; then
+  read -r PID < "$pidfile"
+  if [[ ! -d /proc/$PID ]]; then
+    # stale pidfile
+    unset PID
+    rm -f "$pidfile"
+  fi
+fi
+
+case $1 in
+  start)
+    stat_busy "Starting DNS/DHCP daemon"
+    if [[ -z $PID ]] && checkconfig &&
+        /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
+                          "--pid-file=$pidfile" \
+                          "${DNSMASQ_OPTS[@]}"; then
+      add_daemon dnsmasq
+      stat_done
+    else
+      stat_fail
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping DNS/DHCP daemon"
+    if [[ $PID ]] && kill "$PID" &> /dev/null; then
+      # dnsmasq doesn't clean up after itself
+      rm -f "$pidfile"
+      rm_daemon dnsmasq
+      stat_done
+    else
+      stat_fail
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  checkconfig)
+    # diagnostics will be printed, with zero/non-zero exit
+    /usr/sbin/dnsmasq --test
+    ;;
+  *)
+    echo "usage: $0 <start|stop|restart|checkconfig>"
+esac
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-x86_64/PKGBUILD	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=dnsmasq
-pkgver=2.59
-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')
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
-        'dnsmasq.confd'
-        'rc.dnsmasq'
-        'dnsmasq.service')
-md5sums=('29d43f182ecad06d64b3598c02380a80'
-         '66479e99123faeab83ebaed709ef95b5'
-         '9f180cc236808bbd02ca8652fd2e8217'
-         'f329d86f8ba1cd85f9b6ee59e0ce3791')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # link against dbus
-  echo '#define HAVE_DBUS' >> src/config.h
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make 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"
-
-  install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
-  install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
-  install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
-}
-
-# vim: ts=2 sw=2 et ft=sh

Copied: dnsmasq/repos/extra-x86_64/PKGBUILD (from rev 141088, dnsmasq/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=dnsmasq
+pkgver=2.59
+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')
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
+        'dnsmasq.confd'
+        'rc.dnsmasq'
+        'dnsmasq.service')
+md5sums=('b5757ef2d7b651748eeebb88af29d7d6'
+         '66479e99123faeab83ebaed709ef95b5'
+         '9f180cc236808bbd02ca8652fd2e8217'
+         'f329d86f8ba1cd85f9b6ee59e0ce3791')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # link against dbus
+  echo '#define HAVE_DBUS' >> src/config.h
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make 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"
+
+  install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
+  install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
+  install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
+}
+
+# vim: ts=2 sw=2 et ft=sh

Deleted: extra-x86_64/dnsmasq.confd
===================================================================
--- extra-x86_64/dnsmasq.confd	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-x86_64/dnsmasq.confd	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,9 +0,0 @@
-#
-# runtime config for dnsmasq
-#
-
-# if unset, dnsmasq will run as nobody.
-DNSMASQ_USER=dnsmasq
-
-# other runtime options. treated as an array.
-DNSMASQ_OPTS=()

Copied: dnsmasq/repos/extra-x86_64/dnsmasq.confd (from rev 141088, dnsmasq/trunk/dnsmasq.confd)
===================================================================
--- extra-x86_64/dnsmasq.confd	                        (rev 0)
+++ extra-x86_64/dnsmasq.confd	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,9 @@
+#
+# runtime config for dnsmasq
+#
+
+# if unset, dnsmasq will run as nobody.
+DNSMASQ_USER=dnsmasq
+
+# other runtime options. treated as an array.
+DNSMASQ_OPTS=()

Deleted: extra-x86_64/dnsmasq.install
===================================================================
--- extra-x86_64/dnsmasq.install	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-x86_64/dnsmasq.install	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-add_dnsmasq_user() {
-  if ! getent passwd dnsmasq >/dev/null; then
-    useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq
-  fi
-}
-
-post_install() {
-  add_dnsmasq_user
-}
-
-post_upgrade() {
-  add_dnsmasq_user
-}
-
-post_remove() {
-  if getent passwd dnsmasq >/dev/null; then
-    userdel dnsmasq
-  fi
-}

Copied: dnsmasq/repos/extra-x86_64/dnsmasq.install (from rev 141088, dnsmasq/trunk/dnsmasq.install)
===================================================================
--- extra-x86_64/dnsmasq.install	                        (rev 0)
+++ extra-x86_64/dnsmasq.install	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+add_dnsmasq_user() {
+  if ! getent passwd dnsmasq >/dev/null; then
+    useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq
+  fi
+}
+
+post_install() {
+  add_dnsmasq_user
+}
+
+post_upgrade() {
+  add_dnsmasq_user
+}
+
+post_remove() {
+  if getent passwd dnsmasq >/dev/null; then
+    userdel dnsmasq
+  fi
+}

Deleted: extra-x86_64/dnsmasq.service
===================================================================
--- extra-x86_64/dnsmasq.service	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-x86_64/dnsmasq.service	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,13 +0,0 @@
-[Unit]
-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
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
-Alias=dbus-uk.org.thekelleys.dnsmasq

Copied: dnsmasq/repos/extra-x86_64/dnsmasq.service (from rev 141088, dnsmasq/trunk/dnsmasq.service)
===================================================================
--- extra-x86_64/dnsmasq.service	                        (rev 0)
+++ extra-x86_64/dnsmasq.service	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,13 @@
+[Unit]
+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
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-uk.org.thekelleys.dnsmasq

Deleted: extra-x86_64/rc.dnsmasq
===================================================================
--- extra-x86_64/rc.dnsmasq	2011-10-23 16:17:56 UTC (rev 141088)
+++ extra-x86_64/rc.dnsmasq	2011-10-23 16:20:24 UTC (rev 141089)
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dnsmasq
-
-checkconfig() {
-  local testout
-
-  if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
-    echo "$testout"
-    return 1
-  fi
-
-  return 0
-}
-
-pidfile=/run/dnsmasq.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting DNS/DHCP daemon"
-    if [[ -z $PID ]] && checkconfig &&
-        /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
-                          "--pid-file=$pidfile" \
-                          "${DNSMASQ_OPTS[@]}"; then
-      add_daemon dnsmasq
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DNS/DHCP daemon"
-    if [[ $PID ]] && kill "$PID" &> /dev/null; then
-      # dnsmasq doesn't clean up after itself
-      rm -f "$pidfile"
-      rm_daemon dnsmasq
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  checkconfig)
-    # diagnostics will be printed, with zero/non-zero exit
-    /usr/sbin/dnsmasq --test
-    ;;
-  *)
-    echo "usage: $0 <start|stop|restart|checkconfig>"
-esac
-

Copied: dnsmasq/repos/extra-x86_64/rc.dnsmasq (from rev 141088, dnsmasq/trunk/rc.dnsmasq)
===================================================================
--- extra-x86_64/rc.dnsmasq	                        (rev 0)
+++ extra-x86_64/rc.dnsmasq	2011-10-23 16:20:24 UTC (rev 141089)
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/dnsmasq
+
+checkconfig() {
+  local testout
+
+  if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
+    echo "$testout"
+    return 1
+  fi
+
+  return 0
+}
+
+pidfile=/run/dnsmasq.pid
+if [[ -r $pidfile ]]; then
+  read -r PID < "$pidfile"
+  if [[ ! -d /proc/$PID ]]; then
+    # stale pidfile
+    unset PID
+    rm -f "$pidfile"
+  fi
+fi
+
+case $1 in
+  start)
+    stat_busy "Starting DNS/DHCP daemon"
+    if [[ -z $PID ]] && checkconfig &&
+        /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
+                          "--pid-file=$pidfile" \
+                          "${DNSMASQ_OPTS[@]}"; then
+      add_daemon dnsmasq
+      stat_done
+    else
+      stat_fail
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping DNS/DHCP daemon"
+    if [[ $PID ]] && kill "$PID" &> /dev/null; then
+      # dnsmasq doesn't clean up after itself
+      rm -f "$pidfile"
+      rm_daemon dnsmasq
+      stat_done
+    else
+      stat_fail
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  checkconfig)
+    # diagnostics will be printed, with zero/non-zero exit
+    /usr/sbin/dnsmasq --test
+    ;;
+  *)
+    echo "usage: $0 <start|stop|restart|checkconfig>"
+esac
+



More information about the arch-commits mailing list