[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freewrt-commits
Subject:    [FreeWRT-commits] r3884 - trunk/freewrt/package/dnsmasq/patches
From:       abe () freewrt ! org
Date:       2009-10-17 18:37:35
Message-ID: 20091017183735.EEC381C007 () frozenfish ! freewrt ! org
[Download RAW message or body]

Author: abe
Date: 2009-10-17 18:26:08 +0200 (Sat, 17 Oct 2009)
New Revision: 3884

Modified:
   trunk/freewrt/package/dnsmasq/patches/patch-src_config_h
Log:
Fix FTBFS of dnsmasq in trunk by patching the lease file path patch.

After raising the version of dnsmasq to 0.50, hunk #1 of the patch for
changing the path to the lease file didn't apply anymore. Change the
patch so that it at least hunk #1 applies again. Hunk #2 currently
applies with some offset, but applies.


Modified: trunk/freewrt/package/dnsmasq/patches/patch-src_config_h
===================================================================
--- trunk/freewrt/package/dnsmasq/patches/patch-src_config_h	2009-10-15 14:21:06 UTC (rev 3883)
+++ trunk/freewrt/package/dnsmasq/patches/patch-src_config_h	2009-10-17 16:26:08 UTC (rev 3884)
@@ -1,15 +1,15 @@
 $FreeWRT$
 --- dnsmasq-2.38.orig/src/config.h	2007-02-12 17:55:38.000000000 +0000
 +++ dnsmasq-2.38/src/config.h	2007-06-08 16:14:15.000000000 +0000
-@@ -36,7 +36,7 @@
- #if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
- #   define LEASEFILE "/var/db/dnsmasq.leases"
- #else
--#   define LEASEFILE "/var/lib/misc/dnsmasq.leases"
-+#   define LEASEFILE "/tmp/dnsmasq.leases"
+@@ -45,7 +45,7 @@
+ #   elif defined(__sun__) || defined (__sun)
+ #      define LEASEFILE "/var/cache/dnsmasq.leases"
+ #   else
+-#      define LEASEFILE "/var/lib/misc/dnsmasq.leases"
++#      define LEASEFILE "/tmp/dnsmasq.leases"
+ #   endif
  #endif
- #if defined(__FreeBSD__)
- #   define CONFFILE "/usr/local/etc/dnsmasq.conf"
+ 
 @@ -280,8 +280,9 @@ typedef unsigned long in_addr_t; 
  /* We assume that systems which don't have IPv6
     headers don't have ntop and pton either */

_______________________________________________
freewrt-commits mailing list
freewrt-commits@freewrt.org
https://www.freewrt.org/lists/listinfo/freewrt-commits
[prev in list] [next in list] [prev in thread] [next in thread]