summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-06-02 21:09:43 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-06-02 21:09:43 +0200
commit80726550d5f05aded1d3bc26a99099e3e1924752 (patch)
tree41ad6630c0b1a4e9a47ce521671da1127115464c /package
parent093222e39f1d985024458808f773bf768d65aa87 (diff)
update to latest stable version
Diffstat (limited to 'package')
-rw-r--r--package/dnsmasq/Makefile4
-rw-r--r--package/dnsmasq/patches/patch-Makefile34
-rw-r--r--package/dnsmasq/patches/patch-src_config_h21
3 files changed, 23 insertions, 36 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index f8dfccda0..31806775d 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dnsmasq
-PKG_VERSION:= 2.58
+PKG_VERSION:= 2.61
PKG_RELEASE:= 1
-PKG_MD5SUM:= 14c5c81debb324adc261db971730f4c6
+PKG_MD5SUM:= 6ed0a5c2524dfc3a74ef494ee2469f09
PKG_DESCR:= A lightweight DNS and DHCP server
PKG_SECTION:= dns
PKG_URL:= http://thekelleys.org.uk/dnsmasq/
diff --git a/package/dnsmasq/patches/patch-Makefile b/package/dnsmasq/patches/patch-Makefile
index 3bc68e266..c84c4cc5a 100644
--- a/package/dnsmasq/patches/patch-Makefile
+++ b/package/dnsmasq/patches/patch-Makefile
@@ -1,20 +1,18 @@
---- dnsmasq-2.55.orig/Makefile 2010-06-06 21:22:30.000000000 +0200
-+++ dnsmasq-2.55/Makefile 2011-01-07 21:43:23.000000000 +0100
-@@ -13,7 +13,7 @@
- # You should have received a copy of the GNU General Public License
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+--- dnsmasq-2.61.orig/Makefile 2012-04-29 17:01:28.000000000 +0200
++++ dnsmasq-2.61/Makefile 2012-06-02 20:50:33.000000000 +0200
+@@ -18,13 +18,13 @@
--PREFIX = /usr/local
-+PREFIX = /usr
- BINDIR = ${PREFIX}/sbin
- MANDIR = ${PREFIX}/share/man
- LOCALEDIR = ${PREFIX}/share/locale
-@@ -24,7 +24,7 @@ MSGMERGE = msgmerge
- MSGFMT = msgfmt
- XGETTEXT = xgettext
-
--CFLAGS = -Wall -W -O2
-+CFLAGS ?= -Wall
-
- #################################################################
+ # Variables you may well want to override.
+-PREFIX = /usr/local
++PREFIX = /usr
+ BINDIR = $(PREFIX)/sbin
+ MANDIR = $(PREFIX)/share/man
+ LOCALEDIR = $(PREFIX)/share/locale
+ BUILDDIR = $(SRC)
+ DESTDIR =
+-CFLAGS = -Wall -W -O2
++CFLAGS ?= -Wall
+ LDFLAGS =
+ COPTS =
+ RPM_OPT_FLAGS =
diff --git a/package/dnsmasq/patches/patch-src_config_h b/package/dnsmasq/patches/patch-src_config_h
index c58050bd0..78f715f2d 100644
--- a/package/dnsmasq/patches/patch-src_config_h
+++ b/package/dnsmasq/patches/patch-src_config_h
@@ -1,22 +1,11 @@
---- dnsmasq-2.55.orig/src/config.h 2010-06-07 23:01:19.000000000 +0200
-+++ dnsmasq-2.55/src/config.h 2011-01-07 21:40:34.000000000 +0100
-@@ -47,7 +47,7 @@
- # elif defined(__sun__) || defined (__sun)
- # define LEASEFILE "/var/cache/dnsmasq.leases"
+--- dnsmasq-2.61.orig/src/config.h 2012-04-29 17:01:28.000000000 +0200
++++ dnsmasq-2.61/src/config.h 2012-06-02 20:51:50.000000000 +0200
+@@ -138,7 +138,7 @@ RESOLVFILE
+ # elif defined(__ANDROID__)
+ # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
# else
-# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
+# define LEASEFILE "/tmp/dnsmasq.leases"
# endif
#endif
-@@ -269,8 +269,9 @@ NOTES:
- /* We assume that systems which don't have IPv6
- headers don't have ntop and pton either */
-
--#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
-+#if defined(INET6_ADDRSTRLEN) && !defined(NO_IPV6)
- # define HAVE_IPV6
-+# define IPV6_V6ONLY 26
- # define ADDRSTRLEN INET6_ADDRSTRLEN
- # if defined(SOL_IPV6)
- # define IPV6_LEVEL SOL_IPV6