Revision: 5451
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5451&view=rev
Author:   owes
Date:     2011-02-14 21:01:41 +0000 (Mon, 14 Feb 2011)

Log Message:
-----------
Upgrade dnsmasq to 2.56

Modified Paths:
--------------
    ipcop/trunk/lfs/dnsmasq
    ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
    ipcop/trunk/updates/1.9.18/information.xml

Removed Paths:
-------------
    ipcop/trunk/src/patches/dnsmasq-2.55_rfc2131-double-free.patch

Modified: ipcop/trunk/lfs/dnsmasq
===================================================================
--- ipcop/trunk/lfs/dnsmasq     2011-02-13 06:58:49 UTC (rev 5450)
+++ ipcop/trunk/lfs/dnsmasq     2011-02-14 21:01:41 UTC (rev 5451)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = dnsmasq
-VER        = 2.55
+VER        = 2.56
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -51,7 +51,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0ad62ac20fbb7e4e07f3f031c89e1b94
+$(DL_FILE)_MD5 = 12ba38c462b32278fe3793bd54a46b75
 
 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)_rfc2131-double-free.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.55_rfc2131-double-free.patch
===================================================================
--- ipcop/trunk/src/patches/dnsmasq-2.55_rfc2131-double-free.patch      
2011-02-13 06:58:49 UTC (rev 5450)
+++ ipcop/trunk/src/patches/dnsmasq-2.55_rfc2131-double-free.patch      
2011-02-14 21:01:41 UTC (rev 5451)
@@ -1,14 +0,0 @@
-Fix crash on double free that happen when a second dhcp request happen before 
the first has started the script.
-http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2010q3/004363.html
-Debian && upsteam borrowed
-
---- dnsmasq-2.55.orig/src/rfc2131.c
-+++ dnsmasq-2.55/src/rfc2131.c
-@@ -1235,6 +1235,7 @@
-             
-             lease->changed = 1;
-             free(lease->extradata);
-+            lease->extradata = NULL;
-             lease->extradata_size = lease->extradata_len = 0;
-             
-             add_extradata_opt(lease, option_find(mess, sz, OPTION_VENDOR_ID, 
1));

Modified: ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
===================================================================
--- ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18    2011-02-13 06:58:49 UTC 
(rev 5450)
+++ ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18    2011-02-14 21:01:41 UTC 
(rev 5451)
@@ -240,7 +240,7 @@
 ## dhcpcd-5.2.11
 /usr/sbin/dhcpcd
 ##
-## dnsmasq-2.55 double-free fixed
+## dnsmasq-2.56
 /usr/sbin/dnsmasq
 ##
 ## e2fsprogs-1.41.14

Modified: ipcop/trunk/updates/1.9.18/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.18/information.xml  2011-02-13 06:58:49 UTC (rev 
5450)
+++ ipcop/trunk/updates/1.9.18/information.xml  2011-02-14 21:01:41 UTC (rev 
5451)
@@ -5,13 +5,13 @@
         <size>0</size>
         <description>Language updates.&lt;br /&gt;
         Upgrade acpid to 2.0.7, apache to 2.2.17, bash to 4.1.9, cairo to 
1.10.2, coreutils to 8.10, dejavu-fonts to 2.32,
-        dhcpcd to 5.2.11, e2fsprogs to 1.41.14, ethtool to 2.6.36, freetype to 
2.4.4,
+        dhcpcd to 5.2.11, dnsmqsq to 2.56, e2fsprogs to 1.41.14, ethtool to 
2.6.36, freetype to 2.4.4,
         glib to 2.26.1, glibc to 2.11.3, gnupg to 1.4.11, grep to 2.7, hdparm 
to 9.36,
         iptables to 1.4.10, iputils to s20101006, iw to 0.9.21, libcap to 
2.20, libnl to 2.0, libpng to 1.5.0,
         libxml2 to 2.7.8, linux-atm to 2.5.2, lzo to 2.04, openssh to 5.8, 
openssl to 0.9.8r,
         openswan to 2.6.32, openvpn to 2.1.4, pango to 1.28.3, pixman to 
0.21.2, psmisc to 22.13,
         rrdtool to 1.4.5, smartmontools to 5.40, sqlite to 3.7.4, tar to 1.25, 
traceroute to 2.0.16,
-        tzdata to 2011b, usb-modeswitch to 1.1.6, usbutils to 001, vim to 7.3. 
Fixed dnsmasq, pcre-8.11 with --enable-unicode-properties
+        tzdata to 2011b, usb-modeswitch to 1.1.6, usbutils to 001, vim to 7.3. 
Fixed pcre-8.11 with --enable-unicode-properties
         pptp recompiled with hardening flags. Added sendEmail 
1.56</description>
         <previousversion>1.9.17</previousversion>
         <nextversion>1.9.19</nextversion>


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to