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

2020-08-20 Thread Christian Hesse via arch-commits 
Date: Thursday, August 20, 2020 @ 09:10:22
  Author: eworm
Revision: 394430

upgpkg: dnsmasq 2.82-2: install lease-tools

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |   23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-20 08:35:19 UTC (rev 394429)
+++ PKGBUILD2020-08-20 09:10:22 UTC (rev 394430)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.82
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server'
 url='http://www.thekelleys.org.uk/dnsmasq/doc.html'
 arch=('x86_64')
@@ -34,6 +34,14 @@
 PREFIX=/usr \
 BINDIR=/usr/bin \
 all-i18n
+
+  cd "contrib/lease-tools"
+
+  make \
+CFLAGS="$CPPFLAGS $CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+COPTS="$_build_copts" \
+all
 }
 
 package() {
@@ -47,14 +55,17 @@
 DESTDIR="$pkgdir" \
 install install-i18n
 
-  install -Dm644 "dbus/dnsmasq.conf" 
"$pkgdir"/usr/share/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
-  install -Dm644 "$srcdir/dnsmasq-sysusers.conf" 
"$pkgdir"/usr/lib/sysusers.d/dnsmasq.conf
+  install -Dm0644 "dbus/dnsmasq.conf" 
"$pkgdir"/usr/share/dbus-1/system.d/dnsmasq.conf
+  install -Dm0644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
+  install -Dm0644 "$srcdir/dnsmasq.service" 
"$pkgdir"/usr/lib/systemd/system/dnsmasq.service
+  install -Dm0644 "$srcdir/dnsmasq-sysusers.conf" 
"$pkgdir"/usr/lib/sysusers.d/dnsmasq.conf
 
   # DNSSEC setup
   sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf
-  install -Dm644 "trust-anchors.conf" 
"$pkgdir"/usr/share/dnsmasq/trust-anchors.conf
+  install -Dm0644 "trust-anchors.conf" 
"$pkgdir"/usr/share/dnsmasq/trust-anchors.conf
+
+  install -Dm0755 -t "$pkgdir"/usr/bin/ 
'contrib/lease-tools/dhcp_'{release{,6},lease_time}
+  install -Dm0644 -t "$pkgdir"/usr/share/man/man1 
'contrib/lease-tools/dhcp_'{release{,6},lease_time}.1
 }
 
 # vim: ts=2 sw=2 et ft=sh

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

2020-07-21 Thread Christian Hesse via arch-commits 
Date: Tuesday, July 21, 2020 @ 10:43:27
  Author: eworm
Revision: 392320

upgpkg: dnsmasq 2.82-1: new upstream release

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-21 09:59:29 UTC (rev 392319)
+++ PKGBUILD2020-07-21 10:43:27 UTC (rev 392320)
@@ -4,19 +4,20 @@
 # Contributor: Tom Newsom 
 
 pkgname=dnsmasq
-pkgver=2.81
-pkgrel=4
+pkgver=2.82
+pkgrel=1
 pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server'
 url='http://www.thekelleys.org.uk/dnsmasq/doc.html'
 arch=('x86_64')
 license=('GPL')
-depends=('glibc' 'gmp' 'libidn2' 'libdbus' 'libnetfilter_conntrack' 'nettle')
+depends=('glibc' 'gmp' 'libidn2' 'libidn2.so' 'libdbus' 'libdbus-1.so'
+ 'libnetfilter_conntrack' 'nettle' 'libnettle.so' 'libhogweed.so')
 backup=('etc/dnsmasq.conf')
 validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley 

 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
 'dnsmasq-sysusers.conf'
 'dnsmasq.service')
-sha256sums=('749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb'
+sha256sums=('84523646f3116bb5e1151efb66e645030f6e6a8256f29aab444777a343ebc132'
 'SKIP'
 '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
 '297dbae8cfa3d353284820dd87cc65c37d1ef289cac3a5c3ede079413d31eeec')

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

2020-05-04 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, May 5, 2020 @ 05:39:55
  Author: foutrelis
Revision: 382255

nettle 3.6 rebuild

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-05 05:37:31 UTC (rev 382254)
+++ PKGBUILD2020-05-05 05:39:55 UTC (rev 382255)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.81
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server'
 url='http://www.thekelleys.org.uk/dnsmasq/doc.html'
 arch=('x86_64')

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

2020-04-17 Thread Christian Hesse via arch-commits 
Date: Friday, April 17, 2020 @ 19:00:56
  Author: eworm
Revision: 380468

upgpkg: dnsmasq 2.81-3

sync systemd unit file with upstream

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

-+
 PKGBUILD|4 ++--
 dnsmasq.service |6 --
 2 files changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-17 19:00:01 UTC (rev 380467)
+++ PKGBUILD2020-04-17 19:00:56 UTC (rev 380468)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.81
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server'
 url='http://www.thekelleys.org.uk/dnsmasq/doc.html'
 arch=('x86_64')
@@ -19,7 +19,7 @@
 sha256sums=('749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb'
 'SKIP'
 '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
-'751bc5931e91ffa271f659b740836ab8a733ee8c8826410adb31fdd0ecd49c58')
+'297dbae8cfa3d353284820dd87cc65c37d1ef289cac3a5c3ede079413d31eeec')
 
 _build_copts='-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK'
 

Modified: dnsmasq.service
===
--- dnsmasq.service 2020-04-17 19:00:01 UTC (rev 380467)
+++ dnsmasq.service 2020-04-17 19:00:56 UTC (rev 380468)
@@ -1,7 +1,9 @@
 [Unit]
-Description=A lightweight DHCP and caching DNS server
+Description=dnsmasq - A lightweight DHCP and caching DNS server
+Documentation=man:dnsmasq(8)
 After=network.target
-Documentation=man:dnsmasq(8)
+Before=network-online.target nss-lookup.target
+Wants=nss-lookup.target
 
 [Service]
 Type=dbus

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

2020-04-15 Thread Christian Hesse via arch-commits 
Date: Wednesday, April 15, 2020 @ 10:17:04
  Author: eworm
Revision: 380362

upgpkg: dnsmasq 2.81-2

improve systemd unit file

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

-+
 PKGBUILD|4 ++--
 dnsmasq.service |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-15 10:03:59 UTC (rev 380361)
+++ PKGBUILD2020-04-15 10:17:04 UTC (rev 380362)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.81
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server'
 url='http://www.thekelleys.org.uk/dnsmasq/doc.html'
 arch=('x86_64')
@@ -19,7 +19,7 @@
 sha256sums=('749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb'
 'SKIP'
 '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
-'983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')
+'751bc5931e91ffa271f659b740836ab8a733ee8c8826410adb31fdd0ecd49c58')
 
 _build_copts='-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK'
 

Modified: dnsmasq.service
===
--- dnsmasq.service 2020-04-15 10:03:59 UTC (rev 380361)
+++ dnsmasq.service 2020-04-15 10:17:04 UTC (rev 380362)
@@ -9,6 +9,9 @@
 ExecStartPre=/usr/bin/dnsmasq --test
 ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
 ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+PrivateDevices=true
+ProtectSystem=full
 
 [Install]
 WantedBy=multi-user.target

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

2019-06-30 Thread Evangelos Foutras via arch-commits 
Date: Sunday, June 30, 2019 @ 11:36:02
  Author: foutrelis
Revision: 357109

poppler 0.78 / nettle 3.5 rebuild

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-30 11:34:25 UTC (rev 357108)
+++ PKGBUILD2019-06-30 11:36:02 UTC (rev 357109)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.80
-pkgrel=3
+pkgrel=4
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('x86_64')

[arch-commits] Commit in dnsmasq/trunk (PKGBUILD nettle-3.5.patch)

2019-06-30 Thread Evangelos Foutras via arch-commits 
Date: Sunday, June 30, 2019 @ 11:34:25
  Author: foutrelis
Revision: 357108

Fix build with nettle 3.5

Added:
  dnsmasq/trunk/nettle-3.5.patch
Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 nettle-3.5.patch |   20 
 2 files changed, 29 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-30 11:14:55 UTC (rev 357107)
+++ PKGBUILD2019-06-30 11:34:25 UTC (rev 357108)
@@ -14,15 +14,24 @@
 backup=('etc/dnsmasq.conf')
 validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley 

 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
+'nettle-3.5.patch'
 'dnsmasq-sysusers.conf'
 'dnsmasq.service')
 sha256sums=('cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb'
 'SKIP'
+'d9e54439eb20ccd99c263d9c80013002fecb60b387fb8fefd787c7958fdb96c6'
 '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
 '983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')
 
 _build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # fix build with nettle 3.5 (patch from PLD Linux)
+  patch -Np1 -i ../nettle-3.5.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"
 

Added: nettle-3.5.patch
===
--- nettle-3.5.patch(rev 0)
+++ nettle-3.5.patch2019-06-30 11:34:25 UTC (rev 357108)
@@ -0,0 +1,20 @@
+--- dnsmasq-2.80/src/crypto.c~ 2018-10-18 20:21:55.0 +0200
 dnsmasq-2.80/src/crypto.c  2019-06-27 09:32:24.587948846 +0200
+@@ -294,7 +294,7 @@
+ if (!(key_256 = whine_malloc(sizeof(struct ecc_point
+   return 0;
+ 
+-nettle_ecc_point_init(key_256, _secp_256r1);
++nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
+   }
+   
+   key = key_256;
+@@ -307,7 +307,7 @@
+ if (!(key_384 = whine_malloc(sizeof(struct ecc_point
+   return 0;
+ 
+-nettle_ecc_point_init(key_384, _secp_384r1);
++nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
+   }
+   
+   key = key_384;

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

2019-02-09 Thread Felix Yan via arch-commits 
Date: Sunday, February 10, 2019 @ 02:59:16
  Author: felixonmars
Revision: 345819

libidn2 2.1.1 rebuild

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-10 02:58:19 UTC (rev 345818)
+++ PKGBUILD2019-02-10 02:59:16 UTC (rev 345819)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.80
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('x86_64')

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

2019-01-13 Thread Evangelos Foutras via arch-commits 
Date: Sunday, January 13, 2019 @ 21:11:28
  Author: foutrelis
Revision: 344005

libidn2 2.1.0 rebuild

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-13 21:09:01 UTC (rev 344004)
+++ PKGBUILD2019-01-13 21:11:28 UTC (rev 344005)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.80
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('x86_64')

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

2018-10-18 Thread Christian Hesse via arch-commits 
Date: Thursday, October 18, 2018 @ 19:14:00
  Author: eworm
Revision: 336846

upgpkg: dnsmasq 2.80-1

new upstream release

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-18 16:55:21 UTC (rev 336845)
+++ PKGBUILD2018-10-18 19:14:00 UTC (rev 336846)
@@ -4,8 +4,8 @@
 # Contributor: Tom Newsom 
 
 pkgname=dnsmasq
-pkgver=2.79
-pkgrel=3
+pkgver=2.80
+pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('x86_64')
@@ -16,7 +16,7 @@
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
 'dnsmasq-sysusers.conf'
 'dnsmasq.service')
-sha256sums=('78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f'
+sha256sums=('cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb'
 'SKIP'
 '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
 '983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')

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

2018-09-19 Thread Christian Hesse via arch-commits 
Date: Wednesday, September 19, 2018 @ 20:04:09
  Author: eworm
Revision: 335024

upgpkg: dnsmasq 2.79-3

build with libidn2

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-19 19:32:38 UTC (rev 335023)
+++ PKGBUILD2018-09-19 20:04:09 UTC (rev 335024)
@@ -5,12 +5,12 @@
 
 pkgname=dnsmasq
 pkgver=2.79
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('x86_64')
 license=('GPL')
-depends=('glibc' 'gmp' 'libidn' 'libdbus' 'libnetfilter_conntrack' 'nettle')
+depends=('glibc' 'gmp' 'libidn2' 'libdbus' 'libnetfilter_conntrack' 'nettle')
 backup=('etc/dnsmasq.conf')
 validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley 

 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
@@ -21,7 +21,7 @@
 '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
 '983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')
 
-_build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_IDN -DHAVE_CONNTRACK"
+_build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"
 
 build() {
   cd "$pkgname-$pkgver"

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

2018-09-10 Thread Evangelos Foutras via arch-commits 
Date: Monday, September 10, 2018 @ 22:53:56
  Author: foutrelis
Revision: 334348

libidn 1.35 rebuild

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-10 22:49:48 UTC (rev 334347)
+++ PKGBUILD2018-09-10 22:53:56 UTC (rev 334348)
@@ -6,7 +6,7 @@
 
 pkgname=dnsmasq
 pkgver=2.79
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('x86_64')

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

2018-03-18 Thread Christian Hesse via arch-commits 
Date: Sunday, March 18, 2018 @ 19:27:40
  Author: eworm
Revision: 319593

upgpkg: dnsmasq 2.79-1

new upstream release

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-18 19:21:53 UTC (rev 319592)
+++ PKGBUILD2018-03-18 19:27:40 UTC (rev 319593)
@@ -5,8 +5,8 @@
 # Contributor: Tom Newsom 
 
 pkgname=dnsmasq
-pkgver=2.78
-pkgrel=2
+pkgver=2.79
+pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('x86_64')
@@ -15,23 +15,15 @@
 backup=('etc/dnsmasq.conf')
 validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley 

 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
-'0001-DNSSEC-fix-for-wildcard-NSEC-records.patch'
 'dnsmasq-sysusers.conf'
 'dnsmasq.service')
-sha256sums=('89949f438c74b0c7543f06689c319484bd126cc4b1f8c745c742ab397681252b'
+sha256sums=('78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f'
 'SKIP'
-'2fe981f3eb947407fc48cc92509823d68416390137ddab3fe35e1dda454d85f0'
 '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
 '983a3c7a68ce114cf7b44f0d9c59b74c266647a9e5ac34c1d1d5161610bc57fe')
 
 _build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_IDN -DHAVE_CONNTRACK"
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 < "${srcdir}"/0001-DNSSEC-fix-for-wildcard-NSEC-records.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"

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

2017-08-22 Thread Christian Hesse 
Date: Tuesday, August 22, 2017 @ 14:25:39
  Author: eworm
Revision: 303255

upgpkg: dnsmasq 2.77-2

rebuild with hardening flags

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-22 12:48:45 UTC (rev 303254)
+++ PKGBUILD2017-08-22 14:25:39 UTC (rev 303255)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.77
-pkgrel=1
+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')

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

2017-01-11 Thread Christian Hesse 
Date: Wednesday, January 11, 2017 @ 15:28:04
  Author: eworm
Revision: 285677

upgpkg: dnsmasq 2.76-4

pacman hook: do not call systemd-sysusers from install script

Modified:
  dnsmasq/trunk/PKGBUILD
Deleted:
  dnsmasq/trunk/dnsmasq.install

-+
 PKGBUILD|3 +--
 dnsmasq.install |   13 -
 2 files changed, 1 insertion(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-11 15:27:20 UTC (rev 285676)
+++ PKGBUILD2017-01-11 15:28:04 UTC (rev 285677)
@@ -5,13 +5,12 @@
 
 pkgname=dnsmasq
 pkgver=2.76
-pkgrel=3
+pkgrel=4
 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' 'gmp' 'libidn' 'libdbus' 'libnetfilter_conntrack' 'nettle')
-install=$pkgname.install
 backup=('etc/dnsmasq.conf')
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
 '0001-Handle-binding-upstream-servers-to-an-interface.patch'

Deleted: dnsmasq.install
===
--- dnsmasq.install 2017-01-11 15:27:20 UTC (rev 285676)
+++ dnsmasq.install 2017-01-11 15:28:04 UTC (rev 285677)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-post_install() {
-  if hash systemd-sysusers &> /dev/null; then
-systemd-sysusers dnsmasq.conf
-  fi
-}
-
-post_upgrade(){
-  if hash systemd-sysusers &> /dev/null; then
-systemd-sysusers dnsmasq.conf
-  fi
-}

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

2016-10-09 Thread Christian Hesse 
Date: Sunday, October 9, 2016 @ 18:48:12
  Author: eworm
Revision: 278125

upgpkg: dnsmasq 2.76-3

Link against recent nettle. (FS#51293) Dynamic linking was ok, but dnsmasq 
reported:

dnsmasq: Symbol `nettle_hashes' has different size in shared object, consider 
re-linking

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-09 18:25:55 UTC (rev 278124)
+++ PKGBUILD2016-10-09 18:48:12 UTC (rev 278125)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.76
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('i686' 'x86_64')

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

2016-05-22 Thread Dave Reisner 
Date: Sunday, May 22, 2016 @ 08:05:40
  Author: dreisner
Revision: 268472

upgpkg: dnsmasq 2.76-1

- enable i18n, conntrack, and idn support (FS#47192)

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-21 22:01:52 UTC (rev 268471)
+++ PKGBUILD2016-05-22 06:05:40 UTC (rev 268472)
@@ -4,23 +4,23 @@
 # Contributor: Tom Newsom 
 
 pkgname=dnsmasq
-pkgver=2.75
+pkgver=2.76
 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' 'libdbus' 'gmp' 'nettle')
+depends=('glibc' 'gmp' 'libidn' 'libdbus' 'libnetfilter_conntrack' 'nettle')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf')
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
 'dnsmasq.service')
-md5sums=('887236f1ddde6eb57cdb9d01916c9f72'
+md5sums=('00f5ee66b4e4b7f14538bf62ae3c9461'
  'SKIP'
  'b87f68013c3e8b4bb37117de968d4603')
 validpgpkeys=('269322E7D9255916E0394DD628FC869A289B82B7')  # Simon Kelley
 
-build_copts="-DHAVE_DNSSEC -DHAVE_DBUS"
+_build_copts="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_IDN -DHAVE_CONNTRACK"
 
 build() {
   cd "$pkgname-$pkgver"
@@ -28,7 +28,8 @@
   make \
 CFLAGS="$CPPFLAGS $CFLAGS" \
 LDFLAGS="$LDFLAGS" \
-COPTS="$build_copts"
+COPTS="$_build_copts" \
+all-i18n
 }
 
 package() {
@@ -36,8 +37,9 @@
 
   # need to pass COPTS here to avoid rebuilding the binary.
   make \
-COPTS="$build_copts" \
-BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
+COPTS="$_build_copts" \
+BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" \
+install install-i18n
 
   install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
   install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf

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

2015-08-03 Thread Felix Yan 
Date: Monday, August 3, 2015 @ 18:33:42
  Author: fyan
Revision: 242975

upgpkg: dnsmasq 2.75-1

upstream new release

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-03 16:29:20 UTC (rev 242974)
+++ PKGBUILD2015-08-03 16:33:42 UTC (rev 242975)
@@ -4,7 +4,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.73
+pkgver=2.75
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -15,7 +15,7 @@
 backup=('etc/dnsmasq.conf')
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
 'dnsmasq.service')
-md5sums=('b8bfe96d22945c8cf4466826ba9b21bd'
+md5sums=('887236f1ddde6eb57cdb9d01916c9f72'
  'SKIP'
  'b87f68013c3e8b4bb37117de968d4603')
 validpgpkeys=('269322E7D9255916E0394DD628FC869A289B82B7')  # Simon Kelley

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

2015-06-16 Thread Dave Reisner 
Date: Wednesday, June 17, 2015 @ 00:42:45
  Author: dreisner
Revision: 240965

upgpkg: dnsmasq 2.73-1

- drop removal of user on uninstall

Modified:
  dnsmasq/trunk/PKGBUILD
  dnsmasq/trunk/dnsmasq.install

-+
 PKGBUILD|   19 +--
 dnsmasq.install |6 --
 2 files changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-16 19:56:14 UTC (rev 240964)
+++ PKGBUILD2015-06-16 22:42:45 UTC (rev 240965)
@@ -4,8 +4,8 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.72
-pkgrel=2
+pkgver=2.73
+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')
@@ -13,11 +13,15 @@
 depends=('glibc' 'libdbus' 'gmp' 'nettle')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf')
-source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz;
+source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
 'dnsmasq.service')
-md5sums=('0256e0a71e27c8d8a5c89a0d18f3cfe2'
+md5sums=('b8bfe96d22945c8cf4466826ba9b21bd'
+ 'SKIP'
  'b87f68013c3e8b4bb37117de968d4603')
+validpgpkeys=('269322E7D9255916E0394DD628FC869A289B82B7')  # Simon Kelley
 
+build_copts=-DHAVE_DNSSEC -DHAVE_DBUS
+
 build() {
   cd $pkgname-$pkgver
 
@@ -24,13 +28,16 @@
   make \
 CFLAGS=$CPPFLAGS $CFLAGS \
 LDFLAGS=$LDFLAGS \
-COPTS=-DHAVE_DNSSEC -DHAVE_DBUS
+COPTS=$build_copts
 }
 
 package() {
   cd $pkgname-$pkgver
 
-  make BINDIR=/usr/bin PREFIX=/usr DESTDIR=$pkgdir install
+  # need to pass COPTS here to avoid rebuilding the binary.
+  make \
+COPTS=$build_copts \
+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

Modified: dnsmasq.install
===
--- dnsmasq.install 2015-06-16 19:56:14 UTC (rev 240964)
+++ dnsmasq.install 2015-06-16 22:42:45 UTC (rev 240965)
@@ -13,9 +13,3 @@
 post_upgrade() {
   add_dnsmasq_user
 }
-
-post_remove() {
-  if getent passwd dnsmasq /dev/null; then
-userdel dnsmasq
-  fi
-}

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

2015-04-13 Thread Andreas Radke 
Date: Monday, April 13, 2015 @ 18:59:28
  Author: andyrtr
Revision: 236375

upgpkg: dnsmasq 2.72-2

nettle rebuild

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-13 16:34:51 UTC (rev 236374)
+++ PKGBUILD2015-04-13 16:59:28 UTC (rev 236375)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.72
-pkgrel=1
+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')
@@ -16,7 +16,7 @@
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz;
 'dnsmasq.service')
 md5sums=('0256e0a71e27c8d8a5c89a0d18f3cfe2'
- '7ac45726cabef4145db40d758cc7fedf')
+ 'b87f68013c3e8b4bb37117de968d4603')
 
 build() {
   cd $pkgname-$pkgver

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

2014-09-24 Thread Dave Reisner 
Date: Wednesday, September 24, 2014 @ 14:59:35
  Author: dreisner
Revision: 222932

upgpkg: dnsmasq 2.72-1

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-24 11:47:49 UTC (rev 222931)
+++ PKGBUILD2014-09-24 12:59:35 UTC (rev 222932)
@@ -4,7 +4,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.71
+pkgver=2.72
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -13,10 +13,9 @@
 depends=('glibc' 'libdbus' 'gmp' 'nettle')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf')
-source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
+source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz;
 'dnsmasq.service')
-md5sums=('9e2e4d59c75e71ee3ca817ff0f9be69e'
- 'SKIP'
+md5sums=('0256e0a71e27c8d8a5c89a0d18f3cfe2'
  '7ac45726cabef4145db40d758cc7fedf')
 
 build() {

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

2014-05-17 Thread Dave Reisner 
Date: Saturday, May 17, 2014 @ 22:12:11
  Author: dreisner
Revision: 213049

upgpkg: dnsmasq 2.71-1

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-17 19:10:11 UTC (rev 213048)
+++ PKGBUILD2014-05-17 20:12:11 UTC (rev 213049)
@@ -4,7 +4,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.70
+pkgver=2.71
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -15,7 +15,7 @@
 backup=('etc/dnsmasq.conf')
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
 'dnsmasq.service')
-md5sums=('1d654e80888ab5dbba015548fd284d46'
+md5sums=('9e2e4d59c75e71ee3ca817ff0f9be69e'
  'SKIP'
  '7ac45726cabef4145db40d758cc7fedf')

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

2014-04-24 Thread Dave Reisner 
Date: Thursday, April 24, 2014 @ 15:39:29
  Author: dreisner
Revision: 211725

upgpkg: dnsmasq 2.70-1

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-24 03:06:24 UTC (rev 211724)
+++ PKGBUILD2014-04-24 13:39:29 UTC (rev 211725)
@@ -4,8 +4,8 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.69
-pkgrel=2
+pkgver=2.70
+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')
@@ -15,7 +15,7 @@
 backup=('etc/dnsmasq.conf')
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
 'dnsmasq.service')
-md5sums=('c5a1152e646eb54db4f33f8e0deee180'
+md5sums=('1d654e80888ab5dbba015548fd284d46'
  'SKIP'
  '7ac45726cabef4145db40d758cc7fedf')

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

2014-04-10 Thread Dave Reisner 
Date: Thursday, April 10, 2014 @ 13:58:46
  Author: dreisner
Revision: 210145

upgpkg: dnsmasq 2.69-2

- include trust-anchors.conf, munge example config to point to loc (FS#39801)

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-10 09:20:23 UTC (rev 210144)
+++ PKGBUILD2014-04-10 11:58:46 UTC (rev 210145)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.69
-pkgrel=1
+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')
@@ -36,6 +36,10 @@
   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
+
+  # DNSSEC setup
+  sed -i 's,%%PREFIX%%,/usr,' $pkgdir/etc/dnsmasq.conf
+  install -Dm644 trust-anchors.conf 
$pkgdir/usr/share/dnsmasq/trust-anchors.conf
 }
 
 # vim: ts=2 sw=2 et ft=sh

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

2014-04-09 Thread Dave Reisner 
Date: Wednesday, April 9, 2014 @ 22:44:14
  Author: dreisner
Revision: 210094

upgpkg: dnsmasq 2.69-1

- remove hacky prepare function, we can do this via the buildsys
- add gmp/nettle as deps for dnssec support

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |   22 +-
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-09 20:20:57 UTC (rev 210093)
+++ PKGBUILD2014-04-09 20:44:14 UTC (rev 210094)
@@ -4,32 +4,28 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.68
+pkgver=2.69
 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' 'libdbus')
+depends=('glibc' 'libdbus' 'gmp' 'nettle')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf')
-source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz;
+source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
 'dnsmasq.service')
-md5sums=('fec885ba0a9df0f7d8f2e44db48f19ae'
+md5sums=('c5a1152e646eb54db4f33f8e0deee180'
+ 'SKIP'
  '7ac45726cabef4145db40d758cc7fedf')
 
-prepare() {
-  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
-}
-
 build() {
   cd $pkgname-$pkgver
 
-  make CFLAGS=$CPPFLAGS $CFLAGS LDFLAGS=$LDFLAGS
+  make \
+CFLAGS=$CPPFLAGS $CFLAGS \
+LDFLAGS=$LDFLAGS \
+COPTS=-DHAVE_DNSSEC -DHAVE_DBUS
 }
 
 package() {

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

2013-12-31 Thread Dave Reisner 
Date: Tuesday, December 31, 2013 @ 22:21:19
  Author: dreisner
Revision: 203016

fix dbus dependency on the lib

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-31 17:37:47 UTC (rev 203015)
+++ PKGBUILD2013-12-31 21:21:19 UTC (rev 203016)
@@ -10,7 +10,7 @@
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('glibc' 'dbus-core')
+depends=('glibc' 'libdbus')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf')
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz;

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

2013-02-23 Thread Dave Reisner 
Date: Sunday, February 24, 2013 @ 00:55:27
  Author: dreisner
Revision: 178470

remove rc.d script

Modified:
  dnsmasq/trunk/PKGBUILD
Deleted:
  dnsmasq/trunk/dnsmasq.confd
  dnsmasq/trunk/rc.dnsmasq

---+
 PKGBUILD  |7 --
 dnsmasq.confd |9 ---
 rc.dnsmasq|   64 
 3 files changed, 80 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 23:53:14 UTC (rev 178469)
+++ PKGBUILD2013-02-23 23:55:27 UTC (rev 178470)
@@ -15,12 +15,8 @@
 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() {
@@ -38,9 +34,6 @@
 
   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

Deleted: dnsmasq.confd
===
--- dnsmasq.confd   2013-02-23 23:53:14 UTC (rev 178469)
+++ dnsmasq.confd   2013-02-23 23:55:27 UTC (rev 178470)
@@ -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: rc.dnsmasq
===
--- rc.dnsmasq  2013-02-23 23:53:14 UTC (rev 178469)
+++ rc.dnsmasq  2013-02-23 23:55:27 UTC (rev 178470)
@@ -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 21); 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
-

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

2012-12-14 Thread Dave Reisner 
Date: Friday, December 14, 2012 @ 12:31:19
  Author: dreisner
Revision: 173228

upgpkg: dnsmasq 2.65-1

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-14 17:12:10 UTC (rev 173227)
+++ PKGBUILD2012-12-14 17:31:19 UTC (rev 173228)
@@ -4,7 +4,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.64
+pkgver=2.65
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -18,7 +18,7 @@
 'dnsmasq.confd'
 'rc.dnsmasq'
 'dnsmasq.service')
-md5sums=('60adb8e01960a41ce67e0422c4cf9ab3'
+md5sums=('a91534a5d6f053d5c80f67ef502afa34'
  '66479e99123faeab83ebaed709ef95b5'
  '819fbdf6440d710616e6df5f8ca9cdba'
  '7ac45726cabef4145db40d758cc7fedf')

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

2012-12-05 Thread Dave Reisner 
Date: Wednesday, December 5, 2012 @ 06:04:49
  Author: dreisner
Revision: 172765

upgpkg: dnsmasq 2.64-1

- add soft ordering on network.target (FS#32264)

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

-+
 PKGBUILD|   10 --
 dnsmasq.service |2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-05 09:28:05 UTC (rev 172764)
+++ PKGBUILD2012-12-05 11:04:49 UTC (rev 172765)
@@ -4,7 +4,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.63
+pkgver=2.64
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -18,19 +18,17 @@
 'dnsmasq.confd'
 'rc.dnsmasq'
 'dnsmasq.service')
-md5sums=('43e771997615ebcd8f6c6ffa60c3e40b'
+md5sums=('60adb8e01960a41ce67e0422c4cf9ab3'
  '66479e99123faeab83ebaed709ef95b5'
  '819fbdf6440d710616e6df5f8ca9cdba'
- '631d8349acbed1b01d4e11d9f42fdb7d')
+ '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
+  sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h
 
   make
 }

Modified: dnsmasq.service
===
--- dnsmasq.service 2012-12-05 09:28:05 UTC (rev 172764)
+++ dnsmasq.service 2012-12-05 11:04:49 UTC (rev 172765)
@@ -1,5 +1,7 @@
 [Unit]
 Description=A lightweight DHCP and caching DNS server
+After=network.target
+Documentation=man:dnsmasq(8)
 
 [Service]
 Type=dbus

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

2012-08-18 Thread Dave Reisner 
Date: Saturday, August 18, 2012 @ 09:27:30
  Author: dreisner
Revision: 165412

upgpkg: dnsmasq 2.63-1

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-18 10:15:13 UTC (rev 165411)
+++ PKGBUILD2012-08-18 13:27:30 UTC (rev 165412)
@@ -4,7 +4,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.62
+pkgver=2.63
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -18,7 +18,7 @@
 'dnsmasq.confd'
 'rc.dnsmasq'
 'dnsmasq.service')
-md5sums=('f47e5cb8f5bac6343f24b2dbe317ab40'
+md5sums=('43e771997615ebcd8f6c6ffa60c3e40b'
  '66479e99123faeab83ebaed709ef95b5'
  '819fbdf6440d710616e6df5f8ca9cdba'
  '631d8349acbed1b01d4e11d9f42fdb7d')

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

2012-06-06 Thread Dave Reisner 
Date: Wednesday, June 6, 2012 @ 20:05:03
  Author: dreisner
Revision: 160916

upgpkg: dnsmasq 2.62-1

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-06 23:03:34 UTC (rev 160915)
+++ PKGBUILD2012-06-07 00:05:03 UTC (rev 160916)
@@ -4,7 +4,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.61
+pkgver=2.62
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -18,7 +18,7 @@
 'dnsmasq.confd'
 'rc.dnsmasq'
 'dnsmasq.service')
-md5sums=('6ed0a5c2524dfc3a74ef494ee2469f09'
+md5sums=('f47e5cb8f5bac6343f24b2dbe317ab40'
  '66479e99123faeab83ebaed709ef95b5'
  '819fbdf6440d710616e6df5f8ca9cdba'
  '631d8349acbed1b01d4e11d9f42fdb7d')

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

2012-04-29 Thread Dave Reisner 
Date: Sunday, April 29, 2012 @ 20:00:12
  Author: dreisner
Revision: 157809

upgpkg: dnsmasq 2.61-1

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-29 21:33:25 UTC (rev 157808)
+++ PKGBUILD2012-04-30 00:00:12 UTC (rev 157809)
@@ -4,8 +4,8 @@
 # Contributor: Tom Newsom jeeps...@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')
@@ -18,7 +18,7 @@
 'dnsmasq.confd'
 'rc.dnsmasq'
 'dnsmasq.service')
-md5sums=('5a09908e02724d759ac60d9cafd27de8'
+md5sums=('6ed0a5c2524dfc3a74ef494ee2469f09'
  '66479e99123faeab83ebaed709ef95b5'
  '819fbdf6440d710616e6df5f8ca9cdba'
  '631d8349acbed1b01d4e11d9f42fdb7d')

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

2012-04-08 Thread Dave Reisner 
Date: Sunday, April 8, 2012 @ 16:56:15
  Author: dreisner
Revision: 155880

upgpkg: dnsmasq 2.60-3

- rebuild to move systemd unit /lib - /usr/lib

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-08 13:26:32 UTC (rev 155879)
+++ PKGBUILD2012-04-08 20:56:15 UTC (rev 155880)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.60
-pkgrel=2
+pkgrel=3
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
 arch=('i686' 'x86_64')

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

2012-04-06 Thread Dave Reisner 
Date: Friday, April 6, 2012 @ 14:23:25
  Author: dreisner
Revision: 155806

move systemdsystemunitdir to /usr

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-06 18:22:29 UTC (rev 155805)
+++ PKGBUILD2012-04-06 18:23:25 UTC (rev 155806)
@@ -45,7 +45,7 @@
 
   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
+  install -Dm644 $srcdir/dnsmasq.service 
$pkgdir/usr/lib/systemd/system/dnsmasq.service
 }
 
 # vim: ts=2 sw=2 et ft=sh

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

2012-03-05 Thread 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
===
--- PKGBUILD2012-03-06 01:50:30 UTC (rev 152250)
+++ PKGBUILD2012-03-06 01:59:22 UTC (rev 152251)
@@ -4,14 +4,13 @@
 # Contributor: Tom Newsom jeeps...@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 21); then
+  if ! testout=$(/usr/bin/dnsmasq --test 21); 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

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

2012-03-05 Thread Dave Reisner 
Date: Monday, March 5, 2012 @ 23:00:46
  Author: dreisner
Revision: 152255

upgpkg: dnsmasq 2.60-2

- fix daemon script

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-06 02:06:32 UTC (rev 152254)
+++ PKGBUILD2012-03-06 04:00:46 UTC (rev 152255)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.60
-pkgrel=1
+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')
@@ -20,7 +20,7 @@
 'dnsmasq.service')
 md5sums=('5a09908e02724d759ac60d9cafd27de8'
  '66479e99123faeab83ebaed709ef95b5'
- '9f180cc236808bbd02ca8652fd2e8217'
+ '819fbdf6440d710616e6df5f8ca9cdba'
  '631d8349acbed1b01d4e11d9f42fdb7d')
 
 build() {

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

2011-10-23 Thread Dave Reisner 
Date: Sunday, October 23, 2011 @ 12:17:56
  Author: dreisner
Revision: 141088

fix md5sum in PKGBUILD

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-23 16:12:32 UTC (rev 141087)
+++ PKGBUILD2011-10-23 16:17:56 UTC (rev 141088)
@@ -19,7 +19,7 @@
 'dnsmasq.confd'
 'rc.dnsmasq'
 'dnsmasq.service')
-md5sums=('29d43f182ecad06d64b3598c02380a80'
+md5sums=('b5757ef2d7b651748eeebb88af29d7d6'
  '66479e99123faeab83ebaed709ef95b5'
  '9f180cc236808bbd02ca8652fd2e8217'
  'f329d86f8ba1cd85f9b6ee59e0ce3791')

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

2011-10-19 Thread Dave Reisner 
Date: Wednesday, October 19, 2011 @ 12:18:48
  Author: dreisner
Revision: 140806

upgpkg: dnsmasq 2.59-2

- avoid 'syntax check: OK' output on startup. only show results of syntax
  check if it fails.

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

+
 PKGBUILD   |2 +-
 rc.dnsmasq |   13 -
 2 files changed, 13 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-19 16:10:30 UTC (rev 140805)
+++ PKGBUILD2011-10-19 16:18:48 UTC (rev 140806)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.59
-pkgrel=1
+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')

Modified: rc.dnsmasq
===
--- rc.dnsmasq  2011-10-19 16:10:30 UTC (rev 140805)
+++ rc.dnsmasq  2011-10-19 16:18:48 UTC (rev 140806)
@@ -4,6 +4,17 @@
 . /etc/rc.d/functions
 . /etc/conf.d/dnsmasq
 
+checkconfig() {
+  local testout
+
+  if ! testout=$(/usr/sbin/dnsmasq --test 21); then
+echo $testout
+return 1
+  fi
+
+  return 0
+}
+
 pidfile=/run/dnsmasq.pid
 if [[ -r $pidfile ]]; then
   read -r PID  $pidfile
@@ -17,7 +28,7 @@
 case $1 in
   start)
 stat_busy Starting DNS/DHCP daemon
-if [[ -z $PID ]]  /usr/sbin/dnsmasq --test 
+if [[ -z $PID ]]  checkconfig 
 /usr/sbin/dnsmasq --user=${DNSMASQ_USER:-nobody} \
   --pid-file=$pidfile \
   ${DNSMASQ_OPTS[@]}; then

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

2011-10-19 Thread Dave Reisner 
Date: Wednesday, October 19, 2011 @ 12:20:58
  Author: dreisner
Revision: 140809

upgpkg: dnsmasq 2.59-2

fix checksums...

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-19 16:19:36 UTC (rev 140808)
+++ PKGBUILD2011-10-19 16:20:58 UTC (rev 140809)
@@ -21,7 +21,7 @@
 'dnsmasq.service')
 md5sums=('29d43f182ecad06d64b3598c02380a80'
  '66479e99123faeab83ebaed709ef95b5'
- '818c122ea4d81868a75afad109411170'
+ '9f180cc236808bbd02ca8652fd2e8217'
  'f329d86f8ba1cd85f9b6ee59e0ce3791')
 
 build() {

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

2011-10-18 Thread Dave Reisner 
Date: Tuesday, October 18, 2011 @ 21:14:13
  Author: dreisner
Revision: 140771

upgpkg: dnsmasq 2.59-1

upstream release 2.59

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-19 00:51:32 UTC (rev 140770)
+++ PKGBUILD2011-10-19 01:14:13 UTC (rev 140771)
@@ -4,13 +4,13 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.58
-pkgrel=2
+pkgver=2.59
+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')
+depends=('glibc' 'dbus-core')
 makedepends=('libcap=2.16')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf'
@@ -19,7 +19,7 @@
 'dnsmasq.confd'
 'rc.dnsmasq'
 'dnsmasq.service')
-md5sums=('14c5c81debb324adc261db971730f4c6'
+md5sums=('29d43f182ecad06d64b3598c02380a80'
  '66479e99123faeab83ebaed709ef95b5'
  '818c122ea4d81868a75afad109411170'
  'f329d86f8ba1cd85f9b6ee59e0ce3791')
@@ -38,7 +38,6 @@
 
   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 $srcdir/dnsmasq.confd $pkgdir/etc/conf.d/dnsmasq

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

2011-09-11 Thread Dave Reisner 
Date: Sunday, September 11, 2011 @ 12:03:00
  Author: dreisner
Revision: 137813

fix checksums in PKGBUILD

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-11 16:01:12 UTC (rev 137812)
+++ PKGBUILD2011-09-11 16:03:00 UTC (rev 137813)
@@ -21,7 +21,8 @@
 'dnsmasq.service')
 md5sums=('14c5c81debb324adc261db971730f4c6'
  '66479e99123faeab83ebaed709ef95b5'
- '5d1abd670b3ef093b90a28d3b9ba802e')
+ '818c122ea4d81868a75afad109411170'
+ 'f329d86f8ba1cd85f9b6ee59e0ce3791')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

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

2011-08-26 Thread Dave Reisner 
Date: Friday, August 26, 2011 @ 22:24:39
  Author: dreisner
Revision: 136348

upgpkg: dnsmasq 2.58-1

upstream release 2.58

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |   37 -
 1 file changed, 20 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-26 22:11:46 UTC (rev 136347)
+++ PKGBUILD2011-08-27 02:24:39 UTC (rev 136348)
@@ -1,40 +1,43 @@
 # $Id$
-# Maintainer: Paul Mattal p...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Paul Mattal p...@archlinux.org
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.57
+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')
+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=('d10faeb409717eae94718d7716ca63a4' 'e956eee1ec24212a3254d2b168187495')
+md5sums=('14c5c81debb324adc261db971730f4c6'
+ 'e956eee1ec24212a3254d2b168187495')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
-  # Build
-  make || return 1
+  # link against dbus
+  echo '#define HAVE_DBUS'  src/config.h
 
-  # Install
-  install -d $pkgdir/etc/rc.d || return 1
-  make PREFIX=/usr DESTDIR=$pkgdir install || return 1
+  make
+}
 
-  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
+package() {
+  cd $srcdir/$pkgname-$pkgver
 
-  # Make the Required Directories for DHCP Server Default Directories
-  install -d $pkgdir/var/db || return 1
-  install -d $pkgdir/var/lib/misc || return 1
+  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

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

2011-02-23 Thread Paul Mattal 
Date: Wednesday, February 23, 2011 @ 17:48:06
  Author: paul
Revision: 111081

upgpkg: dnsmasq 2.57-1
upstream update to 2.57

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-23 22:13:26 UTC (rev 111080)
+++ PKGBUILD2011-02-23 22:48:06 UTC (rev 111081)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.55
+pkgver=2.57
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -15,7 +15,7 @@
 install=
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz; 
 'rc.dnsmasq')
-md5sums=('b093d7c6bc7f97ae6fd35d048529232a' 'e956eee1ec24212a3254d2b168187495')
+md5sums=('d10faeb409717eae94718d7716ca63a4' 'e956eee1ec24212a3254d2b168187495')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

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

2010-06-08 Thread Paul Mattal 
Date: Tuesday, June 8, 2010 @ 09:08:00
  Author: paul
Revision: 82065

upgpkg: dnsmasq 2.55-1
upstream update to 2.55

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-08 12:08:03 UTC (rev 82064)
+++ PKGBUILD2010-06-08 13:08:00 UTC (rev 82065)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.53
+pkgver=2.55
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -15,7 +15,7 @@
 install=
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz; 
 'rc.dnsmasq')
-md5sums=('e11cd4c6bba9590563018da2e0d8c323' 'e956eee1ec24212a3254d2b168187495')
+md5sums=('b093d7c6bc7f97ae6fd35d048529232a' 'e956eee1ec24212a3254d2b168187495')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

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

2010-06-05 Thread Paul Mattal 
Date: Saturday, June 5, 2010 @ 17:04:37
  Author: paul
Revision: 81843

upgpkg: dnsmasq 2.53-1
upstream update to 2.53

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-05 21:03:48 UTC (rev 81842)
+++ PKGBUILD2010-06-05 21:04:37 UTC (rev 81843)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.52
+pkgver=2.53
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -15,7 +15,7 @@
 install=
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz; 
 'rc.dnsmasq')
-md5sums=('1bb32fffdb4f977ead607802b5d701d0' 'e956eee1ec24212a3254d2b168187495')
+md5sums=('e11cd4c6bba9590563018da2e0d8c323' 'e956eee1ec24212a3254d2b168187495')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

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

2010-01-31 Thread Giovanni Scafora 
Date: Sunday, January 31, 2010 @ 20:41:38
  Author: giovanni
Revision: 66606

upgpkg: dnsmasq 2.52-1
upstream release

Modified:
  dnsmasq/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-01 01:41:19 UTC (rev 66605)
+++ PKGBUILD2010-02-01 01:41:38 UTC (rev 66606)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom jeeps...@gmx.co.uk
 
 pkgname=dnsmasq
-pkgver=2.51
+pkgver=2.52
 pkgrel=1
 pkgdesc=Lightweight, easy to configure DNS forwarder and DHCP server
 url=http://www.thekelleys.org.uk/dnsmasq/doc.html;
@@ -15,7 +15,7 @@
 install=
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz; 
 'rc.dnsmasq')
-md5sums=('97465261a6de5258a3c3edfe51ca16a4' 'e956eee1ec24212a3254d2b168187495')
+md5sums=('1bb32fffdb4f977ead607802b5d701d0' 'e956eee1ec24212a3254d2b168187495')
 
 build() {
   cd $srcdir/$pkgname-$pkgver