Revision: 6516
http://ipcop.svn.sourceforge.net/ipcop/?rev=6516&view=rev
Author: owes
Date: 2012-03-30 19:37:26 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
Add dnsmasq patch from upstream to avoid potential crash.
Modified Paths:
--------------
ipcop/trunk/lfs/dnsmasq
Added Paths:
-----------
ipcop/trunk/src/patches/dnsmasq-2.60_dhcpinform-crash.patch
Modified: ipcop/trunk/lfs/dnsmasq
===================================================================
--- ipcop/trunk/lfs/dnsmasq 2012-03-27 20:42:09 UTC (rev 6515)
+++ ipcop/trunk/lfs/dnsmasq 2012-03-30 19:37:26 UTC (rev 6516)
@@ -81,6 +81,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_dhcpinform-crash.patch
cd $(DIR_APP)/src && sed -i \
-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' \
-e 's/^#define CHGRP .*$$/#define CHGRP "dnsmasq"/' config.h
Added: ipcop/trunk/src/patches/dnsmasq-2.60_dhcpinform-crash.patch
===================================================================
--- ipcop/trunk/src/patches/dnsmasq-2.60_dhcpinform-crash.patch
(rev 0)
+++ ipcop/trunk/src/patches/dnsmasq-2.60_dhcpinform-crash.patch 2012-03-30
19:37:26 UTC (rev 6516)
@@ -0,0 +1,12 @@
+From upstream:
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2012q1/005681.html
+
+--- a/src/rfc2131.c
++++ b/src/rfc2131.c
+@@ -2095,7 +2095,8 @@ static void do_options(struct dhcp_context *context,
+ struct dhcp_netid_list *id_list;
+
+ /* filter options based on tags, those we want get DHOPT_TAGOK bit set */
+- context->netid.next = NULL;
++ if (context)
++ context->netid.next = NULL;
+ tagif = option_filter(netid, context && context->netid.net ?
&context->netid : NULL, config_opts);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
