[arch-commits] Commit in dnsmasq/repos (18 files)
Dave Reisner
dreisner at nymeria.archlinux.org
Thu Apr 18 12:45:46 UTC 2013
Date: Thursday, April 18, 2013 @ 14:45:45
Author: dreisner
Revision: 183176
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
dnsmasq/repos/extra-i686/0001-Fix-wrong-size-in-memset-call.patch
(from rev 183175, dnsmasq/trunk/0001-Fix-wrong-size-in-memset-call.patch)
dnsmasq/repos/extra-i686/PKGBUILD
(from rev 183175, dnsmasq/trunk/PKGBUILD)
dnsmasq/repos/extra-i686/dnsmasq.install
(from rev 183175, dnsmasq/trunk/dnsmasq.install)
dnsmasq/repos/extra-i686/dnsmasq.service
(from rev 183175, dnsmasq/trunk/dnsmasq.service)
dnsmasq/repos/extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch
(from rev 183175, dnsmasq/trunk/0001-Fix-wrong-size-in-memset-call.patch)
dnsmasq/repos/extra-x86_64/PKGBUILD
(from rev 183175, dnsmasq/trunk/PKGBUILD)
dnsmasq/repos/extra-x86_64/dnsmasq.install
(from rev 183175, dnsmasq/trunk/dnsmasq.install)
dnsmasq/repos/extra-x86_64/dnsmasq.service
(from rev 183175, dnsmasq/trunk/dnsmasq.service)
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
-------------------------------------------------------+
/PKGBUILD | 98 ++++++++++++++++
/dnsmasq.install | 42 ++++++
/dnsmasq.service | 30 ++++
extra-i686/0001-Fix-wrong-size-in-memset-call.patch | 26 ++++
extra-i686/PKGBUILD | 49 --------
extra-i686/dnsmasq.confd | 9 -
extra-i686/dnsmasq.install | 21 ---
extra-i686/dnsmasq.service | 15 --
extra-i686/rc.dnsmasq | 64 ----------
extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch | 26 ++++
extra-x86_64/PKGBUILD | 49 --------
extra-x86_64/dnsmasq.confd | 9 -
extra-x86_64/dnsmasq.install | 21 ---
extra-x86_64/dnsmasq.service | 15 --
extra-x86_64/rc.dnsmasq | 64 ----------
15 files changed, 222 insertions(+), 316 deletions(-)
Copied: dnsmasq/repos/extra-i686/0001-Fix-wrong-size-in-memset-call.patch (from rev 183175, dnsmasq/trunk/0001-Fix-wrong-size-in-memset-call.patch)
===================================================================
--- extra-i686/0001-Fix-wrong-size-in-memset-call.patch (rev 0)
+++ extra-i686/0001-Fix-wrong-size-in-memset-call.patch 2013-04-18 12:45:45 UTC (rev 183176)
@@ -0,0 +1,26 @@
+From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon at thekelleys.org.uk>
+Date: Thu, 18 Apr 2013 09:47:49 +0100
+Subject: [PATCH] Fix wrong size in memset() call.
+
+Thanks to Dave Reisner.
+---
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipset.c b/src/ipset.c
+index a34ed96..f175fa4 100644
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
+ return -1;
+ }
+
+- memset(buffer, 0, sizeof(buffer));
++ memset(buffer, 0, BUFF_SZ);
+
+ nlh = (struct nlmsghdr *)buffer;
+ nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
+--
+1.8.2.1
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-i686/PKGBUILD 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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.65
-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')
-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=('a91534a5d6f053d5c80f67ef502afa34'
- '66479e99123faeab83ebaed709ef95b5'
- '819fbdf6440d710616e6df5f8ca9cdba'
- '7ac45726cabef4145db40d758cc7fedf')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # 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 "$pkgname-$pkgver"
-
- 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"
-
- 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"/usr/lib/systemd/system/dnsmasq.service
-}
-
-# vim: ts=2 sw=2 et ft=sh
Copied: dnsmasq/repos/extra-i686/PKGBUILD (from rev 183175, dnsmasq/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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.66
+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')
+install=$pkgname.install
+backup=('etc/dnsmasq.conf')
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"
+ '0001-Fix-wrong-size-in-memset-call.patch'
+ 'dnsmasq.service')
+md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20'
+ '05ccefefde68ebdebce5e40d2b3c78be'
+ '7ac45726cabef4145db40d758cc7fedf')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # 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 "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS"
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
+
+ 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"/usr/lib/systemd/system/dnsmasq.service
+}
+
+# vim: ts=2 sw=2 et ft=sh
Deleted: extra-i686/dnsmasq.confd
===================================================================
--- extra-i686/dnsmasq.confd 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-i686/dnsmasq.confd 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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=()
Deleted: extra-i686/dnsmasq.install
===================================================================
--- extra-i686/dnsmasq.install 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-i686/dnsmasq.install 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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 183175, dnsmasq/trunk/dnsmasq.install)
===================================================================
--- extra-i686/dnsmasq.install (rev 0)
+++ extra-i686/dnsmasq.install 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-i686/dnsmasq.service 2013-04-18 12:45:45 UTC (rev 183176)
@@ -1,15 +0,0 @@
-[Unit]
-Description=A lightweight DHCP and caching DNS server
-After=network.target
-Documentation=man:dnsmasq(8)
-
-[Service]
-Type=dbus
-BusName=uk.org.thekelleys.dnsmasq
-ExecStartPre=/usr/bin/dnsmasq --test
-ExecStart=/usr/bin/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 183175, dnsmasq/trunk/dnsmasq.service)
===================================================================
--- extra-i686/dnsmasq.service (rev 0)
+++ extra-i686/dnsmasq.service 2013-04-18 12:45:45 UTC (rev 183176)
@@ -0,0 +1,15 @@
+[Unit]
+Description=A lightweight DHCP and caching DNS server
+After=network.target
+Documentation=man:dnsmasq(8)
+
+[Service]
+Type=dbus
+BusName=uk.org.thekelleys.dnsmasq
+ExecStartPre=/usr/bin/dnsmasq --test
+ExecStart=/usr/bin/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 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-i686/rc.dnsmasq 2013-04-18 12:45:45 UTC (rev 183176)
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dnsmasq
-
-checkconfig() {
- local testout
-
- if ! testout=$(/usr/bin/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/bin/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/bin/dnsmasq --test
- ;;
- *)
- echo "usage: $0 <start|stop|restart|checkconfig>"
-esac
-
Copied: dnsmasq/repos/extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch (from rev 183175, dnsmasq/trunk/0001-Fix-wrong-size-in-memset-call.patch)
===================================================================
--- extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch (rev 0)
+++ extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch 2013-04-18 12:45:45 UTC (rev 183176)
@@ -0,0 +1,26 @@
+From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon at thekelleys.org.uk>
+Date: Thu, 18 Apr 2013 09:47:49 +0100
+Subject: [PATCH] Fix wrong size in memset() call.
+
+Thanks to Dave Reisner.
+---
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipset.c b/src/ipset.c
+index a34ed96..f175fa4 100644
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
+ return -1;
+ }
+
+- memset(buffer, 0, sizeof(buffer));
++ memset(buffer, 0, BUFF_SZ);
+
+ nlh = (struct nlmsghdr *)buffer;
+ nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
+--
+1.8.2.1
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-x86_64/PKGBUILD 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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.65
-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')
-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=('a91534a5d6f053d5c80f67ef502afa34'
- '66479e99123faeab83ebaed709ef95b5'
- '819fbdf6440d710616e6df5f8ca9cdba'
- '7ac45726cabef4145db40d758cc7fedf')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # 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 "$pkgname-$pkgver"
-
- 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"
-
- 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"/usr/lib/systemd/system/dnsmasq.service
-}
-
-# vim: ts=2 sw=2 et ft=sh
Copied: dnsmasq/repos/extra-x86_64/PKGBUILD (from rev 183175, dnsmasq/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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.66
+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')
+install=$pkgname.install
+backup=('etc/dnsmasq.conf')
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"
+ '0001-Fix-wrong-size-in-memset-call.patch'
+ 'dnsmasq.service')
+md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20'
+ '05ccefefde68ebdebce5e40d2b3c78be'
+ '7ac45726cabef4145db40d758cc7fedf')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # 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 "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS"
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
+
+ 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"/usr/lib/systemd/system/dnsmasq.service
+}
+
+# vim: ts=2 sw=2 et ft=sh
Deleted: extra-x86_64/dnsmasq.confd
===================================================================
--- extra-x86_64/dnsmasq.confd 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-x86_64/dnsmasq.confd 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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=()
Deleted: extra-x86_64/dnsmasq.install
===================================================================
--- extra-x86_64/dnsmasq.install 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-x86_64/dnsmasq.install 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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 183175, dnsmasq/trunk/dnsmasq.install)
===================================================================
--- extra-x86_64/dnsmasq.install (rev 0)
+++ extra-x86_64/dnsmasq.install 2013-04-18 12:45:45 UTC (rev 183176)
@@ -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 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-x86_64/dnsmasq.service 2013-04-18 12:45:45 UTC (rev 183176)
@@ -1,15 +0,0 @@
-[Unit]
-Description=A lightweight DHCP and caching DNS server
-After=network.target
-Documentation=man:dnsmasq(8)
-
-[Service]
-Type=dbus
-BusName=uk.org.thekelleys.dnsmasq
-ExecStartPre=/usr/bin/dnsmasq --test
-ExecStart=/usr/bin/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 183175, dnsmasq/trunk/dnsmasq.service)
===================================================================
--- extra-x86_64/dnsmasq.service (rev 0)
+++ extra-x86_64/dnsmasq.service 2013-04-18 12:45:45 UTC (rev 183176)
@@ -0,0 +1,15 @@
+[Unit]
+Description=A lightweight DHCP and caching DNS server
+After=network.target
+Documentation=man:dnsmasq(8)
+
+[Service]
+Type=dbus
+BusName=uk.org.thekelleys.dnsmasq
+ExecStartPre=/usr/bin/dnsmasq --test
+ExecStart=/usr/bin/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 2013-04-18 12:44:42 UTC (rev 183175)
+++ extra-x86_64/rc.dnsmasq 2013-04-18 12:45:45 UTC (rev 183176)
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dnsmasq
-
-checkconfig() {
- local testout
-
- if ! testout=$(/usr/bin/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/bin/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/bin/dnsmasq --test
- ;;
- *)
- echo "usage: $0 <start|stop|restart|checkconfig>"
-esac
-
More information about the arch-commits
mailing list