mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-23 17:32:57 +02:00
dnsmasq: Update to 2.76rc2
- Updated to 2.76rc2 and deleted obsolete patch files from 2.76rc1 Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Matthias Fischer
committed by
Michael Tremer
Michael Tremer
parent
3f877ebd25
commit
c00aeae80f
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.76rc1
|
||||
VER = 2.76rc2
|
||||
|
||||
THISAPP = dnsmasq-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 08c203ee2e0d3ed8babf056b69a6265e
|
||||
$(DL_FILE)_MD5 = 1d5b834803a44e806f2865877574fe47
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -73,8 +73,6 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(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_SRC)/src/patches/dnsmasq/001-Fix_error_in_PXE_arch_names_and_add_ARM32_and_ARM64.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/002-Tweak_CSAs_affected_by_UEFI_PXE_workaround_code.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
|
||||
|
||||
cd $(DIR_APP) && sed -i src/config.h \
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
From 68bea10bbfbd5e9ff158ab163c15d8982620d0d3 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Kelley <simon@thekelleys.org.uk>
|
||||
Date: Wed, 11 May 2016 22:15:06 +0100
|
||||
Subject: [PATCH] Fix error in PXE arch names and add ARM32 and ARM64.
|
||||
|
||||
---
|
||||
CHANGELOG | 10 +++++++++-
|
||||
man/dnsmasq.8 | 2 +-
|
||||
src/option.c | 3 ++-
|
||||
3 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CHANGELOG b/CHANGELOG
|
||||
index f3220d8..7012918 100644
|
||||
--- a/CHANGELOG
|
||||
+++ b/CHANGELOG
|
||||
@@ -74,7 +74,15 @@ version 2.76
|
||||
To avoid filling logs in configurations which define
|
||||
many upstream nameservers, don't log more that 30 servers.
|
||||
The number to be logged can be changed as SERVERS_LOGGED
|
||||
- in src/config.h.
|
||||
+ in src/config.h.
|
||||
+
|
||||
+ Swap the values if BC_EFI and x86-64_EFI in --pxe-service.
|
||||
+ These were previously wrong due to an error in RFC 4578.
|
||||
+ If you're using BC_EFI to boot 64-bit EFI machines, you
|
||||
+ will need to update your config.
|
||||
+
|
||||
+ Add ARM32_EFI and ARM64_EFI as valid architectures in
|
||||
+ --pxe-service.
|
||||
|
||||
|
||||
version 2.75
|
||||
diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
|
||||
index dacd9ce..68d77a2 100644
|
||||
--- a/man/dnsmasq.8
|
||||
+++ b/man/dnsmasq.8
|
||||
@@ -1358,7 +1358,7 @@ functions when supported by a suitable DHCP server.
|
||||
This specifies a boot option which may appear in a PXE boot menu. <CSA> is
|
||||
client system type, only services of the correct type will appear in a
|
||||
menu. The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86,
|
||||
-Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI and X86-64_EFI; an
|
||||
+Intel_Lean_Client, IA32_EFI, X86-64_EFI, Xscale_EFI, BC_EFI, ARM32_EFI and ARM64_EFI; an
|
||||
integer may be used for other types. The
|
||||
parameter after the menu text may be a file name, in which case dnsmasq acts as a
|
||||
boot server and directs the PXE client to download the file by TFTP,
|
||||
diff --git a/src/option.c b/src/option.c
|
||||
index 0b35500..d8c57d6 100644
|
||||
--- a/src/option.c
|
||||
+++ b/src/option.c
|
||||
@@ -3298,7 +3298,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
||||
{
|
||||
struct pxe_service *new = opt_malloc(sizeof(struct pxe_service));
|
||||
char *CSA[] = { "x86PC", "PC98", "IA64_EFI", "Alpha", "Arc_x86", "Intel_Lean_Client",
|
||||
- "IA32_EFI", "BC_EFI", "Xscale_EFI", "x86-64_EFI", NULL };
|
||||
+ "IA32_EFI", "x86-64_EFI", "Xscale_EFI", "BC_EFI",
|
||||
+ "ARM32_EFI", "ARM64_EFI", NULL };
|
||||
static int boottype = 32768;
|
||||
|
||||
new->netid = NULL;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From cbc100fc81183e136f5ed72fec277677d55f9334 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Kelley <simon@thekelleys.org.uk>
|
||||
Date: Wed, 11 May 2016 22:17:18 +0100
|
||||
Subject: [PATCH] Tweak CSAs affected by UEFI PXE workaround code.
|
||||
|
||||
---
|
||||
src/rfc2131.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/rfc2131.c b/src/rfc2131.c
|
||||
index 42d1ba8..d952e03 100644
|
||||
--- a/src/rfc2131.c
|
||||
+++ b/src/rfc2131.c
|
||||
@@ -1994,7 +1994,7 @@ static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dh
|
||||
struct pxe_service *service, *found;
|
||||
|
||||
/* Only workaround UEFI archs. */
|
||||
- if (pxe_arch != 6 && pxe_arch != 7 && pxe_arch != 8 && pxe_arch != 9)
|
||||
+ if (pxe_arch < 6)
|
||||
return 0;
|
||||
|
||||
for (found = NULL, service = daemon->pxe_services; service; service = service->next)
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
Reference in New Issue
Block a user