[arch-commits] Commit in dnsmasq/repos (8 files)
Dave Reisner
dreisner at archlinux.org
Sat Aug 27 02:25:00 UTC 2011
Date: Friday, August 26, 2011 @ 22:25:00
Author: dreisner
Revision: 136349
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
dnsmasq/repos/extra-i686/PKGBUILD
(from rev 136348, dnsmasq/trunk/PKGBUILD)
dnsmasq/repos/extra-i686/rc.dnsmasq
(from rev 136348, dnsmasq/trunk/rc.dnsmasq)
dnsmasq/repos/extra-x86_64/PKGBUILD
(from rev 136348, dnsmasq/trunk/PKGBUILD)
dnsmasq/repos/extra-x86_64/rc.dnsmasq
(from rev 136348, dnsmasq/trunk/rc.dnsmasq)
Deleted:
dnsmasq/repos/extra-i686/PKGBUILD
dnsmasq/repos/extra-i686/rc.dnsmasq
dnsmasq/repos/extra-x86_64/PKGBUILD
dnsmasq/repos/extra-x86_64/rc.dnsmasq
-------------------------+
extra-i686/PKGBUILD | 83 +++++++++++++++++++++++-----------------------
extra-i686/rc.dnsmasq | 72 +++++++++++++++++++--------------------
extra-x86_64/PKGBUILD | 83 +++++++++++++++++++++++-----------------------
extra-x86_64/rc.dnsmasq | 72 +++++++++++++++++++--------------------
4 files changed, 158 insertions(+), 152 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-08-27 02:24:39 UTC (rev 136348)
+++ extra-i686/PKGBUILD 2011-08-27 02:25:00 UTC (rev 136349)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Paul Mattal <paul at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=dnsmasq
-pkgver=2.57
-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' 'bash')
-makedepends=('libcap>=2.16')
-backup=('etc/dnsmasq.conf')
-install=
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
- 'rc.dnsmasq')
-md5sums=('d10faeb409717eae94718d7716ca63a4' 'e956eee1ec24212a3254d2b168187495')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # Build
- make || return 1
-
- # Install
- install -d $pkgdir/etc/rc.d || return 1
- make PREFIX=/usr DESTDIR=$pkgdir install || return 1
-
- install -D -m755 \
- $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq || return 1
- install -D -m644 \
- dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf || return 1
-
- # Make the Required Directories for DHCP Server Default Directories
- install -d $pkgdir/var/db || return 1
- install -d $pkgdir/var/lib/misc || return 1
-}
-
-# vim: ts=2 sw=2 et ft=sh
Copied: dnsmasq/repos/extra-i686/PKGBUILD (from rev 136348, dnsmasq/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-08-27 02:25:00 UTC (rev 136349)
@@ -0,0 +1,43 @@
+# $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.58
+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' 'bash' 'dbus-core')
+makedepends=('libcap>=2.16')
+backup=('etc/dnsmasq.conf')
+install=
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
+ 'rc.dnsmasq')
+md5sums=('14c5c81debb324adc261db971730f4c6'
+ 'e956eee1ec24212a3254d2b168187495')
+
+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 "$pkgdir"/var/{db,lib/misc}
+ install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.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 "contrib/systemd/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
+}
+
+# vim: ts=2 sw=2 et ft=sh
Deleted: extra-i686/rc.dnsmasq
===================================================================
--- extra-i686/rc.dnsmasq 2011-08-27 02:24:39 UTC (rev 136348)
+++ extra-i686/rc.dnsmasq 2011-08-27 02:25:00 UTC (rev 136349)
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/dnsmasq`
-case "$1" in
- start)
- stat_busy "Starting DNS/DHCP daemon"
- [ -z "$PID" ] && /usr/sbin/dnsmasq
- if [ $? -gt 0 ] ; then
- stat_fail
- else
- add_daemon dnsmasq # create the 'state' dir
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping DNS/DHCP daemon"
- [ "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon dnsmasq # remove the 'state' dir
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 5
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: dnsmasq/repos/extra-i686/rc.dnsmasq (from rev 136348, dnsmasq/trunk/rc.dnsmasq)
===================================================================
--- extra-i686/rc.dnsmasq (rev 0)
+++ extra-i686/rc.dnsmasq 2011-08-27 02:25:00 UTC (rev 136349)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/dnsmasq`
+case "$1" in
+ start)
+ stat_busy "Starting DNS/DHCP daemon"
+ [ -z "$PID" ] && /usr/sbin/dnsmasq
+ if [ $? -gt 0 ] ; then
+ stat_fail
+ else
+ add_daemon dnsmasq # create the 'state' dir
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping DNS/DHCP daemon"
+ [ "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon dnsmasq # remove the 'state' dir
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 5
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-08-27 02:24:39 UTC (rev 136348)
+++ extra-x86_64/PKGBUILD 2011-08-27 02:25:00 UTC (rev 136349)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Paul Mattal <paul at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=dnsmasq
-pkgver=2.57
-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' 'bash')
-makedepends=('libcap>=2.16')
-backup=('etc/dnsmasq.conf')
-install=
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
- 'rc.dnsmasq')
-md5sums=('d10faeb409717eae94718d7716ca63a4' 'e956eee1ec24212a3254d2b168187495')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # Build
- make || return 1
-
- # Install
- install -d $pkgdir/etc/rc.d || return 1
- make PREFIX=/usr DESTDIR=$pkgdir install || return 1
-
- install -D -m755 \
- $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq || return 1
- install -D -m644 \
- dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf || return 1
-
- # Make the Required Directories for DHCP Server Default Directories
- install -d $pkgdir/var/db || return 1
- install -d $pkgdir/var/lib/misc || return 1
-}
-
-# vim: ts=2 sw=2 et ft=sh
Copied: dnsmasq/repos/extra-x86_64/PKGBUILD (from rev 136348, dnsmasq/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-08-27 02:25:00 UTC (rev 136349)
@@ -0,0 +1,43 @@
+# $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.58
+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' 'bash' 'dbus-core')
+makedepends=('libcap>=2.16')
+backup=('etc/dnsmasq.conf')
+install=
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
+ 'rc.dnsmasq')
+md5sums=('14c5c81debb324adc261db971730f4c6'
+ 'e956eee1ec24212a3254d2b168187495')
+
+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 "$pkgdir"/var/{db,lib/misc}
+ install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.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 "contrib/systemd/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
+}
+
+# vim: ts=2 sw=2 et ft=sh
Deleted: extra-x86_64/rc.dnsmasq
===================================================================
--- extra-x86_64/rc.dnsmasq 2011-08-27 02:24:39 UTC (rev 136348)
+++ extra-x86_64/rc.dnsmasq 2011-08-27 02:25:00 UTC (rev 136349)
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/dnsmasq`
-case "$1" in
- start)
- stat_busy "Starting DNS/DHCP daemon"
- [ -z "$PID" ] && /usr/sbin/dnsmasq
- if [ $? -gt 0 ] ; then
- stat_fail
- else
- add_daemon dnsmasq # create the 'state' dir
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping DNS/DHCP daemon"
- [ "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon dnsmasq # remove the 'state' dir
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 5
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: dnsmasq/repos/extra-x86_64/rc.dnsmasq (from rev 136348, dnsmasq/trunk/rc.dnsmasq)
===================================================================
--- extra-x86_64/rc.dnsmasq (rev 0)
+++ extra-x86_64/rc.dnsmasq 2011-08-27 02:25:00 UTC (rev 136349)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/dnsmasq`
+case "$1" in
+ start)
+ stat_busy "Starting DNS/DHCP daemon"
+ [ -z "$PID" ] && /usr/sbin/dnsmasq
+ if [ $? -gt 0 ] ; then
+ stat_fail
+ else
+ add_daemon dnsmasq # create the 'state' dir
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping DNS/DHCP daemon"
+ [ "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon dnsmasq # remove the 'state' dir
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 5
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
More information about the arch-commits
mailing list