Changeset 2733

Timestamp:

15.11.2008 20:53:44 (7 weeks ago)

Author:

Whoopie

Message:

dnsmasq: bump to 2.46

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• make/dnsmasq/Config.in (modified) (1 diff)
• make/dnsmasq/dnsmasq.mk (modified) (1 diff)
• make/dnsmasq/patches/100-config.h.patch (modified) (3 diffs)
• make/dnsmasq/patches/100-multid-leases.patch (modified) (5 diffs)

trunk/CHANGELOG

@@ -66 +66 @@
     * curl 7.19.1
     * devmapper 1.02.27
+    * dnsmasq 2.46
     * dropbear 0.52
     * dns2tcp 0.4.3

trunk/make/dnsmasq/Config.in

@@ -1 +1 @@
 config FREETZ_PACKAGE_DNSMASQ
-        bool "Dnsmasq 2.45"
+        bool "Dnsmasq 2.46"
         default n
         help

trunk/make/dnsmasq/dnsmasq.mk

@@ -1 @@
-$(call PKG_INIT_BIN, 2.45)
+$(call PKG_INIT_BIN, 2.46)
 $(PKG)_SOURCE:=dnsmasq-$($(PKG)_VERSION).tar.gz
 $(PKG)_SITE:=http://thekelleys.org.uk/dnsmasq

trunk/make/dnsmasq/patches/100-config.h.patch

@@ -1 @@
---- src/config.h.orig   2008-07-20 20:26:32.000000000 +0200
-+++ src/config.h        2008-07-21 18:05:45.000000000 +0200
+--- src/config.h.orig   2008-11-10 22:47:46.000000000 +0100
++++ src/config.h        2008-11-15 20:37:18.000000000 +0100
 @@ -43,12 +43,12 @@
  #elif defined(__sun__) || defined (__sun)
@@ -16 +16 @@
  #define DEFLEASE 3600 /* default lease time, 1 hour */
  #define CHUSER "nobody"
-@@ -200,9 +200,9 @@
+@@ -188,9 +188,9 @@
  #endif
  #undef HAVE_ARC4RANDOM
@@ -29 +29 @@
  #  ifndef IPV6_V6ONLY
  #    define IPV6_V6ONLY 26
-@@ -286,19 +286,19 @@
+@@ -274,19 +274,19 @@
  /* We assume that systems which don't have IPv6
     headers don't have ntop and pton either */

trunk/make/dnsmasq/patches/100-multid-leases.patch

@@ -1 @@
---- src/dnsmasq.h.orig  2008-02-01 22:42:35.000000000 +0100
-+++ src/dnsmasq.h       2008-02-25 22:04:27.000000000 +0100
-@@ -408,6 +408,7 @@
+--- src/dnsmasq.h.orig  2008-11-09 12:10:24.000000000 +0100
++++ src/dnsmasq.h       2008-11-15 20:44:28.000000000 +0100
+@@ -413,6 +413,7 @@
  #endif
    int hwaddr_len, hwaddr_type;
@@ -9 +9 @@
    unsigned char *vendorclass, *userclass;
    unsigned int vendorclass_len, userclass_len;
-@@ -781,6 +782,7 @@
+@@ -800,6 +801,7 @@
+ void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
                       unsigned char *clid, int hw_len, int hw_type, int clid_len);
- void lease_set_hostname(struct dhcp_lease *lease, char *name, 
-                        char *suffix, int auth);
+ void lease_set_hostname(struct dhcp_lease *lease, char *name, int auth);
 +void lease_set_ifrname(struct dhcp_lease *lease, char *ifrname);
  void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now);
  void lease_set_interface(struct dhcp_lease *lease, int interface);
  struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, int hw_len, int hw_type,  
---- src/lease.c.orig    2007-12-10 22:14:08.000000000 +0100
-+++ src/lease.c 2008-02-25 22:04:27.000000000 +0100
+--- src/lease.c.orig    2008-11-03 17:27:46.000000000 +0100
++++ src/lease.c 2008-11-15 20:46:13.000000000 +0100
 @@ -175,11 +175,16 @@
  
@@ -76 +76 @@
    
    /* Set alarm for when the first lease expires + slop. */
-@@ -412,6 +435,23 @@
- 
+@@ -437,6 +460,23 @@
+   lease->hostname = lease->fqdn = NULL;
  }
  
@@ -85 +85 @@
 +
 +  if (!(lease_ifrname = malloc(strlen(ifrname) + 1)))
-+    return;    /* whoops */
++    return;    /* whoops */
 +
 +  strcpy(lease_ifrname, ifrname);
@@ -97 +97 @@
 +}
 +
- void lease_set_hostname(struct dhcp_lease *lease, char *name, char *suffix, int auth)
+ void lease_set_hostname(struct dhcp_lease *lease, char *name, int auth)
  {
    struct dhcp_lease *lease_tmp;
---- src/rfc2131.c.orig  2008-01-24 12:23:19.000000000 +0100
-+++ src/rfc2131.c       2008-02-25 22:04:27.000000000 +0100
-@@ -440,6 +440,7 @@
+--- src/rfc2131.c.orig  2008-11-03 17:28:50.000000000 +0100
++++ src/rfc2131.c       2008-11-15 20:49:48.000000000 +0100
+@@ -457,6 +457,7 @@
               lease_set_hwaddr(lease, mess->chaddr, NULL, mess->hlen, mess->htype, 0);
               if (hostname)
-                lease_set_hostname(lease, hostname, daemon->domain_suffix, 1); 
-+               lease_set_ifrname(lease, iface_name);
+                lease_set_hostname(lease, hostname, 1); 
++               lease_set_ifrname(lease, iface_name);
               /* infinite lease unless nailed in dhcp-host line. */
               lease_set_expires(lease,  
                                 have_config(config, CONFIG_TIME) ? config->lease_time : 0xffffffff, 
-@@ -985,7 +986,7 @@
+@@ -1025,7 +1026,7 @@
             }
           if (hostname)
-            lease_set_hostname(lease, hostname, daemon->domain_suffix, hostname_auth);
+            lease_set_hostname(lease, hostname, hostname_auth);
 -         
 +           lease_set_ifrname(lease, iface_name);