Skip to content

Commit

Permalink
Revert "Update dnsmasq to git head"
Browse files Browse the repository at this point in the history
This reverts commit 8e5bcb6.

Go back to dnsmasq the original
  • Loading branch information
Dave Taht committed Feb 21, 2012
1 parent e644612 commit a42c870
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
14 changes: 4 additions & 10 deletions package/dnsmasq/Makefile
Expand Up @@ -8,18 +8,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=dnsmasq
PKG_VERSION:=2.60-1-1-git
PKG_VERSION:=2.59
PKG_RELEASE:=2

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://thekelleys.org.uk/dnsmasq.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=0793380b4038e5cf4c0ebaac27c0dda8cd0e232c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
#PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
#PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6

PKG_INSTALL:=1

Expand Down
13 changes: 13 additions & 0 deletions package/dnsmasq/patches/101-ipv6.patch
@@ -0,0 +1,13 @@
--- a/src/config.h
+++ b/src/config.h
@@ -263,8 +263,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

0 comments on commit a42c870

Please sign in to comment.