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
diff --git a/changelog.cp b/changelog.cp
new file mode 100644
index 0000000..6993213
--- /dev/null
+++ b/changelog.cp
@@ -0,0 +1,21 @@
+Current dnsmasq Version: 2.83
+Files with CP changes:
+Makefile, cache.c, config.h, dhcp.c, dns-protocol.h, dnsmasq.c, dnsmasq.h, edns0.c, option.c, util.c
+==========
+07-15-2021 - PV: Upgrade to stable v2.85 for CVE-2021-3448
+01-20-2021 - KZ: Upgrade to stable v2.83 for CVE-2020-25681 through CVE-25687 (seven total)
+10-02-2017 - SF: Upgrade to stable v2.78
+08-12-2015 - AC: Upgrade to stable version v2.75
+05-06-2015 - sdb: import fix for CVE-2015-3294
+01-22-2015 - rk: Upgrade to stable version v2.72
+08-20-2014 - rk: Upgrade to stable version v2.71
+05-05-2014 - sdb: Upgrade to stable version v2.70 - five commits: this and four 'DNSMASQ: *'
+08-28-2013 - SDB: allow non-standard port in /etc/resolv.conf bug#21210 - 9642:6a1c9815cce3
+06-17-2013 - SF: Fixing opendns support - 8896:01709c19ccd1
+06-12-2013 - AC: Re-add forced interface mode for ippt - 8809:1f86188266b1
+04-19-2013 - SF: Upgraded to stable version 2.66 - 8295:28a81678c1fb
+03-05-2013 - SF: cloned from git repo:
+ Revision: HEAD-c796107 (index 50b17aa..854992b 100644)
+==========
+Website: http://www.thekelleys.org.uk/dnsmasq/doc.html
+Repo: git://thekelleys.org.uk/dnsmasq.git