summaryrefslogtreecommitdiff
path: root/package/dnsmasq
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-19 10:49:49 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-19 10:49:49 +0200
commit7907e3ee7302ac3fd428989a07b0df74f0c52853 (patch)
treee6de18488a687707667927065724372b40510d65 /package/dnsmasq
parentb70fdbfbf1139605c22083b647337f2b16f62fc3 (diff)
parent61355d1f054c15673adeb62d32dfd4563f89c165 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/dnsmasq')
-rw-r--r--package/dnsmasq/Makefile8
-rw-r--r--package/dnsmasq/patches/patch-src_config_h1
2 files changed, 4 insertions, 5 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 8bcb361f9..57cc71bab 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -4,11 +4,11 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dnsmasq
-PKG_VERSION:= 2.51
+PKG_VERSION:= 2.55
PKG_RELEASE:= 1
-PKG_MD5SUM:= 97465261a6de5258a3c3edfe51ca16a4
+PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a
PKG_DESCR:= A lightweight DNS and DHCP server
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_URL:= http://thekelleys.org.uk/dnsmasq
PKG_SITES:= http://thekelleys.org.uk/dnsmasq/
@@ -24,6 +24,6 @@ MAKE_FLAGS+= BINDIR=/usr/sbin MANDIR=/usr/man COPTS="${TCFLAGS}"
do-install:
${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc
${INSTALL_BIN} ${WRKBUILD}/src/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/
- ${INSTALL_DATA} files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf
+ ${INSTALL_DATA} ./files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dnsmasq/patches/patch-src_config_h b/package/dnsmasq/patches/patch-src_config_h
index 297097565..5db49ea9a 100644
--- a/package/dnsmasq/patches/patch-src_config_h
+++ b/package/dnsmasq/patches/patch-src_config_h
@@ -1,4 +1,3 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- dnsmasq-2.47.orig/src/config.h 2009-02-05 13:14:24.000000000 +0100
+++ dnsmasq-2.47/src/config.h 2009-03-19 18:40:37.000000000 +0100
@@ -45,7 +45,7 @@