Rebase Cradlepoint diff over v2.90
Run these commands only if remote upstream is not added:
1. git remote add upstream http://thekelleys.org.uk/git/dnsmasq.git
2. git remote -v show
3. git fetch upstream
Following are the commands used for generating the diff
between upstream version 2.85 and origin/cp-main:
1. git diff v2.85 origin/cp-main > ../dnsmasq_v2.85-to-cp_main.gitdiff
2. patch -p1 < ../dnsmasq_v2.85-to-cp_main.gitdiff
3. git add . && git commit -m "Rebase Cradlepoint diff over v2.90"
And then fix all the rejects generated while applying ‘patch -p1 < ../dnsmasq_v2.85-to-cp_main.gitdiff’
EDNS_PKTSZ and SAFE_PKTSZ were already present due to backport of CVE
patch:
Fix up ./man/dnsmasq.8
Fix up ./src/config.h
Fix up ./CHANGELOG
As domain is no longer used in upstream, we removed the check for OPT_EDNS_RESTRICT:
Fix up ./src/forward.c
Fix up ./src/dhcp.c
Fix up ./src/dhcp6.c
Fix up ./src/dns-protocol.h
Fix up ./src/dnsmasq.c
Fix up ./src/dnsmasq.h
Fix up ./src/edns0.c
Fix up ./src/option.c
Fix up ./src/radv.c
Fix up ./src/rfc1035.c
Fix up ./src/util.c
Fix up ./Makefile
Compilation fixes for cache.c
Change-Id: Ibb8d162526168e5963aedb98b6333ded5f054a82
21 files changed