diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
commit | c8bd9200906149d53827aaa64e85a7008d51339f (patch) | |
tree | 9e366130f0f7afde9d7a478b5c898d873aed0483 /extra/dnsmasq | |
parent | d9a9508e07a00015e2a2f278719a9665ff565961 (diff) | |
parent | 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
testing/dmraid/PKGBUILD
testing/dmraid/dmraid_hook
testing/dmraid/dmraid_install
testing/e2fsprogs/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.pam
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xfce4-session/PKGBUILD
Diffstat (limited to 'extra/dnsmasq')
-rw-r--r-- | extra/dnsmasq/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 9275a90fc..d1adb21c7 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155881 2012-04-08 20:56:39Z dreisner $ +# $Id: PKGBUILD 157810 2012-04-30 00:00:31Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.60 -pkgrel=3 +pkgver=2.61 +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' 'mips64el') @@ -18,7 +18,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('5a09908e02724d759ac60d9cafd27de8' +md5sums=('6ed0a5c2524dfc3a74ef494ee2469f09' '66479e99123faeab83ebaed709ef95b5' '819fbdf6440d710616e6df5f8ca9cdba' '631d8349acbed1b01d4e11d9f42fdb7d') |