mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 05:36:32 +00:00
dnsmasq: bump to version 2.65
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
37f82a44ab
commit
3ceffe9659
@ -1,37 +0,0 @@
|
|||||||
From acd702292afebb8550acbfbe80638995545ccd10 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
||||||
Date: Mon, 10 Dec 2012 07:47:10 -0300
|
|
||||||
Subject: [PATCH] Move parse_server outside the HAVE_DHCP ifdef
|
|
||||||
|
|
||||||
Fixes build breakage when building without DHCP support.
|
|
||||||
|
|
||||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
||||||
---
|
|
||||||
src/option.c | 4 ++++
|
|
||||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/option.c b/src/option.c
|
|
||||||
index c1643a1..d6e323b 100644
|
|
||||||
--- a/src/option.c
|
|
||||||
+++ b/src/option.c
|
|
||||||
@@ -641,6 +641,8 @@ static char *set_prefix(char *arg)
|
|
||||||
return arg;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_addr, char *interface, int *flags)
|
|
||||||
{
|
|
||||||
int source_port = 0, serv_port = NAMESERVER_PORT;
|
|
||||||
@@ -728,6 +730,8 @@ char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_a
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef HAVE_DHCP
|
|
||||||
+
|
|
||||||
/* This is too insanely large to keep in-line in the switch */
|
|
||||||
static int parse_dhcp_opt(char *errstr, char *arg, int flags)
|
|
||||||
{
|
|
||||||
--
|
|
||||||
1.7.8.6
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
DNSMASQ_VERSION = 2.64
|
DNSMASQ_VERSION = 2.65
|
||||||
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
|
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
|
||||||
DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
|
DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
|
||||||
DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
|
DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user