Revision: 7121
http://sourceforge.net/p/ipcop/svn/7121
Author: dotzball
Date: 2013-11-16 19:18:40 +0000 (Sat, 16 Nov 2013)
Log Message:
-----------
Update dnsmasq to 2.67.
Modified Paths:
--------------
ipcop/trunk/lfs/dnsmasq
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/dnsmasq-2.66_upstream.patch
Modified: ipcop/trunk/lfs/dnsmasq
===================================================================
--- ipcop/trunk/lfs/dnsmasq 2013-11-16 12:40:53 UTC (rev 7120)
+++ ipcop/trunk/lfs/dnsmasq 2013-11-16 19:18:40 UTC (rev 7121)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = dnsmasq
-VER = 2.66
+VER = 2.67
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cd1c70dd66d2e3ad02b66ca6af4ebf20
+$(DL_FILE)_MD5 = 3560068c6cc644a01924fa089a70bb9c
install : $(TARGET)
@@ -81,8 +81,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- # for 2.66 only
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_upstream.patch
cd $(DIR_APP) && sed -i \
-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' \
Deleted: ipcop/trunk/src/patches/dnsmasq-2.66_upstream.patch
===================================================================
--- ipcop/trunk/src/patches/dnsmasq-2.66_upstream.patch 2013-11-16 12:40:53 UTC
(rev 7120)
+++ ipcop/trunk/src/patches/dnsmasq-2.66_upstream.patch 2013-11-16 19:18:40 UTC
(rev 7121)
@@ -1,158 +0,0 @@
-git log -p v2.66.. >dnsmasq-2.66_upstream.patch
-
-commit bd08ae67f9a0cae2ce15be885254cad9449d4551
-Author: Simon Kelley <si...@thekelleys.org.uk>
-Date: Fri Apr 19 10:22:06 2013 +0100
-
- Allow option number zero in encapsulated DHCP options.
-
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index f4fd088..8de4268 100644
---- a/src/dhcp-common.c
-+++ b/src/dhcp-common.c
-@@ -512,7 +512,7 @@ void display_opts6(void)
- }
- #endif
-
--u16 lookup_dhcp_opt(int prot, char *name)
-+int lookup_dhcp_opt(int prot, char *name)
- {
- const struct opttab_t *t;
- int i;
-@@ -528,10 +528,10 @@ u16 lookup_dhcp_opt(int prot, char *name)
- if (strcasecmp(t[i].name, name) == 0)
- return t[i].val;
-
-- return 0;
-+ return -1;
- }
-
--u16 lookup_dhcp_len(int prot, u16 val)
-+int lookup_dhcp_len(int prot, int val)
- {
- const struct opttab_t *t;
- int i;
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 69ae7a7..41e2798 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -1216,8 +1216,8 @@ void log_tags(struct dhcp_netid *netid, u32 xid);
- int match_bytes(struct dhcp_opt *o, unsigned char *p, int len);
- void dhcp_update_configs(struct dhcp_config *configs);
- void display_opts(void);
--u16 lookup_dhcp_opt(int prot, char *name);
--u16 lookup_dhcp_len(int prot, u16 val);
-+int lookup_dhcp_opt(int prot, char *name);
-+int lookup_dhcp_len(int prot, int val);
- char *option_string(int prot, unsigned int opt, unsigned char *val,
- int opt_len, char *buf, int buf_len);
- #ifdef HAVE_LINUX_NETWORK
-diff --git a/src/option.c b/src/option.c
-index b2596ec..2a61017 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -750,6 +750,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int
flags)
- struct dhcp_netid *np = NULL;
- u16 opt_len = 0;
- int is6 = 0;
-+ int option_ok = 0;
-
- new->len = 0;
- new->flags = flags;
-@@ -769,16 +770,19 @@ static int parse_dhcp_opt(char *errstr, char *arg, int
flags)
- {
- new->opt = atoi(arg);
- opt_len = 0;
-+ option_ok = 1;
- break;
- }
-
- if (strstr(arg, "option:") == arg)
- {
-- new->opt = lookup_dhcp_opt(AF_INET, arg+7);
-- opt_len = lookup_dhcp_len(AF_INET, new->opt);
-- /* option:<optname> must follow tag and vendor string. */
-- if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH)
-- new->opt = 0;
-+ if ((new->opt = lookup_dhcp_opt(AF_INET, arg+7)) != -1)
-+ {
-+ opt_len = lookup_dhcp_len(AF_INET, new->opt);
-+ /* option:<optname> must follow tag and vendor string. */
-+ if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH)
-+ option_ok = 1;
-+ }
- break;
- }
- #ifdef HAVE_DHCP6
-@@ -792,13 +796,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int
flags)
- {
- new->opt = atoi(arg+8);
- opt_len = 0;
-+ option_ok = 1;
- }
- else
- {
-- new->opt = lookup_dhcp_opt(AF_INET6, arg+8);
-- opt_len = lookup_dhcp_len(AF_INET6, new->opt);
-- if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH)
-- new->opt = 0;
-+ if ((new->opt = lookup_dhcp_opt(AF_INET6, arg+8)) != -1)
-+ {
-+ opt_len = lookup_dhcp_len(AF_INET6, new->opt);
-+ if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH)
-+ option_ok = 1;
-+ }
- }
- /* option6:<opt>|<optname> must follow tag and vendor string. */
- is6 = 1;
-@@ -821,7 +828,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int
flags)
- new->flags |= DHOPT_RFC3925;
- if (flags == DHOPT_MATCH)
- {
-- new->opt = 1; /* avoid error below */
-+ option_ok = 1;
- break;
- }
- }
-@@ -848,16 +855,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int
flags)
-
- if (opt_len == 0 &&
- !(new->flags & DHOPT_RFC3925))
-- opt_len = lookup_dhcp_len(AF_INET6 ,new->opt);
-+ opt_len = lookup_dhcp_len(AF_INET6, new->opt);
- }
- else
- #endif
- if (opt_len == 0 &&
- !(new->flags & (DHOPT_VENDOR | DHOPT_ENCAPSULATE | DHOPT_RFC3925)))
-- opt_len = lookup_dhcp_len(AF_INET ,new->opt);
-+ opt_len = lookup_dhcp_len(AF_INET, new->opt);
-
- /* option may be missing with rfc3925 match */
-- if (new->opt == 0)
-+ if (!option_ok)
- ret_err(_("bad dhcp-option"));
-
- if (comma)
-
-commit 4582c0efe7d7af93517b1f3bcc7af67685ab3e5c
-Author: Dave Reisner <d...@falconindy.com>
-Date: Thu Apr 18 09:47:49 2013 +0100
-
- Fix wrong size in memset() call.
-
- Thanks to Dave Reisner.
-
-diff --git a/src/ipset.c b/src/ipset.c
-index a34ed96..f175fa4 100644
---- a/src/ipset.c
-+++ b/src/ipset.c
-@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const
struct all_addr *ipaddr,
- return -1;
- }
-
-- memset(buffer, 0, sizeof(buffer));
-+ memset(buffer, 0, BUFF_SZ);
-
- nlh = (struct nlmsghdr *)buffer;
- nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-11-16 12:40:53 UTC
(rev 7120)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-11-16 19:18:40 UTC
(rev 7121)
@@ -215,7 +215,7 @@
/usr/bin/cmp
/usr/bin/diff
##
-## dnsmasq-2.66
+## dnsmasq-2.67
/usr/sbin/dnsmasq
##
## e2fsprogs-1.42.7
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-11-16 12:40:53 UTC (rev
7120)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-11-16 19:18:40 UTC (rev
7121)
@@ -9,7 +9,7 @@
Language updates.<br />
Fix SF bug #805, undefined value in connections webui.<br />
Upgrade acpid to 2.0.20, arping to 2.13, bash to 4.2.45, bind to
9.8.4-P2, CnxADSL to ..PIM-2.6-2.7
- conntrack-tools to 1.2.2, coreutils to 8.21, dhcpcd to 5.6.8,
diffutils-3.3, dnsmasq to 2.66,
+ conntrack-tools to 1.2.2, coreutils to 8.21, dhcpcd to 5.6.8,
diffutils-3.3, dnsmasq to 2.67,
e2fsprogs to 1.42.7, ethtool to 3.6, expat to 2.1.0, freetype to
2.4.12, fontconfig to 2.9,
gawk to 4.0.2, GD to 2.49, gettext to 0.18.2, glib to 2.30.3, gmp
to 5.0.5, gnupg to 1.4.13, grep to 2.14, gzip to 1.5,
hdparm to 9.43, httpd to 2.2.25,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
