Revision: 6598
http://ipcop.svn.sourceforge.net/ipcop/?rev=6598&view=rev
Author: owes
Date: 2012-05-06 20:28:52 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Upgrade dnsmasq to 2.61
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.60_dhcpinform-crash.patch
Modified: ipcop/trunk/lfs/dnsmasq
===================================================================
--- ipcop/trunk/lfs/dnsmasq 2012-05-05 08:40:31 UTC (rev 6597)
+++ ipcop/trunk/lfs/dnsmasq 2012-05-06 20:28:52 UTC (rev 6598)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = dnsmasq
-VER = 2.60
+VER = 2.61
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 475f1d8d297d5c4b92e009a9bee67f26
+$(DL_FILE)_MD5 = eebc2e1b8bee9d3dfaf7f91eb3cd0354
install : $(TARGET)
@@ -81,7 +81,6 @@
$(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
Deleted: ipcop/trunk/src/patches/dnsmasq-2.60_dhcpinform-crash.patch
===================================================================
--- ipcop/trunk/src/patches/dnsmasq-2.60_dhcpinform-crash.patch 2012-05-05
08:40:31 UTC (rev 6597)
+++ ipcop/trunk/src/patches/dnsmasq-2.60_dhcpinform-crash.patch 2012-05-06
20:28:52 UTC (rev 6598)
@@ -1,12 +0,0 @@
-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);
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-05-05 08:40:31 UTC
(rev 6597)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-05-06 20:28:52 UTC
(rev 6598)
@@ -152,7 +152,7 @@
## dhcpcd-5.5.6
/usr/sbin/dhcpcd
##
-## dnsmasq-2.60
+## dnsmasq-2.61
/usr/sbin/dnsmasq
##
## e2fsprogs-1.42.2
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-05-05 08:40:31 UTC (rev
6597)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-05-06 20:28:52 UTC (rev
6598)
@@ -8,7 +8,7 @@
Add URL filter, xz-5.0.3<br />
Language updates.<br />
Upgrade acpid to 2.0.16, arping to 2.11, bash to 4.2.28, coreutils
to 8.16,
- dhcpcd to 5.5.6, dnsmasq to 2.60,
+ dhcpcd to 5.5.6, dnsmasq to 2.61,
e2fsprogs to 1.42.2, ethtool to 3.2, fontconfig to 2.9, gawk to
4.0.1, glib to 2.30.3,
gmp to 5.0.4, gnupg to 1.4.12, grep to 2.12,
iproute2 to 3.3.0, iptables to 1.4.13, hdparm to 9.39, kernel to
3.0.30, krb5 to 1.9.3,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
